Merge branch 'master' into development

Author: SupriyaKalghatgi

README.md

@@ -6,10 +6,6 @@ Essential cross-platform UI components for React Native
 
  Updated docs [here!](https://docs.nativebase.io/)
 
- **For people having trouble upgrading to 2.1.5, check [this.](https://github.com/GeekyAnts/NativeBase/issues/928)**
-
- ### Use v2.2.1 with latest react-native version(0.46). Older versions may break.
-
 ![Demo](https://github.com/GeekyAnts/NativeBase-KitchenSink/raw/master/screenshots/iOS.gif)
 ![Demo](https://github.com/GeekyAnts/NativeBase-KitchenSink/raw/master/screenshots/Android.gif)
 

dist/src/basic/IconNB.js

@@ -18,67 +18,90 @@ import EvilIcons from "react-native-vector-icons/EvilIcons";
 import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames";
 
 class IconNB extends Component {
-	static contextTypes = {
-		theme: PropTypes.object,
-	};
+  static contextTypes = {
+    theme: PropTypes.object
+  };
 
-	setIcon(iconType) {
-		if (iconType == undefined && this.context.theme) {
-			iconType = this.context.theme["@@shoutem.theme/themeStyle"].variables.iconFamily;
-		}
-		switch (iconType) {
-			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 "MaterialCommunityIcons":
-				this.Icon = MaterialCommunityIcons;
-				break;
-			case "Octicons":
-				this.Icon = Octicons;
-				break;
-			case "Zocial":
-				this.Icon = Zocial;
-				break;
-			case "SimpleLineIcons":
-				this.Icon = SimpleLineIcons;
-				break;
-			default:
-				this.Icon = Ionicons;
-		}
-	}
+  setIcon(iconType) {
+    if (iconType == undefined && this.context.theme) {
+      iconType = this.context.theme["@@shoutem.theme/themeStyle"].variables
+        .iconFamily;
+    }
+    switch (iconType) {
+    case "Ionicons":
+      this.Icon = Ionicons;
+      break;
+    case "Entypo":
+      this.Icon = Entypo;
+      break;
+    case "Feather":
+      this.Icon = Feather;
+      break;
+    case "FontAwesome":
+      this.Icon = FontAwesome;
+      break;
+    case "Foundation":
+      this.Icon = Foundation;
+      break;
+    case "MaterialIcons":
+      this.Icon = MaterialIcons;
+      break;
+    case "MaterialCommunityIcons":
+      this.Icon = MaterialCommunityIcons;
+      break;
+    case "Octicons":
+      this.Icon = Octicons;
+      break;
+    case "Zocial":
+      this.Icon = Zocial;
+      break;
+    case "SimpleLineIcons":
+      this.Icon = SimpleLineIcons;
+      break;
+    default:
+      this.Icon = Ionicons;
+    }
+  }
 
-	componentWillMount() {
-		this.setIcon(this.props.type);
-	}
+  componentWillMount() {
+    this.setIcon(this.props.type);
+  }
 
-	componentWillUpdate(nextProps, nextState) {
-    		if (nextProps.type && this.props.type != nextProps.type) {
-      			this.setIcon(nextProps.type);
-    		}
-  	}
+  componentWillUpdate(nextProps, nextState) {
+    if (nextProps.type && this.props.type != nextProps.type) {
+      this.setIcon(nextProps.type);
+    }
+  }
 
-	render() {
-		return <this.Icon ref={c => (this._root = c)} {...this.props} />;
-	}
+  render() {
+    return <this.Icon ref={c => (this._root = c)} {...this.props} />;
+  }
 }
 
 IconNB.propTypes = {
-	style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
-	type: PropTypes.oneOf(["Ionicons", "Entypo", "FontAwesome", "Foundation", "MaterialIcons", "MaterialCommunityIcons", "Octicons", "Zocial", "SimpleLineIcons"]),
+  style: PropTypes.oneOfType([
+    PropTypes.object,
+    PropTypes.number,
+    PropTypes.array
+  ]),
+  type: PropTypes.oneOf([
+    "Ionicons",
+    "Entypo",
+    "Feather",
+    "FontAwesome",
+    "Foundation",
+    "MaterialIcons",
+    "MaterialCommunityIcons",
+    "Octicons",
+    "Zocial",
+    "SimpleLineIcons"
+  ])
 };
 
-const StyledIconNB = connectStyle("NativeBase.IconNB", {}, mapPropsToStyleNames)(IconNB);
+const StyledIconNB = connectStyle(
+  "NativeBase.IconNB",
+  {},
+  mapPropsToStyleNames
+)(IconNB);
 
 export { StyledIconNB as IconNB };