From 96b7b109368d6c46ab8ad168fb6e6d20657bee4e Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 13 Mar 2020 10:32:21 +0200 Subject: [PATCH] chore: rename variable --- .../ui/bottom-navigation/bottom-navigation.android.ts | 6 +++--- nativescript-core/ui/tabs/tabs.android.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts index 985452577..36c6922e0 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts @@ -598,8 +598,8 @@ export class BottomNavigation extends TabNavigationBase { tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor(); // COLOR - let rowColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor; - const color = rowColor || titleLabel.style.color; + let itemColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor; + const color = itemColor || titleLabel.style.color; tabItemSpec.color = color && color.android; // FONT @@ -612,7 +612,7 @@ export class BottomNavigation extends TabNavigationBase { // ICON const iconSource = tabStripItem.image && tabStripItem.image.src; if (iconSource) { - const iconInfo = this.getIconInfo(tabStripItem, rowColor); + const iconInfo = this.getIconInfo(tabStripItem, itemColor); if (iconInfo) { // TODO: Make this native call that accepts string so that we don't load Bitmap in JS. diff --git a/nativescript-core/ui/tabs/tabs.android.ts b/nativescript-core/ui/tabs/tabs.android.ts index 9e62aa543..e7d0a4952 100644 --- a/nativescript-core/ui/tabs/tabs.android.ts +++ b/nativescript-core/ui/tabs/tabs.android.ts @@ -669,8 +669,8 @@ export class Tabs extends TabsBase { tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor(); // COLOR - let rowColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor; - const color = rowColor || nestedLabel.style.color; + let itemColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor; + const color = itemColor || nestedLabel.style.color; tabItemSpec.color = color && color.android; // FONT @@ -683,7 +683,7 @@ export class Tabs extends TabsBase { // ICON const iconSource = tabStripItem.image && tabStripItem.image.src; if (iconSource) { - const icon = this.getIcon(tabStripItem, rowColor); + const icon = this.getIcon(tabStripItem, itemColor); if (icon) { // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.