Merge pull request #25 from creativetimofficial/v1.6.0

V1.6.0

Author: palingheorghe

README.md

@@ -1,7 +1,7 @@
 # [Material Kit React Native](https://creativetimofficial.github.io/material-kit-react-native/docs/#) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Material%20Kit%20React%20Native,%20a%20cool%20Material%20Kit%20React%20Native%20App%20Template%20%E2%9D%A4%EF%B8%8F%20https%3A//bit.ly/2HObENt%20%23reactnative%20%23material%20%23design%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/material-kit-react-native.svg?style=flat)](https://github.com/creativetimofficial/material-kit-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-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/material-kit-react-native.svg?style=flat)](https://github.com/creativetimofficial/material-kit-react-native/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react-native.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react-native/issues?q=is%3Aissue+is%3Aclosed)
 
 
 ![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/material-kit-react-native/opt_mkrn_thumbnail.jpg)

app.json

@@ -4,12 +4,12 @@
     "description": "React Native - Material Kit Free",
     "slug": "rn-material-kit-free",
     "privacy": "unlisted",
-    "sdkVersion": "36.0.0",
+    "sdkVersion": "37.0.0",
     "platforms": [
       "ios",
       "android"
     ],
-    "version": "1.5.0",
+    "version": "1.6.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "splash": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-material-kit-free",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Material Kit React Native. Coded by Creative Tim",
   "main": "node_modules/expo/AppEntry.js",
   "private": true,
@@ -15,29 +15,29 @@
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@react-native-community/masked-view": "~0.1.6",
-    "@react-navigation/compat": "~5.0.5",
-    "@react-navigation/drawer": "~5.0.5",
-    "@react-navigation/native": "~5.0.5",
-    "@react-navigation/stack": "~5.0.6",
-    "expo": "36.0.0",
-    "expo-asset": "~8.0.0",
-    "expo-font": "~8.0.0",
-    "expo-linear-gradient": "~8.0.0",
+    "@react-native-community/masked-view": "0.1.6",
+    "@react-navigation/compat": "~5.1.25",
+    "@react-navigation/drawer": "~5.8.2",
+    "@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",
+    "expo-linear-gradient": "~8.1.0",
     "galio-framework": "~0.6.3",
     "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.7.0",
-    "react-native-safe-area-context": "~0.7.3",
-    "react-native-screens": "~2.0.0-beta.8"
+    "react-native-safe-area-context": "0.7.3",
+    "react-native-screens": "~2.2.0"
   },
   "devDependencies": {
-    "babel-preset-expo": "~8.0.0",
+    "babel-preset-expo": "^8.2.1",
     "cross-env": "~7.0.0",
     "expo-cli": "~3.11.7",
-    "jest-expo": "~36.0.0"
+    "jest-expo": "^37.0.0"
   },
   "bugs": {
     "url": "https://github.com/creativetimofficial/material-kit-react-native/issues"

screens/Settings.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleSheet, Switch, FlatList, Platform, TouchableOpacity, ScrollView } from "react-native";
+import { StyleSheet, Switch, FlatList, Platform, TouchableOpacity, View } from "react-native";
 import { Block, Text, theme, Icon } from "galio-framework";
 
 import materialTheme from '../constants/Theme';
@@ -60,7 +60,7 @@ export default class Settings extends React.Component {
     ];
 
     return (
-      <ScrollView
+      <View
         showsVerticalScrollIndicator={false}
         contentContainerStyle={styles.settings}>
         <FlatList
@@ -104,7 +104,7 @@ export default class Settings extends React.Component {
           keyExtractor={(item, index) => item.id}
           renderItem={this.renderItem}
         />
-      </ScrollView>
+      </View>
 
     );
   }