fix(android): tap-trip-item title disappearing

vakrilov · vakrilov · commit cb8cea820dff · 2020-02-05T16:17:09.000+02:00
diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
@@ -391,7 +391,7 @@ export class BottomNavigation extends TabNavigationBase {
         if (this._manager && this._manager.isDestroyed()) {
             return;
         }
-        
+
         this._attachedToWindow = true;
         this.changeTab(this.selectedIndex);
     }
@@ -705,7 +705,10 @@ export class BottomNavigation extends TabNavigationBase {
     }
 
     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());
     }
 
diff --git a/nativescript-core/ui/tab-navigation-base/tab-strip-item/tab-strip-item.ts b/nativescript-core/ui/tab-navigation-base/tab-strip-item/tab-strip-item.ts
@@ -127,23 +127,23 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
             const parent = <TabStrip>this.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._imageFontHandler = this._imageFontHandler || ((args: PropertyChangeData) => {
             const parent = <TabStrip>this.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._imageSrcHandler = this._imageSrcHandler || ((args: PropertyChangeData) => {
             const parent = <TabStrip>this.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);
     }
diff --git a/nativescript-core/ui/tabs/tabs.android.ts b/nativescript-core/ui/tabs/tabs.android.ts
@@ -819,7 +819,9 @@ export class Tabs extends TabsBase {
     }
 
     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());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ export class BottomNavigation extends TabNavigationBase {`
`391`	`391`	`if (this._manager && this._manager.isDestroyed()) {`
`392`	`392`	`return;`
`393`	`393`	`}`
`394`		`-`
	`394`	`+`
`395`	`395`	`this._attachedToWindow = true;`
`396`	`396`	`this.changeTab(this.selectedIndex);`
`397`	`397`	`}`
`@@ -705,7 +705,10 @@ export class BottomNavigation extends TabNavigationBase {`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {`
`708`		`- tabStripItem.nativeViewProtected.setTextSize(value.fontSize);`
	`708`	`+ if (value.fontSize) {`
	`709`	`+ tabStripItem.nativeViewProtected.setTextSize(value.fontSize);`
	`710`	`+ }`
	`711`	`+`
`709`	`712`	`tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());`
`710`	`713`	`}`
`711`	`714`
Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,9 @@ export class Tabs extends TabsBase {`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {`
`822`		`- tabStripItem.nativeViewProtected.setTextSize(value.fontSize);`
	`822`	`+ if (value.fontSize) {`
	`823`	`+ tabStripItem.nativeViewProtected.setTextSize(value.fontSize);`
	`824`	`+ }`
`823`	`825`	`tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());`
`824`	`826`	`}`
`825`	`827`