Merge branch 'master' of github.com:nativescript-community/ui-material-components

# Conflicts:
#	src/button/button.android.ts

Author: farfromrefug

package.json

@@ -94,4 +94,4 @@
     "dependencies": {
         "ts-node": "^8.10.2"
     }
-}
+}

src/bottomnavigationbar/bottomnavigationbar.ios.ts

@@ -1,6 +1,16 @@
 import { themer } from '@nativescript-community/ui-material-core';
 import { Application, Color, Screen, Utils, backgroundColorProperty } from '@nativescript/core';
-import { BottomNavigationBarBase, BottomNavigationTabBase,TitleVisibility,  activeColorCssProperty, badgeColorCssProperty, badgeTextColorCssProperty, inactiveColorCssProperty, tabsProperty, titleVisibilityProperty } from './bottomnavigationbar-common';
+import {
+    BottomNavigationBarBase,
+    BottomNavigationTabBase,
+    TitleVisibility,
+    activeColorCssProperty,
+    badgeColorCssProperty,
+    badgeTextColorCssProperty,
+    inactiveColorCssProperty,
+    tabsProperty,
+    titleVisibilityProperty
+} from './bottomnavigationbar-common';
 
 @NativeClass
 class BottomNavigationBarDelegate extends NSObject {
@@ -17,21 +27,23 @@ class BottomNavigationBarDelegate extends NSObject {
         if (!owner) {
             return;
         }
-        if (owner.selectedTabIndex === item.tag) {
-            owner._emitTabReselected(item.tag);
+        const tag = item && item.tag ? item.tag : 0;
+        if (owner.selectedTabIndex === tag) {
+            owner._emitTabReselected(tag);
             return;
         }
-        owner._emitTabSelected(item.tag);
+        owner._emitTabSelected(tag);
     }
 
     bottomNavigationBarShouldSelectItem(bottomNavigationBar: MDCBottomNavigationBar, item: UITabBarItem): boolean {
         const owner = this._owner.get();
         if (!owner) {
             return true;
         }
-        const bottomNavigationTab = owner.items[item.tag];
+        const tag = item && item.tag ? item.tag : 0;
+        const bottomNavigationTab = owner.items[tag];
         if (!bottomNavigationTab.isSelectable) {
-            owner._emitTabPressed(item.tag);
+            owner._emitTabPressed(tag);
         }
         return bottomNavigationTab.isSelectable;
     }
@@ -140,10 +152,9 @@ export class BottomNavigationBar extends BottomNavigationBarBase {
             return tab;
         });
         this.nativeViewProtected.items = new NSArray({ array: bottomNavigationTabs });
-
         // TODO: this is for he v8 runtime. Should not have to need this setTimeout(), find better way.
         setTimeout(() => {
-            this.nativeViewProtected.selectedItem = this.nativeViewProtected.items[this.selectedTabIndex];
+            this.nativeViewProtected.selectedItem = this.nativeViewProtected.items.objectAtIndex(this.selectedTabIndex);
         }, 0);
     }
 
@@ -174,7 +185,7 @@ declare class MDCBottomNavigationItemView extends UIView {
 export class BottomNavigationTab extends BottomNavigationTabBase {
     nativeViewProtected: UITabBarItem;
     createNativeView() {
-        let icon = this.getNativeIcon() ;
+        let icon = this.getNativeIcon();
         if (icon) {
             icon = icon.imageWithRenderingMode(UIImageRenderingMode.Automatic);
         }

src/button/button.android.ts

@@ -7,17 +7,14 @@ import {
     Font,
     ImageSource,
     Length,
-    TextTransform,
     Utils,
     androidDynamicElevationOffsetProperty,
     androidElevationProperty,
     backgroundInternalProperty,
     colorProperty,
     profile,
-    textAlignmentProperty,
-    textTransformProperty
 } from '@nativescript/core';
-import { TextAlignment } from '@nativescript/core/ui/text-base';
+import { TextTransform, textAlignmentProperty , textTransformProperty } from '@nativescript/core/ui/text-base';
 import { ButtonBase, imageSourceProperty, srcProperty } from './button-common';
 
 let LayoutInflater: typeof android.view.LayoutInflater;

src/button/button.ios.ts

@@ -5,7 +5,6 @@ import {
     Font,
     ImageSource,
     Screen,
-    TextTransform,
     Utils,
     backgroundInternalProperty,
     borderBottomLeftRadiusProperty,
@@ -14,8 +13,8 @@ import {
     borderTopRightRadiusProperty,
     colorProperty,
     fontInternalProperty,
-    textTransformProperty
 } from '@nativescript/core';
+import { TextTransform, textTransformProperty } from '@nativescript/core/ui/text-base';
 import { ButtonBase, imageSourceProperty, srcProperty } from './button-common';
 
 let buttonScheme: MDCContainerScheme;