Merge pull request #84 from NativeScript/colors

Alexander Vakrilov · web-flow · commit 63302a4a72a9 · 2017-02-17T14:40:17.000+02:00
TabView colors fixes
diff --git a/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java b/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java
@@ -131,19 +131,19 @@ public int[] getSelectedIndicatorColors() {
         return this.mSelectedIndicatorColors;
     }
 
-    public void setTabTextColor(Integer color){
+    public void setTabTextColor(int color){
         mTabStrip.setTabTextColor(color);
     }
 
-    public Integer getTabTextColor(){
+    public int getTabTextColor(){
         return mTabStrip.getTabTextColor();
     }
 
-    public void setSelectedTabTextColor(Integer color){
+    public void setSelectedTabTextColor(int color){
         mTabStrip.setSelectedTabTextColor(color);
     }
 
-    public Integer getSelectedTabTextColor(){
+    public int getSelectedTabTextColor(){
         return mTabStrip.getSelectedTabTextColor();
     }
 
diff --git a/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java b/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java
@@ -50,9 +50,8 @@ class TabStrip extends LinearLayout {
     private TabLayout.TabColorizer mCustomTabColorizer;
     private final SimpleTabColorizer mDefaultTabColorizer;
 
-    private int mDefaultTabTextColor;
-    private int mTabTextColor = -1;
-    private int mSelectedTabTextColor = -1;
+    private int mTabTextColor;
+    private int mSelectedTabTextColor;
 
     TabStrip(Context context) {
         this(context, null);
@@ -83,7 +82,10 @@ class TabStrip extends LinearLayout {
         mSelectedIndicatorPaint = new Paint();
 
         TextView defaultTextView = new TextView(context);
-        mDefaultTabTextColor = defaultTextView.getTextColors().getDefaultColor();
+        mTabTextColor = defaultTextView.getTextColors().getDefaultColor();
+
+        // Default selected color is the same as mTabTextColor
+        mSelectedTabTextColor = mTabTextColor;
     }
 
     void setCustomTabColorizer(TabLayout.TabColorizer customTabColorizer) {
@@ -122,20 +124,10 @@ private void updateTabsTextColor(){
             LinearLayout linearLayout = (LinearLayout)getChildAt(i);
             TextView textView = (TextView)linearLayout.getChildAt(1);
             if (i == mSelectedPosition){
-                if (mSelectedTabTextColor >= 0){
-                    textView.setTextColor(mSelectedTabTextColor);
-                }
-                else {
-                    textView.setTextColor(mDefaultTabTextColor);
-                }
+                textView.setTextColor(mSelectedTabTextColor);
             }
             else {
-                if (mTabTextColor >= 0){
-                    textView.setTextColor(mTabTextColor);
-                }
-                else {
-                    textView.setTextColor(mDefaultTabTextColor);
-                }
+                textView.setTextColor(mTabTextColor);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -131,19 +131,19 @@ public int[] getSelectedIndicatorColors() {`
`131`	`131`	`return this.mSelectedIndicatorColors;`
`132`	`132`	`}`
`133`	`133`
`134`		`- public void setTabTextColor(Integer color){`
	`134`	`+ public void setTabTextColor(int color){`
`135`	`135`	`mTabStrip.setTabTextColor(color);`
`136`	`136`	`}`
`137`	`137`
`138`		`- public Integer getTabTextColor(){`
	`138`	`+ public int getTabTextColor(){`
`139`	`139`	`return mTabStrip.getTabTextColor();`
`140`	`140`	`}`
`141`	`141`
`142`		`- public void setSelectedTabTextColor(Integer color){`
	`142`	`+ public void setSelectedTabTextColor(int color){`
`143`	`143`	`mTabStrip.setSelectedTabTextColor(color);`
`144`	`144`	`}`
`145`	`145`
`146`		`- public Integer getSelectedTabTextColor(){`
	`146`	`+ public int getSelectedTabTextColor(){`
`147`	`147`	`return mTabStrip.getSelectedTabTextColor();`
`148`	`148`	`}`
`149`	`149`