Merge pull request #30 from creativetimofficial/v1.2.0

V1.2.0

Author: palingheorghe

App.js

@@ -43,14 +43,14 @@ export default class App extends React.Component {
     fontLoaded: false
   };
 
-  async componentDidMount() {
-    Font.loadAsync({
-      'montserrat-regular': require('./assets/font/Montserrat-Regular.ttf'),
-      'montserrat-bold': require('./assets/font/Montserrat-Bold.ttf')
-    });
+  // async componentDidMount() {
+  //   Font.loadAsync({
+  //     'montserrat-regular': require('./assets/font/Montserrat-Regular.ttf'),
+  //     'montserrat-bold': require('./assets/font/Montserrat-Bold.ttf')
+  //   });
 
-    this.setState({ fontLoaded: true });
-  }
+  //   this.setState({ fontLoaded: true });
+  // }
 
   render() {
     if (!this.state.isLoadingComplete) {
@@ -75,6 +75,12 @@ export default class App extends React.Component {
   }
 
   _loadResourcesAsync = async () => {
+    await Font.loadAsync({
+      'montserrat-regular': require('./assets/font/Montserrat-Regular.ttf'),
+      'montserrat-bold': require('./assets/font/Montserrat-Bold.ttf')
+    });
+
+    this.setState({ fontLoaded: true });
     return Promise.all([...cacheImages(assetImages)]);
   };
 

README.md

@@ -1,7 +1,7 @@
 # [Now UI React Native](https://creativetimofficial.github.io/now-ui-react-native/docs/#) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=now-ui%20React%20Native,%20a%20cool%20NowUI%20React%20Native%20App%20Template%20%E2%9D%A4%EF%B8%8F%20https%3A//bit.ly/2KAj86H%20%23reactnative%20%23NowUI%20%23designsystem%20%23developers%20via%20%40CreativeTim)
 
 
- ![version](https://img.shields.io/badge/version-1.1.0-blue.svg)  [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-react-native.svg?style=flat)](https://github.com/creativetimofficial/now-ui-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-react-native/issues?q=is%3Aissue+is%3Aclosed)
+ ![version](https://img.shields.io/badge/version-1.2.0-blue.svg)  [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-react-native.svg?style=flat)](https://github.com/creativetimofficial/now-ui-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-react-native/issues?q=is%3Aissue+is%3Aclosed)
 
 
 ![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/now-ui-react-native/opt_nurn_thumbnail.jpg)

app.json

@@ -3,9 +3,12 @@
     "name": "Now UI React Native",
     "slug": "now-ui-react-native",
     "privacy": "public",
-    "sdkVersion": "36.0.0",
-    "platforms": ["ios", "android"],
-    "version": "1.1.0",
+    "sdkVersion": "37.0.0",
+    "platforms": [
+      "ios",
+      "android"
+    ],
+    "version": "1.2.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -16,12 +19,17 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
       "supportsTablet": true
     },
     "packagerOpts": {
-      "assetExts": ["ttf"]
-    }
+      "assetExts": [
+        "ttf"
+      ]
+    },
+    "description": "Now UI React Native, based on Now UI Design System. Coded by Creative Tim"
   }
 }

assets/font/now.json assets/config/now.jsonassets/font/now.json renamed to assets/config/now.json

