javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tabs): setting item colors

Browse Source
This commit is contained in:
Vasko
2020-03-31 16:06:14 +03:00
parent 15a9df1f66
commit 0a052153d5
2 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts
View File

@@ -359,6 +359,7 @@ export class BottomNavigation extends TabNavigationBase {
public setTabBarBackgroundColor(value: UIColor | Color): void {
this._ios.tabBar.barTintColor = value instanceof Color ? value.ios : value;
this.updateAllItemsColors();
}
public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void {
@@ -386,17 +387,24 @@ export class BottomNavigation extends TabNavigationBase {
}
}
public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
if (!this._unSelectedItemColor && !this._selectedItemColor) {
const image = this.getIcon(tabStripItem);
private setIconColor(tabStripItem: TabStripItem, forceReload: boolean = false): void {
if (forceReload || (!this._unSelectedItemColor && !this._selectedItemColor)) {
// if selectedItemColor or unSelectedItemColor is set we don't respect the color from the style
const tabStripColor = (this.selectedIndex === tabStripItem._index) ? this._selectedItemColor : this._unSelectedItemColor;
const image = this.getIcon(tabStripItem, tabStripColor);
tabStripItem.nativeView.image = image;
tabStripItem.nativeView.selectedImage = image;
}
}
public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
this.setIconColor(tabStripItem);
}
public setTabBarIconSource(tabStripItem: TabStripItem, value: UIColor | Color): void {
this.updateItem(tabStripItem);
this.updateItemColors(tabStripItem);
}
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
@@ -423,7 +431,7 @@ export class BottomNavigation extends TabNavigationBase {
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
this.setItemColors();
this.updateAllItemsColors();
}
public getTabBarUnSelectedItemColor(): Color {
@@ -432,7 +440,7 @@ export class BottomNavigation extends TabNavigationBase {
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
this.setItemColors();
this.updateAllItemsColors();
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
@@ -592,15 +600,18 @@ export class BottomNavigation extends TabNavigationBase {
}
}
private updateItem(tabStripItem: TabStripItem): void {
const tabBarItem = this.createTabBarItem(tabStripItem, tabStripItem._index);
const tabBarItemController = this._ios.viewControllers[tabStripItem._index];
updateTitleAndIconPositions(tabStripItem, tabBarItem, tabBarItemController);
public updateAllItemsColors() {
this.setItemColors();
if (this.tabStrip && this.tabStrip.items) {
this.tabStrip.items.forEach(tabStripItem => {
this.updateItemColors(tabStripItem);
});
}
}
this.setViewAttributes(tabBarItem, tabStripItem.label);
tabBarItemController.tabBarItem = tabBarItem;
tabStripItem.setNativeView(tabBarItem);
private updateItemColors(tabStripItem: TabStripItem): void {
updateBackgroundPositions(this.tabStrip, tabStripItem);
this.setIconColor(tabStripItem, true);
}
private createTabBarItem(item: TabStripItem, index: number): UITabBarItem {

31
nativescript-core/ui/tabs/tabs.ios.ts
View File

@@ -550,12 +550,12 @@ export class Tabs extends TabsBase {
if (tabStripItems) {
if (tabStripItems[newIndex]) {
tabStripItems[newIndex]._emit(TabStripItem.selectEvent);
this.setIconColor(tabStripItems[newIndex]);
this.updateItemColors(tabStripItems[newIndex]);
}
if (tabStripItems[oldIndex]) {
tabStripItems[oldIndex]._emit(TabStripItem.unselectEvent);
this.setIconColor(tabStripItems[oldIndex]);
this.updateItemColors(tabStripItems[oldIndex]);
}
}
@@ -751,15 +751,19 @@ export class Tabs extends TabsBase {
}
}
private updateItem(tabStripItem: TabStripItem): void {
const tabBarItem = this.createTabBarItem(tabStripItem, tabStripItem._index);
const tabBarItemController = this._ios.viewControllers[tabStripItem._index];
updateTitleAndIconPositions(tabStripItem, tabBarItem, tabBarItemController);
private updateAllItemsColors() {
this._defaultItemBackgroundColor = null;
this.setItemColors();
if (this.tabStrip && this.tabStrip.items) {
this.tabStrip.items.forEach(tabStripItem => {
this.updateItemColors(tabStripItem);
});
}
}
this.setViewTextAttributes(tabStripItem.label);
tabBarItemController.tabBarItem = tabBarItem;
tabStripItem.setNativeView(tabBarItem);
private updateItemColors(tabStripItem: TabStripItem): void {
updateBackgroundPositions(this.tabStrip, tabStripItem);
this.setIconColor(tabStripItem, true);
}
private createTabBarItem(item: TabStripItem, index: number): UITabBarItem {
@@ -881,6 +885,7 @@ export class Tabs extends TabsBase {
public setTabBarBackgroundColor(value: UIColor | Color): void {
this._ios.tabBar.barTintColor = value instanceof Color ? value.ios : value;
this.updateAllItemsColors();
}
public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void {
@@ -978,7 +983,7 @@ export class Tabs extends TabsBase {
}
public setTabBarIconSource(tabStripItem: TabStripItem, value: UIColor | Color): void {
this.updateItem(tabStripItem);
this.updateItemColors(tabStripItem);
}
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
@@ -1045,7 +1050,7 @@ export class Tabs extends TabsBase {
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
this.setItemColors();
this.updateAllItemsColors();
}
public getTabBarUnSelectedItemColor(): Color {
@@ -1054,7 +1059,7 @@ export class Tabs extends TabsBase {
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
this.setItemColors();
this.updateAllItemsColors();
}
private visitFrames(view: ViewBase, operation: (frame: Frame) => {}) {