Merge pull request #30 from creativetimofficial/v1.6.0

V1.6.0
creativetimofficial · Nov 4, 2020 · 0f64c73 · 0f64c73
2 parents c0152b2 + 7f222e8
commit 0f64c73
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 30 deletions.
diff --git a/App.js b/App.js
@@ -75,6 +75,8 @@ export default props => {
         </GalioProvider>
       </NavigationContainer>
     );
+  } else {
+    return null
   }
 }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,41 @@
+## [1.6.0] 2020 - 11 - 04
+### Updated dependencies
+- updated `expo-asset@8.1.5` to `expo-asset@8.2.0`
+- updated `expo-font@8.1.0` to `expo-font@8.3.0`
+- updated `react-native-gesture-handler@1.6.0` to `react-native-gesture-handler@1.7.0`
+- updated `react-native-reanimated@1.7.0` to `react-native-reanimated@1.13.0`
+- updated `react-native-screens@2.2.0` to `react-native-screens@2.10.1`
+- updated `react-native-safe-area-context@0.7.3` to `react-native-safe-area-context@3.1.4`
+- updated `@react-native-community/maksed-view@0.1.6` to `@react-native-community/maksed-view@0.1.10`
+- updated `react-native SDK@37.0.0` to `react-native SDK@39.0.0`
+- updated `react@16.9.0` to `react@16.13.1`
+- updated `babel-preset-expo@8.2.1` to `babel-preset-expo@8.3.0`
+- updated `expo SDK@37.0.0` to `expo SDK@39.0.0`
+- updated `galio-framework@0.6.3` to `galio-framework@0.7.1`
+- changed the git source for react-native-modal-dropdown
+
+### Updated files
+- Profile.js - fixed elements regarding the Photo Album
+- Elements.js - ScrollView fixed by adding width, PR accepted which removed a duplicate styling [#24](https://github.com/creativetimofficial/argon-react-native/pull/24)
+- App.js - fixed Invariant Violation via PR [#29](https://github.com/creativetimofficial/argon-react-native/pull/29)
+
+## [1.5.0] 2020 - 06 - 04
+### 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-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`
+- updated `@react-native-community/masked-view@0.1.5` to `@react-native-community/masked-view@0.1.6`
+- updated `react-native SDK@36.0.0` to `react-native SDK@37.0.0`
+- updated `babel-preset-expo@7.0.0` to `babel-preset-expo@8.2.1`
+- updated `Expo @36.0.0` to `Expo @37.0.0`
+
+### Updated files
+- used hooks for App.js
+- 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
+
 ## [1.4.0] 2020 - 03 - 05
 ### Removed dependencies
 - removed `react-navigation@3.11.0`

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # [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)
 
 
- ![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)
+ ![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)
 
 
 ![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-react-native/arg-rn-thumbnail.jpg)

diff --git a/app.json b/app.json
@@ -3,12 +3,12 @@
     "name": "Argon FREE React Native",
     "slug": "argon-free-react-native",
     "privacy": "public",
-    "sdkVersion": "37.0.0",
+    "sdkVersion": "39.0.0",
     "platforms": [
       "ios",
       "android"
     ],
-    "version": "1.5.0",
+    "version": "1.6.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "argon-react-native",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Argon React Native, based on Argon Design System. Coded by Creative Tim",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
@@ -14,28 +14,28 @@
     "url": "git+https://github.com/creativetimofficial/argon-react-native.git"
   },
   "dependencies": {
-    "@react-native-community/masked-view": "0.1.6",
+    "@react-native-community/masked-view": "0.1.10",
     "@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",
     "@use-expo/font": "^2.0.0",
-    "expo": "^37.0.0",
-    "expo-asset": "~8.1.5",
-    "expo-font": "~8.1.0",
-    "galio-framework": "^0.6.3",
+    "expo": "^39.0.0",
+    "expo-asset": "~8.2.0",
+    "expo-font": "~8.3.0",
+    "galio-framework": "^0.7.1",
     "prop-types": "^15.7.2",
-    "react": "16.9.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.7.0",
-    "react-native-safe-area-context": "0.7.3",
-    "react-native-screens": "~2.2.0"
+    "react": "16.13.1",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-39.0.3.tar.gz",
+    "react-native-gesture-handler": "~1.7.0",
+    "react-native-modal-dropdown": "git+https://github.com/siemiatj/react-native-modal-dropdown.git",
+    "react-native-reanimated": "~1.13.0",
+    "react-native-safe-area-context": "3.1.4",
+    "react-native-screens": "~2.10.1"
   },
   "devDependencies": {
-    "babel-preset-expo": "^8.2.1"
+    "babel-preset-expo": "^8.3.0"
   },
   "keywords": [
     "argon react native",

diff --git a/screens/Elements.js b/screens/Elements.js
@@ -62,7 +62,7 @@ class Elements extends React.Component {
             </Button>
           </Block>
           <Block row space="evenly">
-            <Block flex left>
+            <Block flex left style={{marginTop: 8}}>
               <Select
                 defaultIndex={1}
                 options={["01", "02", "03", "04", "05"]}
@@ -392,7 +392,7 @@ class Elements extends React.Component {
   render() {
     return (
       <Block flex center>
-        <ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={{ paddingBottom: 30 }}>
+        <ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={{ paddingBottom: 30, width }}>
           {this.renderButtons()}
           {this.renderText()}
           {this.renderInputs()}
@@ -442,9 +442,6 @@ const styles = StyleSheet.create({
   inputTheme: {
     borderBottomColor: argonTheme.COLORS.PRIMARY
   },
-  inputTheme: {
-    borderBottomColor: argonTheme.COLORS.PRIMARY
-  },
   inputInfo: {
     borderBottomColor: argonTheme.COLORS.INFO
   },

diff --git a/screens/Profile.js b/screens/Profile.js
@@ -128,20 +128,15 @@ class Profile extends React.Component {
                   </Block>
                   <Block
                     row
-                    style={{ paddingVertical: 14, alignItems: "baseline" }}
+                    space="between"
                   >
-                    <Text bold size={16} color="#525F7F">
+                    <Text bold size={16} color="#525F7F" style={{marginTop: 12}}>
                       Album
                     </Text>
-                  </Block>
-                  <Block
-                    row
-                    style={{ paddingBottom: 20, justifyContent: "flex-end" }}
-                  >
                     <Button
                       small
                       color="transparent"
-                      textStyle={{ color: "#5E72E4", fontSize: 12 }}
+                      textStyle={{ color: "#5E72E4", fontSize: 12, marginLeft: 24 }}
                     >
                       View all
                     </Button>