Merge branch 'main' into katynguyen/ocf-26-hi-fi-about-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

@@ -62,4 +62,30 @@ const App = () => {
   );
 };
 
-export default App;
+
+<!-- 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';
+
+DefaultTheme.colors.background = colors.white;
+
+export default function App() {
+  const [fontsLoaded] = useFonts({
+    DMSans_400Regular,
+    DMSans_700Bold,
+  });
+
+  if (!fontsLoaded) {
+    return null;
+  }
+
+  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);