Skip to content

Commit 6128dec

Browse files
committed
增加rect根据text的宽度来
1 parent 4eb40f8 commit 6128dec

9 files changed

Lines changed: 108 additions & 52 deletions

File tree

TAB_README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ private void resFlow(){
361361
|tab_action_orientaion|integer|left坐标,right右边,只支持 tri、rect 两种效果|
362362
|tab_isAutoScroll|boolean|是否支持自动滚动,默认为true|
363363
|tab_visual_count|integer|可视化个数,比如有一排,我们就只要显示4个,此时宽度均分|
364+
|tab_width_equals_text|boolean|rect 是否根据text的大小来,目前只支持rect和带viewpager的情况|
364365

365366

366367
**TabColorTextView**

appx/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ dependencies {
2929
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
3030
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3131

32-
//implementation project(path: ':tablibx')
33-
implementation 'com.github.LillteZheng:FlowHelper:v1.33'
32+
implementation project(path: ':tablibx')
33+
//implementation 'com.github.LillteZheng:FlowHelper:v1.34'
3434
implementation 'me.yokeyword:fragmentationx:1.0.2'
3535
implementation 'androidx.cardview:cardview:1.0.0'
3636
implementation 'androidx.viewpager2:viewpager2:1.0.0'

appx/src/main/java/com/zhengsr/tabhelper/activity/TabNoViewPagerActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.zhengsr.tabhelper.R;
1212
import com.zhengsr.tablib.FlowConstants;
1313
import com.zhengsr.tablib.bean.TabBean;
14+
import com.zhengsr.tablib.bean.TabConfig;
1415
import com.zhengsr.tablib.bean.TabValue;
1516
import com.zhengsr.tablib.view.action.BaseAction;
1617
import com.zhengsr.tablib.view.adapter.TabFlowAdapter;
@@ -37,6 +38,8 @@ protected void onCreate(Bundle savedInstanceState) {
3738
// mTitle.add("Kotlin");
3839
setContentView(R.layout.activity_tab_no_view_pager);
3940
TabFlowLayout flowLayout = findViewById(R.id.new_test);
41+
TabConfig config = new TabConfig.Builder()
42+
.setTextId(R.id.item_text).build();
4043
flowLayout.setAdapter(new TabFlowAdapter<String>(R.layout.item_msg, mTitle) {
4144
@Override
4245
public void bindView(View view, String data, int position) {

appx/src/main/res/layout/activity_tab.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
app:tab_type="rect"
129129
app:tab_height="2dp"
130130
app:tab_color="@color/colorAccent"
131-
app:tab_margin_b="3dp"
131+
app:tab_width_equals_text="true"
132132
android:layout_height="wrap_content"/>
133133

134134
<TextView

appx/src/main/res/layout/activity_tab_no_view_pager.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
app:tab_item_autoScale="true"
3434
app:tab_scale_factor="1.2"
3535
app:tab_visual_count="2"
36+
app:tab_width_equals_text="true"
3637
/>
3738

3839
<com.zhengsr.tablib.view.flow.TabFlowLayout

tablibx/src/main/java/com/zhengsr/tablib/bean/TabBean.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ public class TabBean {
7474
public int visualCount = -1;
7575

7676

77+
/**
78+
* tab 的宽度是否跟随text的宽度大小,只对 rect 有用
79+
*/
80+
public boolean tabWidthEqualsText = true;
81+
7782
@Override
7883
public String toString() {
7984
return "TabBean{" +

tablibx/src/main/java/com/zhengsr/tablib/utils/AttrsUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public static TabBean getTabBean(TypedArray ta){
4343
bean.actionOrientation = ta.getInteger(R.styleable.AbsFlowLayout_tab_action_orientaion,-1);
4444
bean.isAutoScroll = ta.getBoolean(R.styleable.AbsFlowLayout_tab_isAutoScroll, true);
4545
bean.visualCount = ta.getInteger(R.styleable.AbsFlowLayout_tab_visual_count, -1);
46+
bean.tabWidthEqualsText = ta.getBoolean(R.styleable.AbsFlowLayout_tab_width_equals_text,true);
4647

4748
return bean;
4849
}

0 commit comments

Comments
 (0)