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

Merge pull request #8315 from NativeScript/tab-styles-fixes

Browse Source 
fix(android): Bugs in tab strip items when changing styles dynamically
This commit is contained in:
Alexander Vakrilov
2020-02-06 18:12:25 +02:00
committed by GitHub
parent 9d59fc031f 2a5b1f4e12
commit 5ce6228ce0
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
View File

@@ -391,7 +391,7 @@ export class BottomNavigation extends TabNavigationBase {
if (this._manager && this._manager.isDestroyed()) { if (this._manager && this._manager.isDestroyed()) {
return; return;
} }
this._attachedToWindow = true; this._attachedToWindow = true;
this.changeTab(this.selectedIndex); this.changeTab(this.selectedIndex);
} }
@@ -614,6 +614,9 @@ export class BottomNavigation extends TabNavigationBase {
private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable { private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable {
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (!iconSource) {
return null;
}
let is: ImageSource; let is: ImageSource;
if (isFontIconURI(iconSource)) { if (isFontIconURI(iconSource)) {
@@ -705,7 +708,10 @@ export class BottomNavigation extends TabNavigationBase {
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize); if (value.fontSize) {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
}
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface()); tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
} }

6
nativescript-core/ui/tab-navigation-base/tab-strip-item/tab-strip-item.ts
View File

@@ -127,7 +127,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.style.on("colorChange", this._imageColorHandler); this.image.style.on("colorChange", this._imageColorHandler);
@@ -135,7 +135,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.style.on("fontInternalChange", this._imageFontHandler); this.image.style.on("fontInternalChange", this._imageFontHandler);
@@ -143,7 +143,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.on("srcChange", this._imageSrcHandler); this.image.on("srcChange", this._imageSrcHandler);
} }

9
nativescript-core/ui/tabs/tabs.android.ts
View File

@@ -689,6 +689,9 @@ export class Tabs extends TabsBase {
private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable { private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable {
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (!iconSource) {
return null;
}
let is: ImageSource; let is: ImageSource;
if (isFontIconURI(iconSource)) { if (isFontIconURI(iconSource)) {
@@ -814,12 +817,14 @@ export class Tabs extends TabsBase {
const tabBarItem = this._tabsBar.getViewForItemAt(index); const tabBarItem = this._tabsBar.getViewForItemAt(index);
const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0); const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0);
const drawable = this.getIcon(tabStripItem); const drawable = this.getIcon(tabStripItem);
imgView.setImageDrawable(drawable); imgView.setImageDrawable(drawable);
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize); if (value.fontSize) {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
}
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface()); tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
} }