Merge pull request #41 from creativetimofficial/symphony-dev

Updated-v1

Author: dragosct

CHANGELOG.md

@@ -1,12 +1,39 @@
+## [1.5.1] 2022-07-20
+
+### Updated dependencies
+
+- Fixed the dual header shown issue.
+- Updated @react-native-masked-view/masked-view@0.2.4 to @react-native-masked-view/masked-view@0.2.6
+- Updated expo@^42.0.0 to expo@45.0.0
+- Updated expo-app-loading@~1.1.2 to expo-app-loading@2.0.0
+- Updated expo-expo-asset@~8.3.2 to expo-asset@8.5.0
+- Updated expo-font@~9.2.1 to expo-font@10.1.0
+- Updated expo-module-core@^0.2.0 to expo-module-core@0.9.2
+- Updated react@16.13.1 to react@17.0.2
+- Updated react-native@42.0.0 to react@0.68.2
+- Updated react-native-gesture-handler@^1.10.3 to react-native-gesture-handler@2.2.1
+- Updated react-native-reanimated@~2.2.0 to react-native-reanimated@2.8.0
+- Updated react-native-safe-area-context@3.2.0 to react-native-safe-area-context@4.2.4
+- Updated react-native-screens@~3.4.0 to react-native-screens@3.11.1
+- Updated react-native-svg@12.1.1 to react-native-screens@12.3.0
+- Updated dev dependencies
+- Updated babel-preset-expo@8.3.0 to babel-preset-expo@9.1.0
+- Updated Babel Config
+- Added a new plugin of react-native-reanimated/plugin
+
 ## [1.5.0] 2022-04-12
+
 ### Updated dependencies
-- dependencies updated 
-- `expo` module core added 
+
+- dependencies updated
+- `expo` module core added
 - `stackNavigator` and `drawerNavigation` changes (color scheme set)
 - syntax update in header `Shown`
 
 ## [1.4.0] 2020 - 03 - 08
+
 ### Updated dependencies
+
 - updated `@react-navigation/drawer@5.8.1` to `@react-navigation/drawer@5.12.4`
 - updated `@react-navigation/native@5.5.0` to `@react-navigation/native@5.9.3`
 - updated `@react-navigation/stack@5.4.1` to `@react-navigation/stack@5.14.3`
@@ -20,10 +47,13 @@
 - added `expo-app-loading@1.01`
 
 ### Updated files
+
 - `useNativeDriver` warning solved for `Tabs.js`
 
 ## [1.3.0] 2020 - 11 - 06
+
 ### Updated dependencies
+
 - updated `@react-native-community/masked-view@0.1.6` to `@react-native-community/masked-view@0.1.10`
 - updated `expo@37` to `expo@39`
 - updated `expo-asset@8.1.5` to `expo-asset@8.2.0`
@@ -37,16 +67,20 @@
 - updated `react-native-screens@2.2.0` to `react-native-screens@2.10.1`
 - updated `react-native-svg@11.0.1` to `react-native-svg@12.1.0`
 - changed the git source for react-native-modal-dropdown
+
 ### Updated files
+
 - App.js - removed `packagerOpts` which solved Expo failed loading
 - Components.js - fixed layout for ScrollView, Horizontal Gallery and Select positioning
 - Header.js - fixed search input autofocusing and creating an error where the back button wouldn't work anymore keeping the user in a loop
 
 ## [1.2.0] 2020 - 06 - 20
+
 ### Updated dependencies
+
 - updated `expo-asset@8.0.0` to `expo-asset@8.1.5`
 - updated `expo-font@8.0.0` to `expo-font@8.1.0`
-- updated `react-native-gesture-handler@1.5.0` to  `react-native-gesture-handler@1.6.0`
+- updated `react-native-gesture-handler@1.5.0` to `react-native-gesture-handler@1.6.0`
 - updated `react-native-reanimated@1.4.0` to `react-native-reanimated@1.7.0`
 - updated `react-native-screens@2.0.0-alpha.12` to `react-native-screens@2.2.0`
 - updated `react-native-safe-area-context@0.6.0` to `react-native-safe-area-context@0.7.3`
@@ -61,15 +95,20 @@
 - updated `@react-navigation/drawer@5.0.0` to `@react-navigation/drawer@5.8.1`
 
 ### Updated files
+
 - change function for fontLoading in `App.js`, this should fix the often occurrence of the error
 - moved `assets/font/now.json` to `assets/config/now.json` in order to make sure there wouldn't be any issue with the build for Android
 - edited `Header.js` in order to fix the Pro routing error
 - edited `Screens.js` and fixed the headerless Components Screen
 
 ## [1.1.0] 2020 - 03 - 12
+
 ### Removed dependencies
+
 - removed `react-navigation@4.0.10`
+
 ### Added dependencies
+
 - added `@react-navigation/compat@5.0.0`
 - added `@react-navigation/drawer@5.0.0`
 - added `@react-navigation/native@5.0.0`
