Merge branch 'release/2.0.1'

Author: June Domingo

.flowconfig

@@ -48,11 +48,11 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.30.0
+^0.33.0

android/app/src/main/assets/fonts/FontAwesome.ttf

@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -33,6 +32,7 @@
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		85F09C0574E54CF9BBB8348F /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F4656E289F474A0E9D8C8F88 /* libRNVectorIcons.a */; };
 		B04B6A477F9F49B09FCF4516 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5075FDCA168A4E00B6B69B60 /* Zocial.ttf */; };
+		0334EE6150C94B32A704416A /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3FFFF1E319F64D3497C9A076 /* SimpleLineIcons.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -162,6 +162,7 @@
 		B071147220BF4B25BE242744 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
 		F03A33FA8E07491DB9BDB88F /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
 		F4656E289F474A0E9D8C8F88 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
+		3FFFF1E319F64D3497C9A076 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -317,6 +318,7 @@
 				06806D9CD21D48E1B4BC7ACD /* MaterialIcons.ttf */,
 				63218BAE28B348F3BC949A87 /* Octicons.ttf */,
 				5075FDCA168A4E00B6B69B60 /* Zocial.ttf */,
+				3FFFF1E319F64D3497C9A076 /* SimpleLineIcons.ttf */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -610,6 +612,7 @@
 				79BBFED8126C438192F39138 /* MaterialIcons.ttf in Resources */,
 				125C3538491B4BF4A95F0CCF /* Octicons.ttf in Resources */,
 				B04B6A477F9F49B09FCF4516 /* Zocial.ttf in Resources */,
+				0334EE6150C94B32A704416A /* SimpleLineIcons.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

android/app/src/main/assets/fonts/Octicons.ttf

@@ -59,6 +59,7 @@
       <string>MaterialIcons.ttf</string>
       <string>Octicons.ttf</string>
       <string>Zocial.ttf</string>
+      <string>SimpleLineIcons.ttf</string>
     </array>
   </dict>
 </plist>

android/app/src/main/assets/fonts/SimpleLineIcons.ttf

@@ -9,24 +9,24 @@
     "test": "jest"
   },
   "dependencies": {
-    "axios": "^0.15.0",
-    "eslint": "^3.6.0",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-plugin-import": "^1.16.0",
-    "eslint-plugin-jsx-a11y": "^2.2.2",
-    "eslint-plugin-react": "^6.3.0",
+    "axios": "^0.15.2",
+    "eslint": "^3.9.1",
+    "eslint-config-airbnb": "^13.0.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "2.2.3",
+    "eslint-plugin-react": "^6.6.0",
     "eslint-plugin-react-native": "^2.0.0",
-    "eslint-watch": "^2.1.14",
-    "lodash": "^4.16.4",
-    "moment": "^2.15.1",
+    "eslint-watch": "2.1.14",
+    "lodash": "^4.16.6",
+    "moment": "^2.16.0",
     "numeral": "^1.5.3",
-    "react": "15.3.2",
-    "react-native": "0.32.0",
+    "react": "^15.3.2",
+    "react-native": "^0.37.0",
     "react-native-linear-gradient": "^1.5.13",
-    "react-native-navigation": "^2.0.0-experimental.133",
+    "react-native-navigation": "next",
     "react-native-scrollable-tab-view": "git+https://github.com/skv-headless/react-native-scrollable-tab-view.git",
-    "react-native-swiper": "^1.5.2",
-    "react-native-vector-icons": "^2.1.0",
+    "react-native-swiper": "^1.5.3",
+    "react-native-vector-icons": "^3.0.0",
     "react-redux": "^4.4.5",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0"
@@ -43,7 +43,7 @@
     "react-test-renderer": "15.3.2",
     "reactotron-react-native": "^1.1.4",
     "redux-immutable-state-invariant": "^1.2.4",
-    "redux-logger": "^2.7.0"
+    "redux-logger": "^2.7.4"
   },
   "description": "Discover movies and tv shows",
   "repository": {

ios/movieapp.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@ const styles = StyleSheet.create({
 		backgroundColor: '#131313'
 	},
 	contentContainer: {
+		flex: 1,
 		marginTop: 157
 	},
 	progressBar: {
@@ -96,4 +97,4 @@ const styles = StyleSheet.create({
 	}
 });
 
-export default styles;
+export default styles;