Skip to content

Commit 0f64c73

Browse files
palingheorghepalingheorghe
authored
Merge pull request #30 from creativetimofficial/v1.6.0
V1.6.0
2 parents c0152b2 + 7f222e8 commit 0f64c73

File tree

7 files changed

+62
-30
lines changed

7 files changed

+62
-30
lines changed

‎App.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ export default props => {
7575
</GalioProvider>
7676
</NavigationContainer>
7777
);
78+
} else {
79+
return null
7880
}
7981
}
8082

‎CHANGELOG.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
## [1.6.0] 2020 - 11 - 04
2+
### Updated dependencies
3+
- updated `expo-asset@8.1.5` to `expo-asset@8.2.0`
4+
- updated `expo-font@8.1.0` to `expo-font@8.3.0`
5+
- updated `react-native-gesture-handler@1.6.0` to `react-native-gesture-handler@1.7.0`
6+
- updated `react-native-reanimated@1.7.0` to `react-native-reanimated@1.13.0`
7+
- updated `react-native-screens@2.2.0` to `react-native-screens@2.10.1`
8+
- updated `react-native-safe-area-context@0.7.3` to `react-native-safe-area-context@3.1.4`
9+
- updated `@react-native-community/maksed-view@0.1.6` to `@react-native-community/maksed-view@0.1.10`
10+
- updated `react-native SDK@37.0.0` to `react-native SDK@39.0.0`
11+
- updated `react@16.9.0` to `react@16.13.1`
12+
- updated `babel-preset-expo@8.2.1` to `babel-preset-expo@8.3.0`
13+
- updated `expo SDK@37.0.0` to `expo SDK@39.0.0`
14+
- updated `galio-framework@0.6.3` to `galio-framework@0.7.1`
15+
- changed the git source for react-native-modal-dropdown
16+
17+
### Updated files
18+
- Profile.js - fixed elements regarding the Photo Album
19+
- Elements.js - ScrollView fixed by adding width, PR accepted which removed a duplicate styling [#24](https://github.com/creativetimofficial/argon-react-native/pull/24)
20+
- App.js - fixed Invariant Violation via PR [#29](https://github.com/creativetimofficial/argon-react-native/pull/29)
21+
22+
## [1.5.0] 2020 - 06 - 04
23+
### Updated dependencies
24+
- updated `expo-asset@8.0.0` to `expo-asset@8.1.5`
25+
- updated `expo-font@8.0.0` to `expo-font@8.1.0`
26+
- updated `react-native-gesture-handler@1.5.0` to `react-native-gesture-handler@1.6.0`
27+
- updated `react-native-reanimated@1.4.0` to `react-native-reanimated@1.7.0`
28+
- updated `react-native-screens@2.0.0-alpha.12` to `react-native-screens@2.2.0`
29+
- updated `react-native-safe-area-context@0.6.0` to `react-native-safe-area-context@0.7.3`
30+
- updated `@react-native-community/masked-view@0.1.5` to `@react-native-community/masked-view@0.1.6`
31+
- updated `react-native SDK@36.0.0` to `react-native SDK@37.0.0`
32+
- updated `babel-preset-expo@7.0.0` to `babel-preset-expo@8.2.1`
33+
- updated `Expo @36.0.0` to `Expo @37.0.0`
34+
35+
### Updated files
36+
- used hooks for App.js
37+
- 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
38+
139
## [1.4.0] 2020 - 03 - 05
240
### Removed dependencies
341
- removed `react-navigation@3.11.0`

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Argon React Native](https://creativetimofficial.github.io/argon-react-native/docs/#) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Argon%20React%20Native,%20a%20cool%20Argon%20React%20Native%20App%20Template%20%E2%9D%A4%EF%B8%8F%20https%3A//bit.ly/2KAj86H%20%23reactnative%20%23argon%20%23designsystem%20%23developers%20via%20%40CreativeTim)
22

33

4-
![version](https://img.shields.io/badge/version-1.5.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-react-native.svg?style=flat)](https://github.com/creativetimofficial/argon-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-react-native/issues?q=is%3Aissue+is%3Aclosed)
4+
![version](https://img.shields.io/badge/version-1.6.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-react-native.svg?style=flat)](https://github.com/creativetimofficial/argon-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-react-native/issues?q=is%3Aissue+is%3Aclosed)
55

66

77
![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-react-native/arg-rn-thumbnail.jpg)

‎app.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"name": "Argon FREE React Native",
44
"slug": "argon-free-react-native",
55
"privacy": "public",
6-
"sdkVersion": "37.0.0",
6+
"sdkVersion": "39.0.0",
77
"platforms": [
88
"ios",
99
"android"
1010
],
11-
"version": "1.5.0",
11+
"version": "1.6.0",
1212
"orientation": "portrait",
1313
"icon": "./assets/icon.png",
1414
"splash": {

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-react-native",
3-
"version": "1.5.0",
3+
"version": "1.6.0",
44
"description": "Argon React Native, based on Argon Design System. Coded by Creative Tim",
55
"main": "node_modules/expo/AppEntry.js",
66
"scripts": {
@@ -14,28 +14,28 @@
1414
"url": "git+https://github.com/creativetimofficial/argon-react-native.git"
1515
},
1616
"dependencies": {
17-
"@react-native-community/masked-view": "0.1.6",
17+
"@react-native-community/masked-view": "0.1.10",
1818
"@react-navigation/bottom-tabs": "^5.0.6",
1919
"@react-navigation/compat": "^5.0.0",
2020
"@react-navigation/drawer": "5.0.0",
2121
"@react-navigation/native": "5.0.0",
2222
"@react-navigation/stack": "5.0.0",
2323
"@use-expo/font": "^2.0.0",
24-
"expo": "^37.0.0",
25-
"expo-asset": "~8.1.5",
26-
"expo-font": "~8.1.0",
27-
"galio-framework": "^0.6.3",
24+
"expo": "^39.0.0",
25+
"expo-asset": "~8.2.0",
26+
"expo-font": "~8.3.0",
27+
"galio-framework": "^0.7.1",
2828
"prop-types": "^15.7.2",
29-
"react": "16.9.0",
30-
"react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
31-
"react-native-gesture-handler": "~1.6.0",
32-
"react-native-modal-dropdown": "^0.7.0",
33-
"react-native-reanimated": "~1.7.0",
34-
"react-native-safe-area-context": "0.7.3",
35-
"react-native-screens": "~2.2.0"
29+
"react": "16.13.1",
30+
"react-native": "https://github.com/expo/react-native/archive/sdk-39.0.3.tar.gz",
31+
"react-native-gesture-handler": "~1.7.0",
32+
"react-native-modal-dropdown": "git+https://github.com/siemiatj/react-native-modal-dropdown.git",
33+
"react-native-reanimated": "~1.13.0",
34+
"react-native-safe-area-context": "3.1.4",
35+
"react-native-screens": "~2.10.1"
3636
},
3737
"devDependencies": {
38-
"babel-preset-expo": "^8.2.1"
38+
"babel-preset-expo": "^8.3.0"
3939
},
4040
"keywords": [
4141
"argon react native",

‎screens/Elements.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Elements extends React.Component {
6262
</Button>
6363
</Block>
6464
<Block row space="evenly">
65-
<Block flex left>
65+
<Block flex left style={{marginTop: 8}}>
6666
<Select
6767
defaultIndex={1}
6868
options={["01", "02", "03", "04", "05"]}
@@ -392,7 +392,7 @@ class Elements extends React.Component {
392392
render() {
393393
return (
394394
<Block flex center>
395-
<ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={{ paddingBottom: 30 }}>
395+
<ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={{ paddingBottom: 30, width }}>
396396
{this.renderButtons()}
397397
{this.renderText()}
398398
{this.renderInputs()}
@@ -442,9 +442,6 @@ const styles = StyleSheet.create({
442442
inputTheme: {
443443
borderBottomColor: argonTheme.COLORS.PRIMARY
444444
},
445-
inputTheme: {
446-
borderBottomColor: argonTheme.COLORS.PRIMARY
447-
},
448445
inputInfo: {
449446
borderBottomColor: argonTheme.COLORS.INFO
450447
},

‎screens/Profile.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,15 @@ class Profile extends React.Component {
128128
</Block>
129129
<Block
130130
row
131-
style={{ paddingVertical: 14, alignItems: "baseline" }}
131+
space="between"
132132
>
133-
<Text bold size={16} color="#525F7F">
133+
<Text bold size={16} color="#525F7F" style={{marginTop: 12}}>
134134
Album
135135
</Text>
136-
</Block>
137-
<Block
138-
row
139-
style={{ paddingBottom: 20, justifyContent: "flex-end" }}
140-
>
141136
<Button
142137
small
143138
color="transparent"
144-
textStyle={{ color: "#5E72E4", fontSize: 12 }}
139+
textStyle={{ color: "#5E72E4", fontSize: 12, marginLeft: 24 }}
145140
>
146141
View all
147142
</Button>

0 commit comments

Comments
 (0)