Skip to content

Commit 4262332

Browse files
authored
Merge pull request #40 from creativetimofficial/symphony-dev
Updated-v1
2 parents 1218afa + 44238d0 commit 4262332

4 files changed

Lines changed: 111 additions & 24 deletions

File tree

CHANGELOG.md

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,38 @@
1+
## [1.8.1] 2022-07-19
2+
3+
### Updated dependencies
4+
5+
- Fixed the dual header shown issue.
6+
- Updated @react-native-masked-view/masked-view@0.2.4 to @react-native-masked-view/masked-view@0.2.6
7+
- Updated expo@^42.0.0 to expo@^45.0.0
8+
- Updated expo-app-loading@~1.1.2 to expo-app-loading@~2.0.0
9+
- Updated expo-expo-asset@~8.3.2 to expo-asset@~8.5.0
10+
- Updated expo-font@~9.2.1 to expo-font@~10.1.0
11+
- Updated expo-module-core@^0.2.0 to expo-module-core@~0.9.2
12+
- Updated expo-linear-gradient@~9.2.0 to expo-linear-gradient@~11.3.0
13+
- Updated react@16.13.1 to react@17.0.2
14+
- Updated react-native@42.0.0 to react@0.68.2
15+
- Updated react-native-gesture-handler@^1.10.3 to react-native-gesture-handler@~2.2.1
16+
- Updated react-native-reanimated@~2.2.0 to react-native-reanimated@~2.8.0
17+
- Updated react-native-safe-area-context@3.2.0 to react-native-safe-area-context@4.2.4
18+
- Updated react-native-screens@~3.4.0 to react-native-screens@~3.11.1
19+
- Updated dev dependencies
20+
- Updated babel-preset-expo@8.3.0 to babel-preset-expo@~9.1.0
21+
- Updated Babel Config
22+
- Added a new plugin of react-native-reanimated/plugin
23+
124
## [1.8.0] 2022-04-12
25+
226
### Updated dependencies
3-
- added `expo-modules-core` dependency
27+
28+
- added `expo-modules-core` dependency
429
- updated existent dependencies
530
- issues poped up in `stackNagivator` after updating dependencies so fixed in `screenOption` and updated its code
631

732
## [1.7.1] 2021 - 07 - 15
33+
834
### Updated dependencies
35+
936
- updated `expo@40.0.0` to `expo@42.0.0`
1037
- updated `expo-asset@8.2.1` to `expo-asset@8.3.2`
1138
- updated `expo-font@8.4.0` to `expo-font@9.2.1`
@@ -17,10 +44,13 @@
1744
- updated `react-native-screens@2.15.2` to `react-native-screens@3.4.0`
1845

1946
### Updated files
47+
2048
- removed deprecated `useSafeArea` from `navigation/Menu.js`
2149

2250
## [1.7.0] 2020 - 11 - 04
51+
2352
### Updated dependencies
53+
2454
- updated `@react-navigation/bottom-tabs@5.06` to `@react-navigation/bottom-tabs@5.5.1`
2555
- updated `@react-navigation/compat@5.0.0` to `@react-navigation/compat@5.1.25`
2656
- updated `@react-navigation/drawer@5.0.0` to `@react-navigation/drawer@5.12.4`
@@ -36,12 +66,14 @@
3666
- added `expo-app-loading@1.01`
3767

3868
### Updated files
69+
3970
- `useNativeDriver` warning fixed in `Tabs.js`
4071
- card height changed in `Register.js`
4172

42-
4373
## [1.6.0] 2020 - 11 - 04
74+
4475
### Updated dependencies
76+
4577
- updated `expo-asset@8.1.5` to `expo-asset@8.2.0`
4678
- updated `expo-font@8.1.0` to `expo-font@8.3.0`
4779
- updated `react-native-gesture-handler@1.6.0` to `react-native-gesture-handler@1.7.0`
@@ -57,15 +89,18 @@
5789
- changed the git source for react-native-modal-dropdown
5890

