fix: return default tab background color when the background color is not explicitely set through css (NativeScript#8240)

vtrifonov · vakrilov · web-flow · commit 8569b51a9a0e · 2020-01-14T15:53:26.000+02:00
* fix: return default tab background color

when the background color is not explicitely set through css

* chore: update NativeScript.api.md

* fix: do not cast return getTabBarBackgroundColor to ColorDrawable

* chore: added comment and method check

Co-authored-by: Alexander Vakrilov &lt;alexander.vakrilov@gmail.com&gt;
diff --git a/api-reports/NativeScript.api.md b/api-reports/NativeScript.api.md
@@ -2197,6 +2197,8 @@ export class TabContentItem extends ContentView {
 export class TabNavigationBase extends View {
     android: any /* android.view.View */;
 
+    getTabBarBackgroundArgbColor(): any
+
     getTabBarBackgroundColor(): any
 
     getTabBarColor(): any
diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
@@ -578,9 +578,7 @@ export class BottomNavigation extends TabNavigationBase {
 
             // BACKGROUND-COLOR
             const backgroundColor = tabStripItem.style.backgroundColor;
-            if (backgroundColor) {
-                tabItemSpec.backgroundColor = backgroundColor.android;
-            }
+            tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
 
             // COLOR
             const color = titleLabel.style.color;
diff --git a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts
@@ -90,6 +90,12 @@ export class TabNavigationBase extends View {
      */
     getTabBarBackgroundColor(): any
 
+    /**
+     * @private
+     * Method is intended to be overridden by inheritors and used as "protected"
+     */
+    getTabBarBackgroundArgbColor(): any
+
     /**
      * @private
      * Method is intended to be overridden by inheritors and used as "protected"
diff --git a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts
@@ -113,6 +113,13 @@ export class TabNavigationBase extends View implements TabNavigationBaseDefiniti
         return null;
     }
 
+    public getTabBarBackgroundArgbColor(): any {
+        // This method is implemented only for Android
+        const colorDrawable = this.getTabBarBackgroundColor();
+
+        return colorDrawable && colorDrawable.getColor && colorDrawable.getColor();
+    }
+
     public setTabBarBackgroundColor(value: any): void {
         // overridden by inheritors
     }
diff --git a/nativescript-core/ui/tabs/tabs.android.ts b/nativescript-core/ui/tabs/tabs.android.ts
@@ -653,9 +653,7 @@ export class Tabs extends TabsBase {
 
             // BACKGROUND-COLOR
             const backgroundColor = tabStripItem.style.backgroundColor;
-            if (backgroundColor) {
-                tabItemSpec.backgroundColor = backgroundColor.android;
-            }
+            tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
 
             // COLOR
             const color = nestedLabel.style.color;

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,13 @@ export class TabNavigationBase extends View implements TabNavigationBaseDefiniti`
`113`	`113`	`return null;`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public getTabBarBackgroundArgbColor(): any {`
	`117`	`+ // This method is implemented only for Android`
	`118`	`+ const colorDrawable = this.getTabBarBackgroundColor();`
	`119`	`+`
	`120`	`+ return colorDrawable && colorDrawable.getColor && colorDrawable.getColor();`
	`121`	`+ }`
	`122`	`+`
`116`	`123`	`public setTabBarBackgroundColor(value: any): void {`
`117`	`124`	`// overridden by inheritors`
`118`	`125`	`}`