feat(android-bottom-navigation): create tab item spec from image and label

Implements NativeScript/nativescript-angular#1893 for Android.

Author: vchimev

tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts

@@ -12,6 +12,8 @@ import { CSSType, Color } from "../core/view";
 import { Frame, View } from "../frame";
 import { RESOURCE_PREFIX, ad, layout } from "../../utils/utils";
 import { fromFileOrResource } from "../../image-source";
+import * as application from "../../application";
+
 // TODO: Impl trace
 // import { isEnabled as traceEnabled, write as traceWrite } from "../../../trace";
 
@@ -159,34 +161,35 @@ function initializeNativeClasses() {
 }
 
 function createTabItemSpec(tabStripItem: TabStripItem): org.nativescript.widgets.TabItemSpec {
-    const result = new org.nativescript.widgets.TabItemSpec();
-    result.title = tabStripItem.title;
-
-    if (tabStripItem.backgroundColor instanceof Color) {
-        result.backgroundColor = tabStripItem.backgroundColor.android;
-    }
-
-    if (tabStripItem.iconSource) {
-        if (tabStripItem.iconSource.indexOf(RESOURCE_PREFIX) === 0) {
-            result.iconId = ad.resources.getDrawableId(tabStripItem.iconSource.substr(RESOURCE_PREFIX.length));
-            if (result.iconId === 0) {
+    let iconSource;
+    const tabItemSpec = new org.nativescript.widgets.TabItemSpec();
+
+    // Image and Label children of TabStripItem
+    // take priority over its `iconSource` and `title` properties
+    iconSource = tabStripItem.image ? tabStripItem.image.src : tabStripItem.iconSource;
+    tabItemSpec.title = tabStripItem.label ? tabStripItem.label.text : tabStripItem.title;
+
+    if (iconSource) {
+        if (iconSource.indexOf(RESOURCE_PREFIX) === 0) {
+            tabItemSpec.iconId = ad.resources.getDrawableId(iconSource.substr(RESOURCE_PREFIX.length));
+            if (tabItemSpec.iconId === 0) {
                 // TODO:
-                // traceMissingIcon(tabStripItem.iconSource);
+                // traceMissingIcon(iconSource);
             }
         } else {
             const is = fromFileOrResource(tabStripItem.iconSource);
             if (is) {
                 // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
                 // tslint:disable-next-line:deprecation
-                result.iconDrawable = new android.graphics.drawable.BitmapDrawable(is.android);
+                tabItemSpec.iconDrawable = new android.graphics.drawable.BitmapDrawable(application.android.context.getResources(), is.android);
             } else {
                 // TODO:
-                // traceMissingIcon(tabStripItem.iconSource);
+                // traceMissingIcon(iconSource);
             }
         }
     }
 
-    return result;
+    return tabItemSpec;
 }
 
 function setElevation(grid: org.nativescript.widgets.GridLayout, bottomNavigationBar: org.nativescript.widgets.BottomNavigationBar) {
@@ -471,7 +474,7 @@ export class BottomNavigation extends TabNavigationBase {
             }
 
             this._currentFragment = fragment;
-        
+
             const tabItems = this.items;
             const tabItem = tabItems ? tabItems[position] : null;
             if (tabItem) {

tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts

@@ -1,4 +1,4 @@
-// Types
+// Types
 import { TabContentItem } from "../tab-navigation-base/tab-content-item";
 import { TabStripItem } from "../tab-navigation-base/tab-strip-item";
 import { TextTransform } from "../text-base";
@@ -487,19 +487,15 @@ export class BottomNavigation extends TabNavigationBase {
             const controller = this.getViewController(item);
 
             if (this.tabStrip && this.tabStrip.items && this.tabStrip.items[i]) {
-                const item = <TabStripItem>this.tabStrip.items[i];
-                const tabBarItem = this.createTabBarItem(item, i);
-                updateTitleAndIconPositions(item, tabBarItem, controller);
+                const tabStripItem = <TabStripItem>this.tabStrip.items[i];
+                const tabBarItem = this.createTabBarItem(tabStripItem, i);
+                updateTitleAndIconPositions(tabStripItem, tabBarItem, controller);
 
                 applyStatesToItem(tabBarItem, states);
 
                 controller.tabBarItem = tabBarItem;
-<<<<<<< HEAD
                 (<any>tabStripItem).index = i;
                 tabStripItem.setNativeView(tabBarItem);
-=======
-                item.setNativeView(tabBarItem);
->>>>>>> feat(ios-bottom-navigation): create tab bar from image nad label
             }
 
             controllers.addObject(controller);