From f436b6f1009b48de12f9f15984b442751247f0ac Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Wed, 28 Aug 2019 13:41:29 +0300
Subject: [PATCH] feat(android): fix tab resource icon size based on spec
 (#7737)

---
 .../bottom-navigation.android.ts              | 24 +++++++------------
 tns-core-modules/ui/tabs/tabs.android.ts      | 24 +++++++------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts b/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
index 4da582b59..0fafaf048 100644
--- a/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
+++ b/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
@@ -540,23 +540,15 @@ export class BottomNavigation extends TabNavigationBase {
             // ICON
             const iconSource = tabStripItem.image && tabStripItem.image.src;
             if (iconSource) {
-                if (iconSource.indexOf(RESOURCE_PREFIX) === 0) {
-                    tabItemSpec.iconId = ad.resources.getDrawableId(iconSource.substr(RESOURCE_PREFIX.length));
-                    if (tabItemSpec.iconId === 0) {
-                        // TODO:
-                        // traceMissingIcon(iconSource);
-                    }
-                } else {
-                    const icon = this.getIcon(tabStripItem);
+                const icon = this.getIcon(tabStripItem);
 
-                    if (icon) {
-                        // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
-                        // tslint:disable-next-line:deprecation
-                        tabItemSpec.iconDrawable = icon;
-                    } else {
-                        // TODO:
-                        // traceMissingIcon(iconSource);
-                    }
+                if (icon) {
+                    // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
+                    // tslint:disable-next-line:deprecation
+                    tabItemSpec.iconDrawable = icon;
+                } else {
+                    // TODO:
+                    // traceMissingIcon(iconSource);
                 }
             }
         }
diff --git a/tns-core-modules/ui/tabs/tabs.android.ts b/tns-core-modules/ui/tabs/tabs.android.ts
index c2334f859..d5cfbf212 100644
--- a/tns-core-modules/ui/tabs/tabs.android.ts
+++ b/tns-core-modules/ui/tabs/tabs.android.ts
@@ -615,23 +615,15 @@ export class Tabs extends TabsBase {
             // ICON
             const iconSource = tabStripItem.image && tabStripItem.image.src;
             if (iconSource) {
-                if (iconSource.indexOf(RESOURCE_PREFIX) === 0) {
-                    tabItemSpec.iconId = ad.resources.getDrawableId(iconSource.substr(RESOURCE_PREFIX.length));
-                    if (tabItemSpec.iconId === 0) {
-                        // TODO:
-                        // traceMissingIcon(iconSource);
-                    }
-                } else {
-                    const icon = this.getIcon(tabStripItem);
+                const icon = this.getIcon(tabStripItem);
 
-                    if (icon) {
-                        // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
-                        // tslint:disable-next-line:deprecation
-                        tabItemSpec.iconDrawable = icon;
-                    } else {
-                        // TODO:
-                        // traceMissingIcon(iconSource);
-                    }
+                if (icon) {
+                    // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
+                    // tslint:disable-next-line:deprecation
+                    tabItemSpec.iconDrawable = icon;
+                } else {
+                    // TODO:
+                    // traceMissingIcon(iconSource);
                 }
             }
         }