feat(ios-bottom-navigation): create tab bar from image nad label

vchimev · ADjenkov · commit f5c15bc7e7ce · 2019-07-10T11:45:59.000+03:00
Implements NativeScript/nativescript-angular#1893 for iOS.
diff --git a/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts b/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts
@@ -486,22 +486,20 @@ export class BottomNavigation extends TabNavigationBase {
         items.forEach((item, i) => {
             const controller = this.getViewController(item);
 
-            let icon = null;
-            let title = "";
-
             if (this.tabStrip && this.tabStrip.items && this.tabStrip.items[i]) {
-                const tabStripItem = <TabStripItem>this.tabStrip.items[i];
-                icon = this._getIcon(tabStripItem.iconSource);
-                title = tabStripItem.title;
-
-                const tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((title || ""), icon, i);
-                updateTitleAndIconPositions(tabStripItem, tabBarItem, controller);
+                const item = <TabStripItem>this.tabStrip.items[i];
+                const tabBarItem = this.createTabBarItem(item, i);
+                updateTitleAndIconPositions(item, 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);
@@ -514,6 +512,20 @@ export class BottomNavigation extends TabNavigationBase {
         this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate;
     }
 
+    private createTabBarItem(item: TabStripItem, index: number): UITabBarItem {
+        let image: UIImage;
+        let title: string;
+
+        // Image and Label children of TabStripItem
+        // take priority over its `iconSource` and `title` properties
+        image = item.image ? this._getIcon(item.image.src) : this._getIcon(item.iconSource);
+        title = item.label ? item.label.text : item.title;
+
+        const tabBarItem = UITabBarItem.alloc().initWithTitleImageTag(title, image, index);
+
+        return tabBarItem;
+    }
+
     private _getIconRenderingMode(): UIImageRenderingMode {
         return UIImageRenderingMode.AlwaysOriginal;
     }
@@ -611,4 +623,4 @@ function getTitleAttributesForStates(view: View): TabStates {
 function applyStatesToItem(item: UITabBarItem, states: TabStates) {
     item.setTitleTextAttributesForState(states.normalState, UIControlState.Normal);
     item.setTitleTextAttributesForState(states.selectedState, UIControlState.Selected);
-}
+}
