咸光金 4 anos atrás
pai
commit
c51cebd5dd

+ 1 - 1
app/src/main/res/layout/activity_home.xml

@@ -21,7 +21,7 @@
             android:layout_height="0.33dp"
             android:background="@color/divider_1" />
 
-        <com.ysnows.base.widget.tablayout.YTabLayout
+        <com.ysnows.base.widget.tablayout.TabLayout
             android:id="@+id/main_menu"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_48"

+ 2 - 2
base/src/main/java/com/ysnows/base/widget/tablayout/MainMenuAdapter.java

@@ -8,14 +8,14 @@ import com.ysnows.base.databinding.WidgetMemuItemBinding;
 import org.jetbrains.annotations.NotNull;
 
 
-public class MainMenuAdapter extends BAdapter<YTab, BaseDataBindingHolder<WidgetMemuItemBinding>> {
+public class MainMenuAdapter extends BAdapter<Tab, BaseDataBindingHolder<WidgetMemuItemBinding>> {
 
     public MainMenuAdapter() {
         super(R.layout.widget_memu_item);
     }
 
     @Override
-    protected void convert(@NotNull BaseDataBindingHolder<WidgetMemuItemBinding> helper, YTab tab) {
+    protected void convert(@NotNull BaseDataBindingHolder<WidgetMemuItemBinding> helper, Tab tab) {
         WidgetMemuItemBinding binding = helper.getDataBinding();
         if (binding != null) {
             binding.setTab(tab);

+ 6 - 6
base/src/main/java/com/ysnows/base/widget/tablayout/MenuTabBuilder.java

@@ -87,8 +87,8 @@ public class MenuTabBuilder {
     /**
      * icon position(left/top/right/bottom)
      */
-    private @YTab.IconPosition
-    int iconPosition = YTab.ICON_POSITION_TOP;
+    private @Tab.IconPosition
+    int iconPosition = Tab.ICON_POSITION_TOP;
     /**
      * gravity of text
      */
@@ -124,7 +124,7 @@ public class MenuTabBuilder {
     /**
      * signCount or redPoint
      */
-    private int signCount = YTab.NO_SIGN_COUNT_AND_RED_POINT;
+    private int signCount = Tab.NO_SIGN_COUNT_AND_RED_POINT;
 
     /**
      * max signCount digits, if the number is over the digits, use 'xx+' to present
@@ -310,7 +310,7 @@ public class MenuTabBuilder {
         return this;
     }
 
-    public MenuTabBuilder setIconPosition(@YTab.IconPosition int iconPosition) {
+    public MenuTabBuilder setIconPosition(@Tab.IconPosition int iconPosition) {
         this.iconPosition = iconPosition;
         return this;
     }
@@ -320,8 +320,8 @@ public class MenuTabBuilder {
         return this;
     }
 
-    public YTab build(Context context) {
-        YTab tab = new YTab(this.text);
+    public Tab build(Context context) {
+        Tab tab = new Tab(this.text);
 //        if (!skinChangeWithTintColor) {
 //            if (normalDrawableAttr != 0) {
 //                normalDrawable = QMUIResHelper.getAttrDrawable(context, normalDrawableAttr);

+ 3 - 3
base/src/main/java/com/ysnows/base/widget/tablayout/MenuTabView.java

@@ -51,9 +51,9 @@ public class MenuTabView extends LinearLayout {
         setLayoutParams(new LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1));
     }
 
-    public void setTab(YTab yTab) {
-        if (yTab != null) {
-            binding.setTab(yTab);
+    public void setTab(Tab tab) {
+        if (tab != null) {
+            binding.setTab(tab);
         }
     }
 

+ 6 - 6
base/src/main/java/com/ysnows/base/widget/tablayout/YTab.java → base/src/main/java/com/ysnows/base/widget/tablayout/Tab.java

@@ -35,7 +35,7 @@ import androidx.databinding.BaseObservable;
 import androidx.databinding.Bindable;
 import androidx.fragment.app.Fragment;
 
-public class YTab extends BaseObservable {
+public class Tab extends BaseObservable {
     public static final int ICON_POSITION_LEFT = 0;
     public static final int ICON_POSITION_TOP = 1;
     public static final int ICON_POSITION_RIGHT = 2;
@@ -86,7 +86,7 @@ public class YTab extends BaseObservable {
         return normalDrawable;
     }
 
-    public YTab setNormalDrawable(Drawable normalDrawable) {
+    public Tab setNormalDrawable(Drawable normalDrawable) {
         this.normalDrawable = normalDrawable;
         return this;
     }
@@ -95,7 +95,7 @@ public class YTab extends BaseObservable {
         return selectedDrawable;
     }
 
-    public YTab setSelectedDrawable(Drawable selectedDrawable) {
+    public Tab setSelectedDrawable(Drawable selectedDrawable) {
         this.selectedDrawable = selectedDrawable;
         return this;
     }
@@ -125,7 +125,7 @@ public class YTab extends BaseObservable {
         this.fragment = fragment;
     }
 
-    YTab(CharSequence text) {
+    Tab(CharSequence text) {
         this.text = text;
     }
 
@@ -281,7 +281,7 @@ public class YTab extends BaseObservable {
         return normalDrawableRes;
     }
 
-    public YTab setNormalDrawableRes(int normalDrawableRes) {
+    public Tab setNormalDrawableRes(int normalDrawableRes) {
         this.normalDrawableRes = normalDrawableRes;
         return this;
     }
@@ -290,7 +290,7 @@ public class YTab extends BaseObservable {
         return selectedDrawableRes;
     }
 
-    public YTab setSelectedDrawableRes(int selectedDrawableRes) {
+    public Tab setSelectedDrawableRes(int selectedDrawableRes) {
         this.selectedDrawableRes = selectedDrawableRes;
         return this;
     }

+ 15 - 15
base/src/main/java/com/ysnows/base/widget/tablayout/YTabLayout.java → base/src/main/java/com/ysnows/base/widget/tablayout/TabLayout.java

@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * Created by xianguangjin on 16/5/20.
  */
-public class YTabLayout extends RecyclerView implements OnItemClickListener {
-    private ArrayList<YTab> tabs = new ArrayList<>();
+public class TabLayout extends RecyclerView implements OnItemClickListener {
+    private ArrayList<Tab> tabs = new ArrayList<>();
 
     private int curTab = 0;
     private int preTab = 0;
@@ -32,17 +32,17 @@ public class YTabLayout extends RecyclerView implements OnItemClickListener {
     private MainMenuAdapter adapter;
     private GridLayoutManager layoutManager;
 
-    public YTabLayout(Context context) {
+    public TabLayout(Context context) {
         super(context);
         init(context, null, 0);
     }
 
-    public YTabLayout(Context context, AttributeSet attrs) {
+    public TabLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         init(context, attrs, 0);
     }
 
-    public YTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    public TabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context, attrs, defStyleAttr);
     }
@@ -50,22 +50,22 @@ public class YTabLayout extends RecyclerView implements OnItemClickListener {
     private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         setHasFixedSize(true);
         TypedArray array = context.obtainStyledAttributes(attrs,
-                R.styleable.YTabLayout, defStyleAttr, 0);
+                R.styleable.TabLayout, defStyleAttr, 0);
 
         // tabBuilder
         int normalTextSize = array.getDimensionPixelSize(
-                R.styleable.YTabLayout_android_textSize,
+                R.styleable.TabLayout_android_textSize,
                 getResources().getDimensionPixelSize(R.dimen.qmui_tab_segment_text_size));
 
         normalTextSize = array.getDimensionPixelSize(
-                R.styleable.YTabLayout_normal_text_size, normalTextSize);
+                R.styleable.TabLayout_normal_text_size, normalTextSize);
         int selectedTextSize = normalTextSize;
         selectedTextSize = array.getDimensionPixelSize(
-                R.styleable.YTabLayout_selected_text_size, selectedTextSize);
+                R.styleable.TabLayout_selected_text_size, selectedTextSize);
 
         mTabBuilder = new MenuTabBuilder(context)
                 .setTextSize(normalTextSize, selectedTextSize)
-                .setIconPosition(array.getInt(R.styleable.YTabLayout_icon_position,
+                .setIconPosition(array.getInt(R.styleable.TabLayout_icon_position,
                         QMUITab.ICON_POSITION_LEFT));
 
         array.recycle();
@@ -86,7 +86,7 @@ public class YTabLayout extends RecyclerView implements OnItemClickListener {
         adapter.setList(tabs);
     }
 
-    public YTabLayout addTab(YTab tab) {
+    public TabLayout addTab(Tab tab) {
         tabs.add(tab);
         return this;
     }
@@ -112,19 +112,19 @@ public class YTabLayout extends RecyclerView implements OnItemClickListener {
 
         Fragment fragment;
         for (int i = 0; i < tabs.size(); i++) {
-            YTab yTab = tabs.get(i);
+            Tab tab = tabs.get(i);
             fragment = manager.findFragmentByTag("tab_" + i);
 
             if (tabIndex == i) {
-                yTab.setSelected(true);
+                tab.setSelected(true);
                 if (fragment == null) {
-                    fragment = yTab.fragment;
+                    fragment = tab.fragment;
                     transaction.add(R.id.container, fragment, "tab_" + tabIndex);
                 } else {
                     transaction.show(fragment);
                 }
             } else {
-                yTab.setSelected(false);
+                tab.setSelected(false);
                 if (fragment == null) {
                     continue;
                 }

+ 1 - 1
base/src/main/res/layout/widget_memu_item.xml

@@ -4,7 +4,7 @@
 
         <variable
             name="tab"
-            type="com.ysnows.base.widget.tablayout.YTab" />
+            type="com.ysnows.base.widget.tablayout.Tab" />
 
     </data >
 

+ 1 - 1
base/src/main/res/values/attrs.xml

@@ -26,7 +26,7 @@
 
 
     <!--   TabLayout -->
-    <declare-styleable name="YTabLayout" >
+    <declare-styleable name="TabLayout" >
         <attr name="indicator_height" format="dimension" />
         <attr name="has_indicator" format="boolean" />
         <attr name="indicator_top" format="boolean" />