Merge branch 'main' into ocf-18-qr-gen-edge

calblueprint · Dec 11, 2024 · 364d81f · 364d81f
2 parents 920b7d5 + 6d4bb48
commit 364d81f
Show file tree

Hide file tree

Showing 57 changed files with 2,072 additions and 17,623 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';
@@ -22,5 +23,9 @@ export default function App() {
   (Text as any).defaultProps = (Text as any).defaultProps || {};
   (Text as any).defaultProps.style = { fontFamily: defaultFontFamily };
 
-  return <AppNavigator />;
+  return (
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <AppNavigator />
+    </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