updated expo to latest version (#311)

ufosc · Nov 14, 2024 · a4f3014 · a4f3014
1 parent 33ee2af
commit a4f3014
Show file tree

Hide file tree

Showing 5 changed files with 2,512 additions and 3,978 deletions.
diff --git a/client/app.json b/client/app.json
@@ -34,7 +34,8 @@
         {
           "locationAlwaysAndWhenInUsePermission": "Allow OSC Proximity Chat to access your location."
         }
-      ]
+      ],
+      "expo-font"
     ]
   }
-}
+}
diff --git a/client/app/navigation/AppNavigator.tsx b/client/app/navigation/AppNavigator.tsx
@@ -1,5 +1,5 @@
 import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
-import {StyleSheet, Text, View} from 'react-native';
+import { StyleSheet, Text, View } from "react-native";
 import * as React from "react";
 
 import { LocationProvider } from "../contexts/LocationContext";
@@ -8,36 +8,43 @@ import { UserProvider } from "../contexts/UserContext";
 import ChatScreen from "../screens/chat/ChatScreen";
 import SettingsScreen from "../screens/settings/SettingsScreen";
 import { Home } from "react-native-feather";
-import {User} from "react-native-feather";
+import { User } from "react-native-feather";
+import { NavigationContainer } from "@react-navigation/native";
 
 const Tab = createBottomTabNavigator();
 const AppNavigator = () => {
   return (
     <LocationProvider>
       <SocketProvider>
         <UserProvider>
-          <Tab.Navigator
-            screenOptions={{
-              headerShown: false,
-              tabBarLabelStyle: {
-                fontSize: 15,
-              }
-            }}>
-            <Tab.Screen name="Home" component={ChatScreen} options={{
-              tabBarIcon:({ focused, color, size }) => {
-                return(<Home width = {size} stroke = {color}/>
-                )
-              }
-            }
-            }/>
-            <Tab.Screen name="Profile" component={SettingsScreen} options = {{
-              tabBarIcon:({ focused, color, size }) => {
-                return(<User width = {size} stroke = {color} />)
-              }
-            }
-            }
-            />
-          </Tab.Navigator>
+          <NavigationContainer>
+            <Tab.Navigator
+              screenOptions={{
+                headerShown: false,
+                tabBarLabelStyle: {
+                  fontSize: 15,
+                },
+              }}>
+              <Tab.Screen
+                name="Home"
+                component={ChatScreen}
+                options={{
+                  tabBarIcon: ({ focused, color, size }) => {
+                    return <Home width={size} stroke={color} />;
+                  },
+                }}
+              />
+              <Tab.Screen
+                name="Profile"
+                component={SettingsScreen}
+                options={{
+                  tabBarIcon: ({ focused, color, size }) => {
+                    return <User width={size} stroke={color} />;
+                  },
+                }}
+              />
+            </Tab.Navigator>
+          </NavigationContainer>
         </UserProvider>
       </SocketProvider>
     </LocationProvider>

diff --git a/client/app/navigation/AuthNavigator.tsx b/client/app/navigation/AuthNavigator.tsx
@@ -5,23 +5,26 @@ import LoginScreen from "../screens/auth/LoginScreen";
 import SignUpScreen from "../screens/auth/SignUpScreen";
 import WelcomeScreen from "../screens/auth/WelcomeScreen";
 import EmailVerificationScreen from "../screens/auth/EmailVerificationScreen";
+import { NavigationContainer } from "@react-navigation/native";
 
 const Stack = createStackNavigator();
 
 const AuthNavigator = () => {
   return (
-    <Stack.Navigator
-      screenOptions={{
-        headerShown: false,
-      }}>
-      <Stack.Screen name="Welcome" component={WelcomeScreen} />
-      <Stack.Screen name="Log In" component={LoginScreen} />
-      <Stack.Screen name="Sign Up" component={SignUpScreen} />
-      <Stack.Screen
-        name="Email Verification"
-        component={EmailVerificationScreen}
-      />
-    </Stack.Navigator>
+    <NavigationContainer>
+      <Stack.Navigator
+        screenOptions={{
+          headerShown: false,
+        }}>
+        <Stack.Screen name="Welcome" component={WelcomeScreen} />
+        <Stack.Screen name="Log In" component={LoginScreen} />
+        <Stack.Screen name="Sign Up" component={SignUpScreen} />
+        <Stack.Screen
+          name="Email Verification"
+          component={EmailVerificationScreen}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
   );
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,8 @@ @@
             {
               "locationAlwaysAndWhenInUsePermission": "Allow OSC Proximity Chat to access your location."
             }
-          ]
+          ],
+          "expo-font"
         ]
       }
-    }
+    }