From 6a1e0987a212006c396776946fce2dc1bba7f1a0 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 13 Mar 2020 19:21:12 +0200 Subject: [PATCH] chore: private methods renamed --- .../bottom-navigation/bottom-navigation.android.ts | 4 ++-- .../ui/bottom-navigation/bottom-navigation.ios.ts | 12 ++++++------ nativescript-core/ui/tabs/tabs.android.ts | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts index 46a0fbd2e..4eed400fe 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts @@ -754,10 +754,10 @@ export class BottomNavigation extends TabNavigationBase { tabStripItem.nativeViewProtected.setTextColor(itemColor.android); // set icon color - this._setIconColor(tabStripItem, itemColor); + this.setIconColor(tabStripItem, itemColor); } - private _setIconColor(tabStripItem: TabStripItem, color?: Color) { + private setIconColor(tabStripItem: TabStripItem, color?: Color) { const tabBarItem = this._bottomNavigationBar.getViewForItemAt(tabStripItem._index); const drawableInfo = this.getIconInfo(tabStripItem, color); diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts index ec77d262f..666b4e0ae 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts @@ -374,7 +374,7 @@ export class BottomNavigation extends TabNavigationBase { } public setTabBarItemColor(tabStripItem: TabStripItem, value: UIColor | Color): void { - this.setViewTextAttributes(tabStripItem.nativeView, tabStripItem.label); + this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label); } public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void { @@ -387,7 +387,7 @@ export class BottomNavigation extends TabNavigationBase { } public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { - this.setViewTextAttributes(tabStripItem.nativeView, tabStripItem.label); + this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label); } public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: TextTransform): void { @@ -541,7 +541,7 @@ export class BottomNavigation extends TabNavigationBase { const tabBarItem = this.createTabBarItem(tabStripItem, i); updateTitleAndIconPositions(tabStripItem, tabBarItem, controller); - this.setViewTextAttributes(tabBarItem, tabStripItem.label); + this.setViewAttributes(tabBarItem, tabStripItem.label); controller.tabBarItem = tabBarItem; tabStripItem._index = i; @@ -551,7 +551,7 @@ export class BottomNavigation extends TabNavigationBase { controllers.addObject(controller); }); - this._setItemImages(); + this.setItemImages(); this._ios.viewControllers = controllers; this._ios.customizableViewControllers = null; @@ -560,7 +560,7 @@ export class BottomNavigation extends TabNavigationBase { this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate; } - private _setItemImages() { + private setItemImages() { if (this._selectedItemColor || this._unSelectedItemColor) { if (this.tabStrip && this.tabStrip.items) { this.tabStrip.items.forEach(item => { @@ -730,7 +730,7 @@ export class BottomNavigation extends TabNavigationBase { selectedIndexProperty.coerce(this); } - private setViewTextAttributes(item: UITabBarItem, view: View): any { + private setViewAttributes(item: UITabBarItem, view: View): any { if (!view) { return null; } diff --git a/nativescript-core/ui/tabs/tabs.android.ts b/nativescript-core/ui/tabs/tabs.android.ts index 53a5f6b57..a00d819e1 100644 --- a/nativescript-core/ui/tabs/tabs.android.ts +++ b/nativescript-core/ui/tabs/tabs.android.ts @@ -846,10 +846,10 @@ export class Tabs extends TabsBase { tabStripItem.nativeViewProtected.setTextColor(itemColor.android); // set icon color - this._setIconColor(tabStripItem, itemColor); + this.setIconColor(tabStripItem, itemColor); } - private _setIconColor(tabStripItem: TabStripItem, color?: Color) { + private setIconColor(tabStripItem: TabStripItem, color?: Color) { const tabBarItem = this._tabsBar.getViewForItemAt(tabStripItem._index); const drawable = this.getIcon(tabStripItem, color);