Merge branch 'master' of github.com:GeekyAnts/NativeBase

DustinEwan · Dec 26, 2016 · 4cb684d · 4cb684d
2 parents 4512e7a + 4343505
commit 4cb684d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/Components/Widgets/Icon.js b/Components/Widgets/Icon.js
@@ -20,35 +20,35 @@ export default class IconNB extends NativeBaseComponent {
     }
 
     contextTypes: {
-      theme: React.PropTypes.object
+        theme: React.PropTypes.object
     }
 
     componentWillMount() {
-      switch(this.getTheme().iconFamily) {
-        case 'Ionicons':
-            this.Icon = Ionicons;
-            break;
-        case 'Entypo':
-            this.Icon = Entypo;
-            break;
-        case 'FontAwesome':
-            this.Icon = FontAwesome;
-            break;
-        case 'Foundation':
-            this.Icon = Foundation;
-            break;
-        case 'MaterialIcons':
-            this.Icon = MaterialIcons;
-            break;
-        case 'Octicons':
-            this.Icon = Octicons;
-            break;
-        case 'Zocial':
-            this.Icon = Zocial;
-            break;
-        default:
-            this.Icon = Ionicons;
-      }
+        switch(this.getTheme().iconFamily) {
+            case 'Ionicons':
+                this.Icon = Ionicons;
+                break;
+            case 'Entypo':
+                this.Icon = Entypo;
+                break;
+            case 'FontAwesome':
+                this.Icon = FontAwesome;
+                break;
+            case 'Foundation':
+                this.Icon = Foundation;
+                break;
+            case 'MaterialIcons':
+                this.Icon = MaterialIcons;
+                break;
+            case 'Octicons':
+                this.Icon = Octicons;
+                break;
+            case 'Zocial':
+                this.Icon = Zocial;
+                break;
+            default:
+                this.Icon = Ionicons;
+        }
     }
 
     static getImageSource = FontAwesome.getImageSource

diff --git a/Components/Widgets/Picker.ios.js b/Components/Widgets/Picker.ios.js
@@ -98,7 +98,7 @@ export default class PickerNB extends NativeBaseComponent {
     }
 
     render() {
-        let additionalProps = {marginLeft: -35};
+        let additionalProps = {};
         if(this.props.inlineLabel) {
           additionalProps = {paddingHorizontal: 4, justifyContent: 'flex-start', alignSelf: 'stretch'};
         }
@@ -111,7 +111,7 @@ export default class PickerNB extends NativeBaseComponent {
                 style={[this.props.style,additionalProps]}
                 onPress={() => {this._setModalVisible(true)}}>
                 {this.state.currentLabel}
-                {(this.props.iosIcon == undefined) ? '' : this.renderIcon()}
+                {(this.props.iosIcon == undefined) ? <View style={{ width: 0, height: 0 }} /> : this.renderIcon()}
             </Button>
             <Modal animationType='slide'
                 transparent={false}

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# NativeBase v0.5.13
+# NativeBase v0.5.18
 Essential cross-platform UI components for React Native