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(andoid): crash when setting font on tab-item with no image

Browse Source
This commit is contained in:
vakrilov
2020-02-05 16:12:43 +02:00
parent cb8cea820d
commit 2dd3bb203a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)) {

5
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,7 +817,7 @@ 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);
} }