Upgraded RN and NB to 2.4.4 with new theme

haison8x · May 11, 2018 · 0743c5a · 0743c5a
1 parent e908f97
commit 0743c5a
Show file tree

Hide file tree

Showing 34 changed files with 1,067 additions and 1,090 deletions.
diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/main/assets/fonts/rubicon-icon-font.ttf b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
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
@@ -55,17 +55,18 @@
 	<array>
 		<string>Entypo.ttf</string>
 		<string>EvilIcons.ttf</string>
+		<string>Feather.ttf</string>
 		<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>SimpleLineIcons.ttf</string>
+		<string>Zocial.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
@@ -32,10 +32,10 @@
     "color": "1.0.3",
     "lodash": "4.13.1",
     "moment": "2.13.0",
-    "native-base": "2.4.2",
+    "native-base": "2.4.4",
     "react": "16.3.1",
-    "react-native": "0.55.2",
-    "react-native-vector-icons": "4.3.0",
+    "react-native": "0.55.4",
+    "react-native-vector-icons": "4.5.0",
     "react-navigation": "1.5.0"
   }
 }
diff --git a/src/screens/button/block.js b/src/screens/button/block.js
@@ -29,7 +29,7 @@ class Block extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ backgroundColor: "#FFF", padding: 20 }}>
+        <Content padder style={{ backgroundColor: "#FFF" }}>
           <Button block light style={styles.mb15}>
             <Text>Light</Text>
           </Button>

diff --git a/src/screens/button/custom.js b/src/screens/button/custom.js
@@ -29,7 +29,7 @@ class Custom extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ padding: 20 }}>
+        <Content padder>
           <Button small style={styles.mb15}>
             <Text>Default Small</Text>
           </Button>

diff --git a/src/screens/button/default.js b/src/screens/button/default.js
@@ -29,7 +29,7 @@ class Default extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ backgroundColor: "#fff", padding: 20 }}>
+        <Content padder style={{ backgroundColor: "#fff" }}>
           <Button light style={styles.mb15}>
             <Text>Light</Text>
           </Button>

diff --git a/src/screens/button/iconBtn.js b/src/screens/button/iconBtn.js
@@ -30,7 +30,7 @@ class IconBtn extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ padding: 20 }}>
+        <Content padder>
           <View
             style={{ flexDirection: "row", justifyContent: "space-between" }}
           >

diff --git a/src/screens/button/outline.js b/src/screens/button/outline.js
@@ -29,7 +29,7 @@ class Outline extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ backgroundColor: "#fff", padding: 20 }}>
+        <Content padder style={{ backgroundColor: "#fff" }}>
           <Button bordered light style={styles.mb15}>
             <Text>Light</Text>
           </Button>

diff --git a/src/screens/button/rounded.js b/src/screens/button/rounded.js
@@ -29,7 +29,7 @@ class Rounded extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ backgroundColor: "#FFF", padding: 20 }}>
+        <Content padder style={{ backgroundColor: "#FFF" }}>
           <Button rounded light style={styles.mb15}>
             <Text>Light</Text>
           </Button>

diff --git a/src/screens/button/transparent.js b/src/screens/button/transparent.js
@@ -29,7 +29,7 @@ class Transparent extends Component {
           <Right />
         </Header>
 
-        <Content padder style={{ backgroundColor: "#fff", padding: 20 }}>
+        <Content padder style={{ backgroundColor: "#fff" }}>
           <Button transparent light style={styles.mb15}>
             <Text>Light</Text>
           </Button>