Merge branch 'main' into cwz/ocf-33-auth-context

calblueprint · Dec 11, 2024 · 1379c4e · 1379c4e
2 parents f11a4f6 + 6d4bb48
commit 1379c4e
Show file tree

Hide file tree

Showing 54 changed files with 2,065 additions and 17,134 deletions.
diff --git a/App.tsx b/App.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Text } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { useFonts } from 'expo-font';
 import { DMSans_400Regular, DMSans_700Bold } from '@expo-google-fonts/dm-sans';
 import { DefaultTheme } from '@react-navigation/native';
@@ -24,8 +25,10 @@ export default function App() {
   (Text as any).defaultProps.style = { fontFamily: defaultFontFamily };
 
   return (
-    <AuthContextProvider>
-      <AppNavigator />
-    </AuthContextProvider>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <AuthContextProvider>
+        <AppNavigator />
+      </AuthContextProvider>
+    </GestureHandlerRootView>
   );
 }
diff --git a/app.json b/app.json
@@ -2,6 +2,7 @@
   "expo": {
     "name": "Our City Forest",
     "slug": "our-city-forest",
+    "newArchEnabled": true,
     "owner": "ocfdev",
     "version": "1.0.0",
     "orientation": "portrait",

diff --git a/assets/tree-info-bg.png b/assets/tree-info-bg.png