增加rect根据text的宽度来

LillteZheng · Feb 14, 2022 · 6128dec · 6128dec
1 parent 4eb40f8
commit 6128dec
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 52 deletions.
diff --git a/TAB_README.md b/TAB_README.md
@@ -361,6 +361,7 @@ private void resFlow(){
 |tab_action_orientaion|integer|left坐标，right右边，只支持 tri、rect 两种效果|
 |tab_isAutoScroll|boolean|是否支持自动滚动,默认为true|
 |tab_visual_count|integer|可视化个数，比如有一排，我们就只要显示4个，此时宽度均分|
+|tab_width_equals_text|boolean|rect 是否根据text的大小来，目前只支持rect和带viewpager的情况|
 
 
 **TabColorTextView**

diff --git a/appx/build.gradle b/appx/build.gradle
@@ -29,8 +29,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    //implementation project(path: ':tablibx')
-    implementation 'com.github.LillteZheng:FlowHelper:v1.33'
+    implementation project(path: ':tablibx')
+    //implementation 'com.github.LillteZheng:FlowHelper:v1.34'
     implementation 'me.yokeyword:fragmentationx:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'

diff --git a/appx/src/main/java/com/zhengsr/tabhelper/activity/TabNoViewPagerActivity.java b/appx/src/main/java/com/zhengsr/tabhelper/activity/TabNoViewPagerActivity.java
@@ -11,6 +11,7 @@
 import com.zhengsr.tabhelper.R;
 import com.zhengsr.tablib.FlowConstants;
 import com.zhengsr.tablib.bean.TabBean;
+import com.zhengsr.tablib.bean.TabConfig;
 import com.zhengsr.tablib.bean.TabValue;
 import com.zhengsr.tablib.view.action.BaseAction;
 import com.zhengsr.tablib.view.adapter.TabFlowAdapter;
@@ -37,6 +38,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // mTitle.add("Kotlin");
         setContentView(R.layout.activity_tab_no_view_pager);
         TabFlowLayout flowLayout = findViewById(R.id.new_test);
+        TabConfig config = new TabConfig.Builder()
+                .setTextId(R.id.item_text).build();
         flowLayout.setAdapter(new TabFlowAdapter<String>(R.layout.item_msg, mTitle) {
             @Override
             public void bindView(View view, String data, int position) {

diff --git a/appx/src/main/res/layout/activity_tab.xml b/appx/src/main/res/layout/activity_tab.xml
@@ -128,7 +128,7 @@
         app:tab_type="rect"
         app:tab_height="2dp"
         app:tab_color="@color/colorAccent"
-        app:tab_margin_b="3dp"
+        app:tab_width_equals_text="true"
         android:layout_height="wrap_content"/>
 
     <TextView

diff --git a/appx/src/main/res/layout/activity_tab_no_view_pager.xml b/appx/src/main/res/layout/activity_tab_no_view_pager.xml
@@ -33,6 +33,7 @@
         app:tab_item_autoScale="true"
         app:tab_scale_factor="1.2"
         app:tab_visual_count="2"
+        app:tab_width_equals_text="true"
         />
 
     <com.zhengsr.tablib.view.flow.TabFlowLayout

diff --git a/tablibx/src/main/java/com/zhengsr/tablib/bean/TabBean.java b/tablibx/src/main/java/com/zhengsr/tablib/bean/TabBean.java
@@ -74,6 +74,11 @@ public class TabBean {
     public int visualCount = -1;
 
 
+    /**
+     * tab 的宽度是否跟随text的宽度大小,只对 rect 有用
+     */
+    public boolean tabWidthEqualsText = true;
+
     @Override
     public String toString() {
         return "TabBean{" +

diff --git a/tablibx/src/main/java/com/zhengsr/tablib/utils/AttrsUtils.java b/tablibx/src/main/java/com/zhengsr/tablib/utils/AttrsUtils.java
@@ -43,6 +43,7 @@ public static TabBean getTabBean(TypedArray ta){
         bean.actionOrientation = ta.getInteger(R.styleable.AbsFlowLayout_tab_action_orientaion,-1);
         bean.isAutoScroll = ta.getBoolean(R.styleable.AbsFlowLayout_tab_isAutoScroll, true);
         bean.visualCount = ta.getInteger(R.styleable.AbsFlowLayout_tab_visual_count, -1);
+        bean.tabWidthEqualsText = ta.getBoolean(R.styleable.AbsFlowLayout_tab_width_equals_text,true);
 
         return bean;
     }