Navigation and expo update commit of modified

App.js

@@ -1,7 +1,12 @@
+import React from 'react';
+
 // Nav stuff
 
-import { createAppContainer } from 'react-navigation';
-import { createStackNavigator } from 'react-navigation-stack';
+//import { createAppContainer } from 'react-navigation';
+//import { createStackNavigator } from 'react-navigation-stack';
+
+import { NavigationContainer } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 // Screens one per file to keep things clean
 
@@ -13,16 +18,23 @@ import FilesScreen from './src/screens/FilesScreen';
 // Clean up of code before I fix the last little issue with it
 
 
-const AppNavigator = createStackNavigator(
-  {
-    Home: HomeScreen,
-    About: AboutScreen,
-    Files: FilesScreen,
-    Settings: SettingsScreen,
-  },
-  {
-    initialRouteName: 'Home',
-  }
-);
+const Stack = createNativeStackNavigator();
 
-export default createAppContainer(AppNavigator);
+
+function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator initialRouteName="Home">
+        <Stack.Screen name="Home" component={HomeScreen} />
+        <Stack.Screen name="About" component={AboutScreen} />
+        <Stack.Screen name="Files" component={FilesScreen} />
+        <Stack.Screen name="Settings" component={SettingsScreen} />
+       
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+//export default createAppContainer(AppNavigator);
+
+export default App;

app.json

@@ -2,12 +2,7 @@
   "expo": {
     "name": "csrv",
     "slug": "csrv",
-    "privacy": "public",
-    "sdkVersion": "36.0.0",
-    "platforms": [
-      "android"
-    ],
-    "version": "1.2.0",
+    "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -25,8 +20,13 @@
       "supportsTablet": true
     },
     "android": {
-      "package": "com.rpicsrv.csrv",
-      "versionCode": 2
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/adaptive-icon.png",
+        "backgroundColor": "#FFFFFF"
+      }
+    },
+    "web": {
+      "favicon": "./assets/favicon.png"
     }
   }
 }

package.json

@@ -1,4 +1,6 @@
 {
+  "name": "csrv",
+  "version": "1.0.0",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start",
@@ -8,24 +10,21 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "@react-native-community/masked-view": "0.1.5",
-    "axios": "^0.19.2",
-    "expo": "~36.0.0",
-    "react": "~16.9.0",
-    "react-dom": "~16.9.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz",
-    "react-native-elements": "^1.2.7",
-    "react-native-gesture-handler": "^1.5.3",
-    "react-native-reanimated": "~1.4.0",
-    "react-native-safe-area-context": "0.6.0",
-    "react-native-screens": "2.0.0-alpha.12",
-    "react-native-web": "~0.11.7",
-    "react-navigation": "^4.0.10",
-    "react-navigation-stack": "^2.0.16"
+    "@react-navigation/native": "^6.0.6",
+    "@react-navigation/native-stack": "^6.2.5",
+    "axios": "^0.24.0",
+    "expo": "~43.0.0",
+    "expo-status-bar": "~1.1.0",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native": "0.64.2",
+    "react-native-elements": "^3.4.2",
+    "react-native-safe-area-context": "3.3.2",
+    "react-native-screens": "~3.8.0",
+    "react-native-web": "0.17.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "babel-preset-expo": "~8.0.0"
+    "@babel/core": "^7.12.9"
   },
   "private": true
 }