fix(tabs): bottom nav item color fix

vtrifonov · vtrifonov · commit 84d23ae89e8b · 2020-03-31T11:53:10.000+03:00
diff --git a/api-reports/NativeScript.api.md b/api-reports/NativeScript.api.md
@@ -2258,6 +2258,8 @@ export class TabNavigationBase extends View {
 
     setTabBarIconColor(tabStripItem: TabStripItem, value: any): void
 
+    setTabBarIconSource(tabStripItem: TabStripItem, value: any): void
+
     setTabBarItemBackgroundColor(tabStripItem: TabStripItem, value: any): void
 
     setTabBarItemColor(tabStripItem: TabStripItem, value: any): void
diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
@@ -176,6 +176,8 @@ function initializeNativeClasses() {
                 tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent);
                 owner._setItemColor(tabStripItems[prevPosition]);
             }
+
+            owner._setItemsColors(owner.tabStrip.items);
         }
 
         public onTap(position: number): boolean {
@@ -726,7 +728,7 @@ export class BottomNavigation extends TabNavigationBase {
         });
     }
 
-    private setItemsColors(items: Array<TabStripItem>): void {
+    public _setItemsColors(items: Array<TabStripItem>): void {
         items.forEach((item) => {
             if (item.nativeView) {
                 this._setItemColor(item);
@@ -740,7 +742,7 @@ export class BottomNavigation extends TabNavigationBase {
 
     public setTabBarSelectedItemColor(value: Color) {
         this._selectedItemColor = value;
-        this.setItemsColors(this.tabStrip.items);
+        this._setItemsColors(this.tabStrip.items);
     }
 
     public getTabBarUnSelectedItemColor(): Color {
@@ -749,7 +751,7 @@ export class BottomNavigation extends TabNavigationBase {
 
     public setTabBarUnSelectedItemColor(value: Color) {
         this._unSelectedItemColor = value;
-        this.setItemsColors(this.tabStrip.items);
+        this._setItemsColors(this.tabStrip.items);
     }
 
     private updateItem(tabStripItem: TabStripItem): void {
@@ -768,6 +770,7 @@ export class BottomNavigation extends TabNavigationBase {
     }
 
     public _setItemColor(tabStripItem: TabStripItem) {
+        console.log("_setItemColor", tabStripItem._index);
         const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
         if (!itemColor) {
             return;

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ function initializeNativeClasses() {`
`176`	`176`	`tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent);`
`177`	`177`	`owner._setItemColor(tabStripItems[prevPosition]);`
`178`	`178`	`}`
	`179`	`+`
	`180`	`+ owner._setItemsColors(owner.tabStrip.items);`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`public onTap(position: number): boolean {`
`@@ -726,7 +728,7 @@ export class BottomNavigation extends TabNavigationBase {`
`726`	`728`	`});`
`727`	`729`	`}`
`728`	`730`
`729`		`- private setItemsColors(items: Array<TabStripItem>): void {`
	`731`	`+ public _setItemsColors(items: Array<TabStripItem>): void {`
`730`	`732`	`items.forEach((item) => {`
`731`	`733`	`if (item.nativeView) {`
`732`	`734`	`this._setItemColor(item);`
`@@ -740,7 +742,7 @@ export class BottomNavigation extends TabNavigationBase {`
`740`	`742`
`741`	`743`	`public setTabBarSelectedItemColor(value: Color) {`
`742`	`744`	`this._selectedItemColor = value;`
`743`		`- this.setItemsColors(this.tabStrip.items);`
	`745`	`+ this._setItemsColors(this.tabStrip.items);`
`744`	`746`	`}`
`745`	`747`
`746`	`748`	`public getTabBarUnSelectedItemColor(): Color {`
`@@ -749,7 +751,7 @@ export class BottomNavigation extends TabNavigationBase {`
`749`	`751`
`750`	`752`	`public setTabBarUnSelectedItemColor(value: Color) {`
`751`	`753`	`this._unSelectedItemColor = value;`
`752`		`- this.setItemsColors(this.tabStrip.items);`
	`754`	`+ this._setItemsColors(this.tabStrip.items);`
`753`	`755`	`}`
`754`	`756`
`755`	`757`	`private updateItem(tabStripItem: TabStripItem): void {`
`@@ -768,6 +770,7 @@ export class BottomNavigation extends TabNavigationBase {`
`768`	`770`	`}`
`769`	`771`
`770`	`772`	`public _setItemColor(tabStripItem: TabStripItem) {`
	`773`	`+ console.log("_setItemColor", tabStripItem._index);`
`771`	`774`	`const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;`
`772`	`775`	`if (!itemColor) {`
`773`	`776`	`return;`