@@ -15,7 +15,7 @@ const iPhoneX = () =>
 const BellButton = ({ isWhite, style, navigation }) => (
   <TouchableOpacity
     style={[styles.button, style]}
-    onPress={() => navigation.navigate('Notifications')}
+    onPress={() => navigation.navigate('Pro')}
   >
     <Icon
       family="NowExtra"
@@ -28,7 +28,7 @@ const BellButton = ({ isWhite, style, navigation }) => (
 );
 
 const BasketButton = ({ isWhite, style, navigation }) => (
-  <TouchableOpacity style={[styles.button, style]} onPress={() => navigation.navigate('Cart')}>
+  <TouchableOpacity style={[styles.button, style]} onPress={() => navigation.navigate('Pro')}>
     <Icon
       family="NowExtra"
       size={16}
@@ -115,7 +115,7 @@ class Header extends React.Component {
         style={styles.search}
         placeholder="What are you looking for?"
         placeholderTextColor={'#8898AA'}
-        onFocus={() => navigation.navigate('Search')}
+        onFocus={() => navigation.navigate('Pro')}
         iconContent={
           <Icon size={16} color={theme.COLORS.MUTED} name="zoom-bold2x" family="NowExtra" />
         }

components/Header.js

@@ -3,7 +3,7 @@ import * as Font from 'expo-font';
 import { createIconSetFromIcoMoon } from '@expo/vector-icons';
 import { Icon } from 'galio-framework';
 
-import nowConfig from '../assets/font/now.json';
+import nowConfig from '../assets/config/now.json';
 const NowExtra = require('../assets/font/now.ttf');
 const IconNowExtra = createIconSetFromIcoMoon(nowConfig, 'NowExtra');
 

components/Icon.js

@@ -26,23 +26,10 @@ const Drawer = createDrawerNavigator();
 
 function ComponentsStack(props) {
   return (
-    <Stack.Navigator>
+    <Stack.Navigator initialRouteName="Components" mode="card" headerMode="screen">
       <Stack.Screen name="Components" component={Components} options={{
-        navigationOptions:({ navigation, scene }) => ({ 
-          header: <Header title="Components" navigation={navigation} scene={scene} />
-         }),
-         backgroundColor: "#FFFFFF"
-      }}/>
-    </Stack.Navigator>
-  );
-}
-
-function SettingsStack(props) {
-  return (
-    <Stack.Navigator initialRouteName="Settings" mode="card" headerMode="screen">
-      <Stackk.Screen name="Settings" component={SettingsScreen} options={{
-        header: ({ navigation, scene }) => (<Header title="Settings" navigation={navigation} scene={scene}/>),
-        backgroundcolor: '#FFFFFF'
+        header:({ navigation, scene }) => (<Header title="Components" navigation={navigation} scene={scene} />),
+        backgroundColor: "#FFFFFF"
       }}/>
     </Stack.Navigator>
   );
@@ -198,7 +185,6 @@ function AppStack(props) {
       <Drawer.Screen name="Articles" component={ArticlesStack} />
       <Drawer.Screen name="Profile" component={ProfileStack} />
       <Drawer.Screen name="Account" component={AccountStack} />
-      <Drawer.Screen name="Settings" component={AccountStack} />
     </Drawer.Navigator>
   );
 }

navigation/Screens.js

@@ -1,6 +1,6 @@
 {
   "name": "now-ui-react-native",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Now UI React Native, based on Now UI Design System. Coded by Creative Tim",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
@@ -15,29 +15,29 @@
     "url": "git+https://github.com/creativetimofficial/now-ui-react-native.git"
   },
   "dependencies": {
-    "@react-native-community/masked-view": "0.1.5",
-    "@react-navigation/bottom-tabs": "^5.0.6",
-    "@react-navigation/compat": "^5.0.0",
-    "@react-navigation/drawer": "5.0.0",
-    "@react-navigation/native": "5.0.0",
-    "@react-navigation/stack": "5.0.0",
-    "expo": "^36.0.0",
-    "expo-asset": "~8.0.0",
-    "expo-font": "~8.0.0",
+    "@react-native-community/masked-view": "0.1.6",
+    "@react-navigation/bottom-tabs": "^5.5.1",
+    "@react-navigation/compat": "^5.1.25",
+    "@react-navigation/drawer": "5.8.1",
+    "@react-navigation/native": "5.5.0",
+    "@react-navigation/stack": "5.4.1",
+    "expo": "^37.0.0",
+    "expo-asset": "~8.1.5",
+    "expo-font": "~8.1.0",
     "galio-framework": "^0.6.3",
     "prop-types": "^15.7.2",
     "react": "16.9.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
-    "react-native-gesture-handler": "~1.5.0",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
+    "react-native-gesture-handler": "~1.6.0",
     "react-native-modal-dropdown": "^0.7.0",
-    "react-native-reanimated": "~1.4.0",
-    "react-native-svg": "^9.9.5",
-    "react-native-safe-area-context": "0.6.0",
-    "react-native-screens": "2.0.0-alpha.12"
+    "react-native-reanimated": "~1.7.0",
+    "react-native-svg": "11.0.1",
+    "react-native-safe-area-context": "0.7.3",
+    "react-native-screens": "~2.2.0"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.3",
-    "babel-preset-expo": "^7.1.0"
+    "babel-preset-expo": "^8.2.1"
   },
   "keywords": [
     "now react native",