@@ -78,20 +117,26 @@
 - added `react-native-reanimated@1.4.0`
 - added `react-native-safe-area-context@0.6.0`
 - added `react-native-screeens@2.0.0-alpha.12`
+
 ### Updated dependencies
+
 - updated `expo@35.0.0` to `expo@36.0.1`
 - updated `expo-asset@7.0.0` to `expo-asset@8.0.0`
 - updated `expo-font@7.0.0` to `expo-font@8.0.0`
 - updated `react@16.8.3` to `react@16.9.0`
 - updated `babel-preset-expo@7.1.0` to `babel-preset-expo@8.0.0`
+
 ### Updated files
+
 - changed the whole routing from `Screens.js` because `react-navigation@5.0.0` has a new dynamic API
 - changed `Menu.js` for a new Drawer custom component
 - changed `DrawerItem.js` for a new type of `<DrawerCustomItem />`
 - changed props and variables so that the new `react-navigation` API could work with the following files: `Header.js`, `Pro.js`, `Settings.js`, `Search.js`, `Cart.js`, 'Card.js`, `Onboarding.js`
 
 ## [1.0.1] 2019-11-12
+
 ### HotFix
+
 - small fix on responsive for Profile Page
 - added pre-cache for images for a faster experience
 

babel.config.js

@@ -1,6 +1,15 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
+    plugins: [
+      [
+        'module-resolver',
+        {
+          extensions: ['.tsx', '.ts', '.js', '.json'],
+        },
+      ],
+      'react-native-reanimated/plugin',
+    ],
   };
 };

navigation/Screens.js

@@ -191,11 +191,41 @@ function AppStack(props) {
       }}
       initialRouteName="Home"
     >
-      <Drawer.Screen name="Home" component={HomeStack} />
-      <Drawer.Screen name="Components" component={ComponentsStack} />
-      <Drawer.Screen name="Articles" component={ArticlesStack} />
-      <Drawer.Screen name="Profile" component={ProfileStack} />
-      <Drawer.Screen name="Account" component={AccountStack} />
+      <Drawer.Screen
+        name="Home"
+        component={HomeStack}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Drawer.Screen
+        name="Components"
+        component={ComponentsStack}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Drawer.Screen
+        name="Articles"
+        component={ArticlesStack}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Drawer.Screen
+        name="Profile"
+        component={ProfileStack}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Drawer.Screen
+        name="Account"
+        component={AccountStack}
+        options={{
+          headerShown: false,
+        }}
+      />
     </Drawer.Navigator>
   );
 }

package.json

@@ -15,31 +15,31 @@
     "url": "git+https://github.com/creativetimofficial/now-ui-react-native.git"
   },
   "dependencies": {
-    "@react-native-masked-view/masked-view": "0.2.4",
-    "@react-navigation/bottom-tabs": "^6.3.1",
-    "@react-navigation/compat": "^5.1.25",
+    "@react-native-masked-view/masked-view": "0.2.6",
+    "@react-navigation/bottom-tabs": "6.3.1",
+    "@react-navigation/compat": "5.1.25",
     "@react-navigation/drawer": "6.4.1",
-    "@react-navigation/native": "^6.0.10",
-    "@react-navigation/stack": "^6.2.1",
-    "expo": "^42.0.0",
-    "expo-app-loading": "1.1.2",
-    "expo-asset": "~8.3.2",
-    "expo-font": "~9.2.1",
-    "expo-modules-core": "^0.2.0",
-    "galio-framework": "^0.8.0",
-    "prop-types": "^15.7.2",
-    "react": "16.13.1",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
-    "react-native-gesture-handler": "^1.10.3",
+    "@react-navigation/native": "6.0.10",
+    "@react-navigation/stack": "6.2.1",
+    "expo": "45.0.0",
+    "expo-app-loading": "2.0.0",
+    "expo-asset": "8.5.0",
+    "expo-font": "10.1.0",
+    "expo-modules-core": "0.9.2",
+    "galio-framework": "0.8.0",
+    "prop-types": "15.7.2",
+    "react": "17.0.2",
+    "react-native": "0.68.2",
+    "react-native-gesture-handler": "2.2.1",
     "react-native-modal-dropdown": "git+https://github.com/siemiatj/react-native-modal-dropdown.git",
-    "react-native-reanimated": "~2.2.0",
-    "react-native-safe-area-context": "3.2.0",
-    "react-native-screens": "~3.4.0",
-    "react-native-svg": "12.1.1"
+    "react-native-reanimated": "2.8.0",
+    "react-native-safe-area-context": "4.2.4",
+    "react-native-screens": "3.11.1",
+    "react-native-svg": "12.3.0"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.3",
-    "babel-preset-expo": "8.3.0"
+    "babel-eslint": "10.0.3",
+    "babel-preset-expo": "9.1.0"
   },
   "keywords": [
     "now react native",