Upgraded RN to 0.53.0 and NB to 2.3.9

GeekyAnts · Feb 19, 2018 · 0a635b3 · 0a635b3
1 parent f6124f1
commit 0a635b3
Show file tree

Hide file tree

Showing 23 changed files with 1,403 additions and 1,433 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -16,11 +16,15 @@
 ; Ignore polyfills
 .*/Libraries/polyfills/.*
 
+; Ignore metro
+.*/node_modules/metro/.*
+
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
 emoji=true
@@ -31,18 +35,20 @@ munge_underscores=true
 
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
+module.file_ext=.native.js
+
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
-suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
-unsafe.enable_getters_and_setters=true
-
 [version]
-^0.57.0
+^0.63.0
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,8 +1,8 @@
-# [2.4.5](https://github.com/GeekyAnts/NativeBase-KitchenSink/releases/tag/v2.4.5)
+# [2.4.6](https://github.com/GeekyAnts/NativeBase-KitchenSink/releases/tag/v2.4.6)
 
 
 #### Upgraded Features
 
-*	Upgraded React Native from 0.50.1 to 0.51.0
-*   Upgraded dev-dependencies
+*	Upgraded React Native from 0.51.0 to 0.53.0
+*	Upgraded NativeBase from 2.3.5 to 2.3.9
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# NativeBase KitchenSink v2.4.5
+# NativeBase KitchenSink v2.4.6
 An example app with all the UI components of NativeBase
 
 > **NativeBase-KitchenSink** comes in three forms of app for you!

diff --git a/ios/NativebaseKitchenSink.xcodeproj/project.pbxproj b/ios/NativebaseKitchenSink.xcodeproj/project.pbxproj
diff --git a/ios/NativebaseKitchenSink/Info.plist b/ios/NativebaseKitchenSink/Info.plist
@@ -58,11 +58,14 @@
 		<string>FontAwesome.ttf</string>
 		<string>Foundation.ttf</string>
 		<string>Ionicons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
 		<string>MaterialIcons.ttf</string>
 		<string>Octicons.ttf</string>
+		<string>Roboto_medium.ttf</string>
+		<string>Roboto.ttf</string>
+		<string>rubicon-icon-font.ttf</string>
 		<string>SimpleLineIcons.ttf</string>
 		<string>Zocial.ttf</string>
+		<string>MaterialCommunityIcons.ttf</string>
 	</array>
 </dict>
 </plist>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "NativebaseKitchenSink",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "private": true,
   "devDependencies": {
     "babel-eslint": "7.2.3",
@@ -32,9 +32,9 @@
     "color": "1.0.3",
     "lodash": "4.13.1",
     "moment": "2.13.0",
-    "native-base": "2.3.5",
+    "native-base": "2.3.9",
     "react": "16.0.0",
-    "react-native": "0.51.0",
+    "react-native": "0.53.0",
     "react-native-vector-icons": "4.3.0",
     "react-navigation": "1.0.0-beta.19"
   }

diff --git a/src/screens/tab/tabFive.js b/src/screens/tab/tabFive.js
@@ -6,12 +6,15 @@ export default class TabFour extends Component {
     return (
       <Content padder style={{ marginTop: 0 }}>
         <Card style={{ flex: 0 }}>
+          <CardItem header>
+            <Text>Recommended by Awesome React Native</Text>
+          </CardItem>
           <CardItem>
             <Body>
               <Text>
-                Lorem ipsum dolor sit amet, consectetur adipisicing elit.
-                DOESN'T SUPPORT ADVANCED TABS :( numquam non magnam praesentium,
-                maxime quaerat!
+                NativeBase added into the list of Frameworks of Awesome React
+                Native and are also used by many other React lovers across the
+                world.
               </Text>
             </Body>
           </CardItem>

diff --git a/src/screens/tab/tabFour.js b/src/screens/tab/tabFour.js
@@ -6,23 +6,15 @@ export default class TabFour extends Component {
     return (
       <Content padder style={{ marginTop: 0 }}>
         <Card style={{ flex: 0 }}>
-          <CardItem>
-            <Body>
-              <Text>
-                Lorem ipsum dolor sit amet, consectetur adipisicing elit.
-                Consequuntur sunt itaque adipisci quisquam pariatur qui,
-                reiciendis architecto quod sint incidunt labore nisi totam illum
-                numquam non magnam praesentium, maxime quaerat!
-              </Text>
-            </Body>
+          <CardItem header>
+            <Text>Recommended by Microsoft</Text>
           </CardItem>
-        </Card>
-        <Card style={{ flex: 0 }}>
           <CardItem>
             <Body>
               <Text>
-                NativeBase gives you the potential of building applications that
-                run on iOS and Android using a single codebase.
+                If you're looking to get started with React Native + CodePush,
+                and are looking for an awesome starter kit, you should check out
+                Native Starter Pro - Microsoft's react-native-code-push repo
               </Text>
             </Body>
           </CardItem>

diff --git a/src/theme/components/Badge.js b/src/theme/components/Badge.js
@@ -28,6 +28,7 @@ export default (variables = variable) => {
     padding: variables.badgePadding,
     paddingHorizontal: 6,
     alignSelf: "flex-start",
+    justifyContent: variables.platform === "ios" ? "center" : undefined,
     borderRadius: 13.5,
     height: 27
   };

diff --git a/src/theme/components/Body.js b/src/theme/components/Body.js
@@ -1,11 +1,11 @@
-import variable from "./../variables/platform";
+import variable from './../variables/platform';
 
 export default (variables = variable) => {
-  const bodyTheme = {
-    flex: 1,
-    alignItems: "center",
-    alignSelf: "center"
-  };
+	const bodyTheme = {
+		flex: 1,
+		alignItems: 'center',
+		alignSelf: 'center',
+	};
 
-  return bodyTheme;
+	return bodyTheme;
 };