refactor(app): enable expo-router typed routes

neuland-ingolstadt · Nov 28, 2024 · 651ee32 · 651ee32
1 parent c907232
commit 651ee32
Show file tree

Hide file tree

Showing 44 changed files with 94 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,9 @@
 eas.json
 credentials.json
 credentials/
+
+# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
+# The following patterns were generated by expo-cli
+
+expo-env.d.ts
+# @end expo-cli
diff --git a/app.config.json b/app.config.json
@@ -39,7 +39,8 @@
         },
         "sdkVersion": "52.0.0",
         "experiments": {
-            "tsconfigPaths": true
+            "tsconfigPaths": true,
+            "typedRoutes": true
         },
         "plugins": [
             ["react-native-edge-to-edge"],

diff --git a/src/app/(flow)/onboarding.tsx b/src/app/(flow)/onboarding.tsx
@@ -79,7 +79,7 @@ export default function OnboardingScreen(): JSX.Element {
                     flow.setUpdated(true)
                     flow.setAnalyticsAllowed(true)
                     router.navigate({
-                        pathname: '(screens)/login',
+                        pathname: '/login',
                         params: { fromOnboarding: 'true' },
                     })
                 }}

diff --git a/src/app/(flow)/whatsnew.tsx b/src/app/(flow)/whatsnew.tsx
@@ -31,7 +31,7 @@ export default function WhatsNewScreen(): JSX.Element {
         Application.nativeApplicationVersion ?? '0.0.0'
     )
     if (changelog.version[version] === undefined) {
-        router.navigate('(tabs)/(index)')
+        router.navigate('/(tabs)/(index)')
     }
     const totalItems = Object.keys(changelog.version[version] ?? []).flatMap(
         (key) => changelog.version[key]
@@ -173,7 +173,7 @@ export default function WhatsNewScreen(): JSX.Element {
                     style={styles.button}
                     onPress={() => {
                         flow.setUpdated(true)
-                        router.navigate('(tabs)/(index)')
+                        router.navigate('/(tabs)/(index)')
                     }}
                 >
                     <Text style={styles.buttonText}>

diff --git a/src/app/(screens)/about.tsx b/src/app/(screens)/about.tsx
@@ -56,7 +56,7 @@ export default function About(): JSX.Element {
                     title: 'Changelog',
                     icon: chevronIcon,
                     onPress: () => {
-                        router.navigate('changelog')
+                        router.navigate('/changelog')
                     },
                 },
                 {
@@ -124,7 +124,7 @@ export default function About(): JSX.Element {
                     title: t('about.formlist.legal.button'),
                     icon: chevronIcon,
                     onPress: () => {
-                        router.navigate('legal')
+                        router.navigate('/legal')
                     },
                 },
             ],

diff --git a/src/app/(screens)/calendar.tsx b/src/app/(screens)/calendar.tsx
@@ -57,7 +57,7 @@ export default function CalendarPage(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24, // 24 hours
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.push(' login')
+                router.push('/login')
                 return false
             }
             return failureCount < 2

diff --git a/src/app/(screens)/dashboard.tsx b/src/app/(screens)/dashboard.tsx
@@ -174,7 +174,7 @@ export default function DashboardEdit(): JSX.Element {
                         <Pressable
                             style={[styles.card, styles.noteContainer]}
                             onPress={() => {
-                                router.navigate('login')
+                                router.navigate('/login')
                             }}
                         >
                             <View style={styles.noteTextContainer}>

diff --git a/src/app/(screens)/foodPreferences.tsx b/src/app/(screens)/foodPreferences.tsx
@@ -63,14 +63,14 @@ export default function FoodPreferences(): JSX.Element {
                     title: t('preferences.formlist.allergens'),
                     icon: chevronIcon,
                     onPress: () => {
-                        router.push('foodAllergens')
+                        router.push('/foodAllergens')
                     },
                 },
                 {
                     title: t('preferences.formlist.flags'),
                     icon: chevronIcon,
                     onPress: () => {
-                        router.push('foodFlags')
+                        router.push('/foodFlags')
                     },
                 },
             ],

diff --git a/src/app/(screens)/grades.tsx b/src/app/(screens)/grades.tsx
@@ -84,7 +84,7 @@ export default function GradesSCreen(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24 * 7, // 1 week
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
             }
             return false
         },

diff --git a/src/app/(screens)/lecture.tsx b/src/app/(screens)/lecture.tsx
@@ -95,7 +95,7 @@ export default function TimetableDetails(): JSX.Element {
                 icon: chevronIcon,
                 onPress: () => {
                     router.push({
-                        pathname: 'webView',
+                        pathname: '/webView',
                         params: {
                             title: t(titleKey),
                             html,
@@ -251,7 +251,7 @@ export default function TimetableDetails(): JSX.Element {
                                                         onPress={() => {
                                                             router.dismissTo({
                                                                 pathname:
-                                                                    '(tabs)/map',
+                                                                    '/(tabs)/map',
                                                                 params: {
                                                                     room,
                                                                 },

diff --git a/src/app/(screens)/lecturer.tsx b/src/app/(screens)/lecturer.tsx
@@ -69,7 +69,7 @@ export default function LecturerDetail(): JSX.Element {
                     textColor: theme.colors.primary,
                     onPress: () => {
                         router.dismissTo({
-                            pathname: '(tabs)/map',
+                            pathname: '/(tabs)/map',
                             params: { room: lecturer?.room_short ?? '' },
                         })
                     },

diff --git a/src/app/(screens)/lecturers.tsx b/src/app/(screens)/lecturers.tsx
@@ -89,7 +89,7 @@ export default function LecturersCard(): JSX.Element {
                 gcTime: 1000 * 60 * 60 * 24 * 7, // 7 days
                 retry(failureCount: number, error: any) {
                     if (error instanceof NoSessionError) {
-                        router.push('login')
+                        router.push('/login')
                         return false
                     }
                     return failureCount < 2
@@ -107,7 +107,7 @@ export default function LecturersCard(): JSX.Element {
                 gcTime: 1000 * 60 * 60 * 24 * 7, // 7 days
                 retry(failureCount: number, error: any) {
                     if (error instanceof NoSessionError) {
-                        router.navigate('login')
+                        router.navigate('/login')
                         return false
                     }
                     return failureCount < 2

diff --git a/src/app/(screens)/library.tsx b/src/app/(screens)/library.tsx
@@ -94,7 +94,7 @@ export default function LibrarySreen(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24, // 24 hours,
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             }
             return failureCount < 2
@@ -116,7 +116,7 @@ export default function LibrarySreen(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24, // 24 hours,
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             }
             return failureCount < 2
@@ -179,7 +179,7 @@ export default function LibrarySreen(): JSX.Element {
         },
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             }
             return failureCount < 1

diff --git a/src/app/(screens)/licenses.tsx b/src/app/(screens)/licenses.tsx
@@ -71,7 +71,7 @@ export default function Licenses(): JSX.Element {
                 icon: chevronIcon,
                 onPress: () => {
                     router.navigate({
-                        pathname: 'license',
+                        pathname: '/license',
                         params: {
                             license: value.licenses,
                             version: version != null ? version[0] : '',

diff --git a/src/app/(screens)/login.tsx b/src/app/(screens)/login.tsx
@@ -96,7 +96,7 @@ export default function Login(): JSX.Element {
     const navigateHome = (): void => {
         if (fromOnboarding === 'true') {
             router.dismissAll()
-            router.replace('(tabs)/(index)')
+            router.replace('/(tabs)/(index)')
             return
         }
         router.dismissAll()

diff --git a/src/app/(screens)/meal.tsx b/src/app/(screens)/meal.tsx
@@ -302,7 +302,7 @@ export default function FoodDetail(): JSX.Element {
 
         if (restaurant != null && location !== undefined) {
             router.dismissTo({
-                pathname: '(tabs)/map',
+                pathname: '/(tabs)/map',
                 params: { room: location },
             })
         }

diff --git a/src/app/(screens)/profile.tsx b/src/app/(screens)/profile.tsx
@@ -46,7 +46,7 @@ export default function Profile(): JSX.Element {
             enabled: userKind === USER_STUDENT,
             retry(failureCount, error) {
                 if (error instanceof NoSessionError) {
-                    router.replace('login')
+                    router.replace('/login')
                     return false
                 }
                 return failureCount < 2

diff --git a/src/app/(screens)/roomSearch.ios.tsx b/src/app/(screens)/roomSearch.ios.tsx
@@ -87,7 +87,7 @@ export default function AdvancedSearch(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24 * 4, // 4 days
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             }
             return failureCount < 2

diff --git a/src/app/(screens)/roomSearch.tsx b/src/app/(screens)/roomSearch.tsx
@@ -68,7 +68,7 @@ export default function AdvancedSearch(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24 * 4, // 4 days
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             }
             return failureCount < 2

diff --git a/src/app/(screens)/settings.tsx b/src/app/(screens)/settings.tsx
@@ -177,7 +177,7 @@ export default function Settings(): JSX.Element {
         gcTime: 1000 * 60 * 60 * 24 * 60,
         retry(failureCount, error) {
             if (error instanceof NoSessionError) {
-                router.replace('login')
+                router.replace('/login')
                 return false
             } else if (userKind !== 'student') {
                 return false
@@ -224,7 +224,7 @@ export default function Settings(): JSX.Element {
                     },
 
                     onPress: () => {
-                        router.navigate('dashboard')
+                        router.navigate('/dashboard')
                     },
                 },
                 {
@@ -234,7 +234,7 @@ export default function Settings(): JSX.Element {
                         ios: 'fork.knife',
                     },
                     onPress: () => {
-                        router.navigate('foodPreferences')
+                        router.navigate('/foodPreferences')
                     },
                 },
                 {
@@ -268,7 +268,7 @@ export default function Settings(): JSX.Element {
                         android: 'palette',
                     },
                     onPress: () => {
-                        router.navigate('accent')
+                        router.navigate('/accent')
                     },
                 },
                 {
@@ -278,7 +278,7 @@ export default function Settings(): JSX.Element {
                         android: 'routine',
                     },
                     onPress: () => {
-                        router.navigate('theme')
+                        router.navigate('/theme')
                     },
                 },
                 ...(Platform.OS === 'ios' &&
@@ -291,7 +291,7 @@ export default function Settings(): JSX.Element {
                                   android: '' as MaterialIcon,
                               },
                               onPress: () => {
-                                  router.navigate('appIcon')
+                                  router.navigate('/appIcon')
                               },
                           },
                       ]
@@ -308,7 +308,7 @@ export default function Settings(): JSX.Element {
                         android: 'chevron_right',
                     },
                     onPress: () => {
-                        router.navigate('about')
+                        router.navigate('/about')
                     },
                 },
 
@@ -382,9 +382,9 @@ export default function Settings(): JSX.Element {
                             logoutAlert()
                         } else {
                             if (userKind === 'student') {
-                                router.navigate('profile')
+                                router.navigate('/profile')
                             } else if (userKind === 'guest') {
-                                router.navigate('login')
+                                router.navigate('/login')
                             }
                         }
                     }}

diff --git a/src/app/(tabs)/(index)/index.tsx b/src/app/(tabs)/(index)/index.tsx
@@ -105,7 +105,7 @@ function HomeScreen(): JSX.Element {
                 }}
                 buttonText={t('dashboard.noShownButton', { ns: 'settings' })}
                 onButtonPress={() => {
-                    router.navigate('dashboard')
+                    router.navigate('/dashboard')
                 }}
                 isCritical={false}
             />

diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx
@@ -11,7 +11,7 @@ import { USER_GUEST } from '@/data/constants'
 import { convertToMajorMinorPatch } from '@/utils/app-utils'
 import Aptabase from '@aptabase/react-native'
 import * as Application from 'expo-application'
-import { Redirect, useRouter } from 'expo-router'
+import { Redirect, type RelativePathString, useRouter } from 'expo-router'
 import React, { useContext, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
@@ -101,7 +101,7 @@ export default function HomeLayout(): JSX.Element {
         ]
         function processShortcut(item: ShortcutItem): void {
             router.navigate({
-                pathname: item.data.path as string,
+                pathname: item.data.path as RelativePathString,
                 params: { fromAppShortcut: 'true' },
             })
         }
@@ -144,7 +144,7 @@ export default function HomeLayout(): JSX.Element {
     }, [appIcon])
 
     if (isOnboarded !== true) {
-        return <Redirect href={'(flow)/onboarding'} />
+        return <Redirect href={'/onboarding'} />
     }
 
     const version = Application.nativeApplicationVersion
@@ -160,7 +160,7 @@ export default function HomeLayout(): JSX.Element {
         isChangelogAvailable &&
         flow.isOnboarded === true
     ) {
-        return <Redirect href={'(flow)/whatsnew'} />
+        return <Redirect href={'/whatsnew'} />
     }
 
     return Platform.OS === 'android' ? <MaterialTabs /> : <DefaultTabs />

diff --git a/src/app/[...unmachted].tsx b/src/app/[...unmachted].tsx
@@ -31,7 +31,7 @@ export default function Unmatched(): JSX.Element {
                     if (router.canGoBack()) {
                         router.back()
                     } else {
-                        router.replace('(tabs)/(index)')
+                        router.replace('/(tabs)/(index)')
                     }
                 }}
             />

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
@@ -359,7 +359,7 @@ function RootLayout(): JSX.Element {
                         headerRight: () => (
                             <Pressable
                                 onPress={() => {
-                                    router.push('(screens)/libraryCode')
+                                    router.push('/libraryCode')
                                 }}
                                 accessibilityLabel={t('button.libraryBarcode', {
                                     ns: 'accessibility',

diff --git a/src/app/index.tsx b/src/app/index.tsx
@@ -25,7 +25,7 @@ export default function App(): JSX.Element {
                 <meta property="expo:handoff" content="true" />
                 <meta property="expo:spotlight" content="true" />
             </Head>
-            <Redirect href={'(tabs)/(index)'} />
+            <Redirect href={'/(tabs)/(index)'} />
             <View style={{ ...styles.page, backgroundColor }} />
         </>
     )