Merge branch 'fix-splash-screen-and-initial-routes' into 'main'

Fix splash screen and initial routes

See merge request torpenn/boxons!10

app.config.js

@@ -12,7 +12,7 @@ export default {
     "splash": {
       "image": "./assets/images/splash.png",
       "resizeMode": "contain",
-      "backgroundColor": "#ffffff"
+      "backgroundColor": "#000000"
     },
     "ios": {
       "supportsTablet": true,

app/(tabs)/_layout.tsx

@@ -0,0 +1,16 @@
+import { Tabs } from 'expo-router';
+import { i18n } from '../i18n/i18n';
+
+export default function TabLayout() {
+  return (
+    <Tabs>
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: i18n.t('appTitle'),
+          headerShown: false,
+        }}
+      />
+    </Tabs>
+  );
+}

app/_layout.tsx

@@ -16,7 +16,7 @@ export {
 
 export const unstable_settings = {
   // Ensure that reloading on `/modal` keeps a back button present.
-  initialRouteName: 'Dashboard',
+  initialRouteName: '(tabs)',
 };
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
@@ -50,8 +50,8 @@ function RootLayoutNav() {
   return (
     <LanguageProvider>
       <ThemeProvider theme={theme}>
-        <Stack initialRouteName="Dashboard">
+        <Stack>
-          <Stack.Screen name="Dashboard" options={{ headerShown: false }} />
+          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
           <Stack.Screen name="Timer" options={{ headerShown: false }} />
           <Stack.Screen name="Settings" options={{ headerShown: true, title: i18n.t('settings.title') }} />
         </Stack>

ios/Boxons/Info.plist

@@ -56,6 +56,7 @@
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
     </array>
     <key>NSUserNotificationUsageDescription</key>
     <string>Nous utilisons des notifications pour vous avertir pendant l'utilisation de l'application.</string>

package-lock.json

@@ -25,7 +25,7 @@
         "expo-splash-screen": "~0.27.7",
         "expo-status-bar": "~1.12.1",
         "expo-system-ui": "~3.0.7",
-        "expo-updates": "~0.25.27",
+        "expo-updates": "~0.25.28",
         "expo-web-browser": "~13.0.3",
         "i18n-js": "^4.4.3",
         "react": "18.2.0",
@@ -12494,9 +12494,9 @@
       }
     },
     "node_modules/expo-updates": {
-      "version": "0.25.27",
+      "version": "0.25.28",
-      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.25.27.tgz",
+      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.25.28.tgz",
-      "integrity": "sha512-1hyYZqBEXcAiEuSRPJ6dINTndGlWi6/bwlyYGjSnyoYfu/vzZQrJ+XA8JUP4EvJ3b0g8a0UOIjlDJ9ke9kMcfg==",
+      "integrity": "sha512-NTI1r7wvXel36qCzKwCjCJ9HExBo6GX9wkA9WzaNsysmg+eEd5BCmcaxvQGZUQkfDocEfI78N5vRBSuMi0iS1w==",
       "license": "MIT",
       "dependencies": {
         "@expo/code-signing-certificates": "0.0.5",

package.json

@@ -41,7 +41,7 @@
     "expo-splash-screen": "~0.27.7",
     "expo-status-bar": "~1.12.1",
     "expo-system-ui": "~3.0.7",
-    "expo-updates": "~0.25.27",
+    "expo-updates": "~0.25.28",
     "expo-web-browser": "~13.0.3",
     "i18n-js": "^4.4.3",
     "react": "18.2.0",