Merge branch 'main' into apawar/ocf-16-lo-fi-tree-information-screen

.eslintrc.js

@@ -12,4 +12,12 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 'warn',
     '@typescript-eslint/no-shadow': 'error',
   },
+  settings: {
+    'import/resolver': {
+      typescript: {
+        alwaysTryTypes: true,
+        project: './tsconfig.json',
+      },
+    },
+  },
 };

App.tsx

@@ -1,23 +1,26 @@
-import * as React from 'react';
-import { NavigationContainer } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import TreeInfoScreen from '@/screens/TreeInfo/TreeInfo';
-import { RootStackParamList } from '@/types/navigation';
+import React from 'react';
+import { Text } from 'react-native';
+import { useFonts } from 'expo-font';
+import { DMSans_400Regular, DMSans_700Bold } from '@expo-google-fonts/dm-sans';
+import { DefaultTheme } from '@react-navigation/native';
+import AppNavigator from '@/navigation/AppNavigator';
+import colors from '@/styles/colors';
 
-const Stack = createNativeStackNavigator<RootStackParamList>();
+DefaultTheme.colors.background = colors.white;
 
-function App() {
-  return (
-    <NavigationContainer>
-      <Stack.Navigator>
-        <Stack.Screen
-          name="TreeInfoScreen"
-          component={TreeInfoScreen}
-          options={{ headerShown: false }}
-        />
-      </Stack.Navigator>
-    </NavigationContainer>
-  );
-}
+export default function App() {
+  const [fontsLoaded] = useFonts({
+    DMSans_400Regular,
+    DMSans_700Bold,
+  });
+
+  if (!fontsLoaded) {
+    return null;
+  }
 
-export default App;
+  const defaultFontFamily = 'DMSans_400Regular';
+  (Text as any).defaultProps = (Text as any).defaultProps || {};
+  (Text as any).defaultProps.style = { fontFamily: defaultFontFamily };
+
+  return <AppNavigator />;
+}

app.json

@@ -14,21 +14,19 @@
         {
           "cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
         }
-      ]
-    ],
-    "splash": {
-      "image": "./assets/bp-splash.png",
-      "resizeMode": "contain",
-      "backgroundColor": "#ffffff"
-    },
-    "plugins": [
+      ],
       [
         "expo-dev-launcher",
         {
           "launchMode": "most-recent"
         }
       ]
     ],
+    "splash": {
+      "image": "./assets/bp-splash.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#ffffff"
+    },
     "platforms": ["ios", "android", "web"],
     "ios": {
       "bundleIdentifier": "org.calblueprint.ourcityforest",
@@ -48,11 +46,11 @@
     "web": {
       "favicon": "./assets/bp-favicon.png"
     },
-    "scheme": "org.calblueprint.ourcityforest",
     "extra": {
       "eas": {
         "projectId": "d04f2944-f495-4c9b-b330-6e13ce59c6ff"
       }
-    }
+    },
+    "scheme": "our-city-forest"
   }
 }

index.ts

@@ -0,0 +1,4 @@
+import { registerRootComponent } from 'expo';
+import App from './App';
+
+registerRootComponent(App);