5991
### Updated files
92+
6093
- Profile.js - fixed elements regarding the Photo Album
6194
- Elements.js - ScrollView fixed by adding width, PR accepted which removed a duplicate styling [#24](https://github.com/creativetimofficial/argon-react-native/pull/24)
6295
- App.js - fixed Invariant Violation via PR [#29](https://github.com/creativetimofficial/argon-react-native/pull/29)
6396

6497
## [1.5.0] 2020 - 06 - 04
98+
6599
### Updated dependencies
100+
66101
- updated `expo-asset@8.0.0` to `expo-asset@8.1.5`
67102
- updated `expo-font@8.0.0` to `expo-font@8.1.0`
68-
- updated `react-native-gesture-handler@1.5.0` to `react-native-gesture-handler@1.6.0`
103+
- updated `react-native-gesture-handler@1.5.0` to `react-native-gesture-handler@1.6.0`
69104
- updated `react-native-reanimated@1.4.0` to `react-native-reanimated@1.7.0`
70105
- updated `react-native-screens@2.0.0-alpha.12` to `react-native-screens@2.2.0`
71106
- updated `react-native-safe-area-context@0.6.0` to `react-native-safe-area-context@0.7.3`
@@ -75,14 +110,18 @@
75110
- updated `Expo @36.0.0` to `Expo @37.0.0`
76111

77112
### Updated files
113+
78114
- used hooks for App.js
79115
- moved `assets/font/argon.json` to `assets/config/argon.json` in order to make sure there wouldn't be any issue with the build for Android
80116

81117
## [1.4.0] 2020 - 03 - 05
118+
82119
### Removed dependencies
120+
83121
- removed `react-navigation@3.11.0`
84122

85123
### Added dependencies
124+
86125
- added `@react-navigation/compat@5.0.0`
87126
- added `@react-navigation/drawer@5.0.0`
88127
- added `@react-navigation/native@5.0.0`
@@ -93,6 +132,7 @@
93132
- added `react-native-screeens@2.0.0-alpha.12`
94133

95134
### Updated dependencies
135+
96136
- updated `expo@35.0.0` to `expo@36.0.0`
97137
- updated `expo-asset@7.0.0` to `expo-asset@8.0.0`
98138
- updated `expo-font@7.0.0` to `expo-font@8.0.0`
@@ -101,13 +141,16 @@
101141
- updated `react@16.8.3` to `react@16.9.0`
102142

103143
### Updated files
144+
104145
- changed the whole routing from `Screens.js` because `react-navigation@5.0.0` has a new dynamic API
105146
- changed `Menu.js` for a new Drawer custom component
106147
- changed `DrawerItem.js` for a new type of `<DrawerCustomItem />`
107148
- changed props and variables so that the new `react-navigation` API could work with the following files: `Beauty.js`, `Header.js`, `Product.js`, `Gallery.js`, `Pro.js`, `Product.js`, `Settings.js`, `Register.js`, `Onboarding.js`
108149

109150
## [1.3.0] 2019-11-06
151+
110152
### Updated dependencies
153+
111154
- `expo@34.0.3` to `expo@35.0.0`
112155
- `expo-font@6.0.1` to `expo-font@7.0.0`
113156
- `expo-asset@6.0.0` to `expo-asset@7.0.0`
@@ -116,10 +159,13 @@
116159
- `babel-preset-expo@5.0.0` to `babel-preset-expo@7.0.0`
117160

118161
### Updated files
162+
119163
- changed drawer items in order to have a similar look to the PRO version
120164

121165
## [1.2.0] 2019-09-18
166+
122167
### Updated dependencies
168+
123169
- `expo@33.0.0` to `expo@34.0.3`
124170
- `expo-font@5.0.1` to `expo-font@6.0.1`
125171
- added `expo-asset@6.0.0`
@@ -128,14 +174,16 @@
128174
- `galio-framework@0.5.3` to `galio-framework@0.6.1`
129175

130176
## [1.1.0] 2019-06-21
177+
131178
### Updated dependencies
179+
132180
- `expo@32.0.0` to `expo@33.0.0`
133181
- `galio-framework@0.5.1` to `galio-framework@0.5.3`
134182
- `react-native SDK@32.0.0` to `react-native SDK@33.0.0`
135183
- `react-navigation@3.8.1` to `react-navigation@3.11.0`
136184
- `react@16.5.0` to `react@16.8.3`
137185
- added `expo-font@5.0.1`
138186

139-
140187
## [1.0.0] 2019-06-07
188+
141189
### Initial Release

babel.config.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
module.exports = function(api) {
1+
module.exports = function (api) {
22
api.cache(true);
33
return {
4-
presets: ['babel-preset-expo'],
4+
presets: ["babel-preset-expo"],
5+
plugins: [
6+
[
7+
"module-resolver",
8+
{
9+
extensions: [".tsx", ".ts", ".js", ".json"],
10+
},
11+
],
12+
"react-native-reanimated/plugin",
13+
],
514
};
615
};

navigation/Screens.js

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,41 @@ function AppStack(props) {
246246
}}
247247
initialRouteName="Home"
248248
>
249-
<Drawer.Screen name="Home" component={HomeStack} />
250-
<Drawer.Screen name="Profile" component={ProfileStack} />
251-
<Drawer.Screen name="Account" component={Register} />
252-
<Drawer.Screen name="Elements" component={ElementsStack} />
253-
<Drawer.Screen name="Articles" component={ArticlesStack} />
249+
<Drawer.Screen
250+
name="Home"
251+
component={HomeStack}
252+
options={{
253+
headerShown: false,
254+
}}
255+
/>
256+
<Drawer.Screen
257+
name="Profile"
258+
component={ProfileStack}
259+
options={{
260+
headerShown: false,
261+
}}
262+
/>
263+
<Drawer.Screen
264+
name="Account"
265+
component={Register}
266+
options={{
267+
headerShown: false,
268+
}}
269+
/>
270+
<Drawer.Screen
271+
name="Elements"
272+
component={ElementsStack}
273+
options={{
274+
headerShown: false,
275+
}}
276+
/>
277+
<Drawer.Screen
278+
name="Articles"
279+
component={ArticlesStack}
280+
options={{
281+
headerShown: false,
282+
}}
283+
/>
254284
</Drawer.Navigator>
255285
);
256286
}

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
"url": "git+https://github.com/creativetimofficial/argon-react-native.git"
1515
},
1616
"dependencies": {
17-
"@react-native-masked-view/masked-view": "0.2.4",
17+
"@react-native-masked-view/masked-view": "0.2.6",
1818
"@react-navigation/bottom-tabs": "^6.3.1",
1919
"@react-navigation/compat": "^5.1.25",
2020
"@react-navigation/drawer": "5.12.4",
2121
"@react-navigation/native": "^6.0.10",
2222
"@react-navigation/stack": "^6.2.1",
2323
"@use-expo/font": "^2.0.0",
24-
"expo": "^42.0.0",
25-
"expo-app-loading": "1.1.2",
26-
"expo-asset": "~8.3.2",
27-
"expo-font": "~9.2.1",
28-
"expo-modules-core": "^0.2.0",
24+
"expo": "^45.0.0",
25+
"expo-app-loading": "~2.0.0",
26+
"expo-asset": "~8.5.0",
27+
"expo-font": "~10.1.0",
28+
"expo-modules-core": "~0.9.2",
2929
"galio-framework": "^0.8.0",
3030
"prop-types": "^15.7.2",
31-
"react": "16.13.1",
32-
"react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
33-
"react-native-gesture-handler": "^1.10.3",
31+
"react": "17.0.2",
32+
"react-native": "0.68.2",
33+
"react-native-gesture-handler": "~2.2.1",
3434
"react-native-modal-dropdown": "git+https://github.com/siemiatj/react-native-modal-dropdown.git",
35-
"react-native-reanimated": "~2.2.0",
36-
"react-native-safe-area-context": "3.2.0",
37-
"react-native-screens": "^3.4.0"
35+
"react-native-reanimated": "~2.8.0",
36+
"react-native-safe-area-context": "4.2.4",
37+
"react-native-screens": "~3.11.1"
3838
},
3939
"devDependencies": {
40-
"babel-preset-expo": "8.3.0"
40+
"babel-preset-expo": "~9.1.0"
4141
},
4242
"keywords": [
4343
"argon react native",

0 commit comments

Comments
 (0)