From 2dd3bb203a66544174992839d6af311e960bfb63 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Wed, 5 Feb 2020 16:12:43 +0200 Subject: [PATCH] fix(andoid): crash when setting font on tab-item with no image --- .../ui/bottom-navigation/bottom-navigation.android.ts | 3 +++ nativescript-core/ui/tabs/tabs.android.ts | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts index 0048ed524..34de5c4ef 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts @@ -614,6 +614,9 @@ export class BottomNavigation extends TabNavigationBase { private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable { const iconSource = tabStripItem.image && tabStripItem.image.src; + if (!iconSource) { + return null; + } let is: ImageSource; if (isFontIconURI(iconSource)) { diff --git a/nativescript-core/ui/tabs/tabs.android.ts b/nativescript-core/ui/tabs/tabs.android.ts index 6d9e446be..a2ab442df 100644 --- a/nativescript-core/ui/tabs/tabs.android.ts +++ b/nativescript-core/ui/tabs/tabs.android.ts @@ -689,6 +689,9 @@ export class Tabs extends TabsBase { private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable { const iconSource = tabStripItem.image && tabStripItem.image.src; + if (!iconSource) { + return null; + } let is: ImageSource; if (isFontIconURI(iconSource)) { @@ -814,7 +817,7 @@ export class Tabs extends TabsBase { const tabBarItem = this._tabsBar.getViewForItemAt(index); const imgView = tabBarItem.getChildAt(0); const drawable = this.getIcon(tabStripItem); - + imgView.setImageDrawable(drawable); }