fix: update navigation handling in login screen and adjust theme prov…

…ider structure
neuland-ingolstadt · Nov 18, 2024 · b0fc9b6 · b0fc9b6
1 parent b2115bc
commit b0fc9b6
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 26 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,7 +91,7 @@ android {
         applicationId 'app.neuland'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 211
+        versionCode 212
         versionName "0.10.2"
     }
     signingConfigs {

diff --git a/app.config.json b/app.config.json
@@ -35,7 +35,7 @@
         "android": {
             "package": "app.neuland",
             "userInterfaceStyle": "automatic",
-            "versionCode": 211
+            "versionCode": 212
         },
         "sdkVersion": "52.0.0",
         "experiments": {

diff --git a/bun.lockb b/bun.lockb
diff --git a/src/app/(screens)/login.tsx b/src/app/(screens)/login.tsx
@@ -99,7 +99,7 @@ export default function Login(): JSX.Element {
             router.replace('(tabs)/(index)')
             return
         }
-        router.navigate('(tabs)/(index)')
+        router.dismissAll()
     }
 
     useEffect(() => {

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
@@ -24,7 +24,6 @@ import {
 export const unstable_settings = {
     initialRouteName: '(index)',
 }
-
 function RootLayout(): JSX.Element {
     const router = useRouter()
     const { t } = useTranslation(['navigation'])
@@ -137,6 +136,7 @@ function RootLayout(): JSX.Element {
                     name="(screens)/settings"
                     options={{
                         title: t('navigation.settings'),
+                        animation: 'fade',
                     }}
                 />
                 <Stack.Screen

diff --git a/src/components/Map/BottomSheetDetailModal.tsx b/src/components/Map/BottomSheetDetailModal.tsx
@@ -133,7 +133,7 @@ export const BottomSheetDetailModal = ({
                                         }}
                                         android={{
                                             name: 'expand_more',
-                                            size: 21,
+                                            size: 22,
                                         }}
                                         style={styles.xIcon(Platform.OS)}
                                     />
@@ -208,7 +208,6 @@ const stylesheet = createStyleSheet((theme) => ({
     }),
     xIcon: (platform) => ({
         color: Color(theme.colors.text).darken(0.1).hex(),
-        marginRight: platform === 'android' ? 2 : 0,
         marginTop: platform === 'ios' ? 1 : 0,
     }),
 }))
diff --git a/src/components/provider.tsx b/src/components/provider.tsx
@@ -4,6 +4,11 @@ import i18n from '@/localization/i18n'
 import { syncStoragePersister } from '@/utils/storage'
 import { trackEvent } from '@aptabase/react-native'
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
+import {
+    DarkTheme,
+    DefaultTheme,
+    ThemeProvider,
+} from '@react-navigation/native'
 import { QueryClient, focusManager } from '@tanstack/react-query'
 import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client'
 import { useSegments } from 'expo-router'
@@ -269,27 +274,33 @@ export default function Provider({
                 client={queryClient}
                 persistOptions={{ persister: syncStoragePersister }}
             >
-                <ThemeContext.Provider value={themeHook}>
-                    <PreferencesContext.Provider value={preferences}>
-                        <BottomSheetModalProvider>
-                            <FlowContext.Provider value={flow}>
-                                <UserKindContext.Provider value={userKind}>
-                                    <FoodFilterContext.Provider
-                                        value={foodFilter}
-                                    >
-                                        <DashboardContext.Provider
-                                            value={dashboard}
+                <ThemeProvider
+                    value={
+                        themeHook.theme === 'dark' ? DarkTheme : DefaultTheme
+                    }
+                >
+                    <ThemeContext.Provider value={themeHook}>
+                        <PreferencesContext.Provider value={preferences}>
+                            <BottomSheetModalProvider>
+                                <FlowContext.Provider value={flow}>
+                                    <UserKindContext.Provider value={userKind}>
+                                        <FoodFilterContext.Provider
+                                            value={foodFilter}
                                         >
-                                            <SafeAreaProvider>
-                                                {children}
-                                            </SafeAreaProvider>
-                                        </DashboardContext.Provider>
-                                    </FoodFilterContext.Provider>
-                                </UserKindContext.Provider>
-                            </FlowContext.Provider>
-                        </BottomSheetModalProvider>
-                    </PreferencesContext.Provider>
-                </ThemeContext.Provider>
+                                            <DashboardContext.Provider
+                                                value={dashboard}
+                                            >
+                                                <SafeAreaProvider>
+                                                    {children}
+                                                </SafeAreaProvider>
+                                            </DashboardContext.Provider>
+                                        </FoodFilterContext.Provider>
+                                    </UserKindContext.Provider>
+                                </FlowContext.Provider>
+                            </BottomSheetModalProvider>
+                        </PreferencesContext.Provider>
+                    </ThemeContext.Provider>
+                </ThemeProvider>
             </PersistQueryClientProvider>
         </GestureHandlerRootView>
     )