feat: move settings route top level

Dwynr · Dwynr · commit 477060418131 · 2025-11-04T17:57:11.000+01:00
diff --git a/app.config.ts b/app.config.ts
@@ -1,7 +1,7 @@
 import "ts-node/register"
 import type { ExpoConfig, ConfigContext } from "expo/config"
 
-export const VERSION: string = "3.0.33"
+export const VERSION: string = "3.0.34"
 
 export const APPLE_TEAM_ID: string = "7YTW5D2K7P"
 export const IOS_APP_GROUP_ID: string = "group.io.filen.app"
diff --git a/app/(app)/home/index.tsx b/app/(app)/home/index.tsx
@@ -240,7 +240,7 @@ export const Home = memo(() => {
 
 	const openSettings = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings"
+			pathname: "/settings"
 		})
 	}, [router])
 
diff --git a/app/(app)/photos/index.tsx b/app/(app)/photos/index.tsx
@@ -335,7 +335,7 @@ export const Photos = memo(() => {
 						size="icon"
 						onPress={() => {
 							router.push({
-								pathname: "/photos/settings"
+								pathname: "/photosSettings"
 							})
 						}}
 					>
diff --git a/app/_layout.tsx b/app/_layout.tsx
@@ -170,6 +170,14 @@ export default function RootLayout() {
 														name="selectTrackPlayerPlaylists"
 														options={SCREEN_OPTIONS.modal}
 													/>
+													<Stack.Screen
+														name="settings"
+														options={SCREEN_OPTIONS.base}
+													/>
+													<Stack.Screen
+														name="photosSettings"
+														options={SCREEN_OPTIONS.base}
+													/>
 												</Stack>
 												<Listeners />
 												{isAuthed && (
diff --git a/app/photosSettings/albums.tsx b/app/photosSettings/albums.tsx
diff --git a/app/photosSettings/index.tsx b/app/photosSettings/index.tsx
@@ -137,7 +137,7 @@ export const Settings = memo(() => {
 		const selectDriveItemsResponse = await driveService.selectDriveItems({
 			type: "directory",
 			max: 1,
-			dismissHref: "/photos/settings"
+			dismissHref: "/photosSettings"
 		})
 
 		if (selectDriveItemsResponse.cancelled || selectDriveItemsResponse.items.length !== 1) {
@@ -236,7 +236,7 @@ export const Settings = memo(() => {
 				),
 				onPress: () => {
 					routerPush({
-						pathname: "/photos/settings/albums"
+						pathname: "/photosSettings/albums"
 					})
 				}
 			},
@@ -388,6 +388,7 @@ export const Settings = memo(() => {
 	return (
 		<RequireInternet>
 			<SettingsComponent
+				iosBackButtonTitle={translateMemoized("settings.index.back")}
 				title={translateMemoized("photos.settings.index.title")}
 				showSearchBar={false}
 				items={items}
diff --git a/app/settings/account.tsx b/app/settings/account.tsx
@@ -189,7 +189,7 @@ export const Account = memo(() => {
 
 	const onPressPersonalInfo = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/personal"
+			pathname: "/settings/personal"
 		})
 	}, [router])
 
diff --git a/app/settings/advanced/index.tsx b/app/settings/advanced/index.tsx
diff --git a/app/settings/appearance.tsx b/app/settings/appearance.tsx
diff --git a/app/settings/contacts/index.tsx b/app/settings/contacts/index.tsx
diff --git a/app/settings/events/index.tsx b/app/settings/events/index.tsx
diff --git a/app/settings/index.tsx b/app/settings/index.tsx
@@ -11,7 +11,7 @@ import useFileProviderEnabledQuery, { fileProviderEnabledQueryRefetch } from "@/
 import fileProvider from "@/lib/fileProvider"
 import fullScreenLoadingModal from "@/components/modals/fullScreenLoadingModal"
 import alerts from "@/lib/alerts"
-import { getBiometricAuth, clearBiometricAuth } from "@/app/(app)/home/settings/security"
+import { getBiometricAuth, clearBiometricAuth } from "@/app/settings/security"
 import { alertPrompt } from "@/components/prompts/alertPrompt"
 import authService from "@/services/auth.service"
 import assets from "@/lib/assets"
@@ -35,44 +35,38 @@ export const Settings = memo(() => {
 
 	const onPressAccount = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/account"
+			pathname: "/settings/account"
 		})
 	}, [router])
 
 	const onPressSecurity = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/security"
+			pathname: "/settings/security"
 		})
 	}, [router])
 
 	const onPressEvents = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/events"
+			pathname: "/settings/events"
 		})
 	}, [router])
 
 	const onPressContacts = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/contacts"
+			pathname: "/settings/contacts"
 		})
 	}, [router])
 
 	const onPressAdvanced = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/advanced"
+			pathname: "/settings/advanced"
 		})
 	}, [router])
 
 	const onPressCameraUpload = useCallback(() => {
 		router.push({
-			pathname: "/(app)/photos"
+			pathname: "/photosSettings"
 		})
-
-		setTimeout(() => {
-			router.push({
-				pathname: "/(app)/photos/settings"
-			})
-		}, 10)
 	}, [router])
 
 	const onChangeFileProvider = useCallback(async (value: boolean) => {
@@ -120,7 +114,7 @@ export const Settings = memo(() => {
 
 	const onPressAppearance = useCallback(() => {
 		router.push({
-			pathname: "/(app)/home/settings/appearance"
+			pathname: "/settings/appearance"
 		})
 	}, [router])
 
@@ -268,6 +262,7 @@ export const Settings = memo(() => {
 	return (
 		<SettingsComponent
 			title={translateMemoized("settings.index.title")}
+			iosBackButtonTitle={translateMemoized("settings.index.back")}
 			showSearchBar={false}
 			loading={account.status !== "success"}
 			items={items}
diff --git a/app/settings/personal.tsx b/app/settings/personal.tsx
diff --git a/app/settings/security/biometric.tsx b/app/settings/security/biometric.tsx
diff --git a/app/settings/security/index.tsx b/app/settings/security/index.tsx
@@ -199,13 +199,13 @@ export const Security = memo(() => {
 
 	const openTwoFactorAuthentication = useCallback(() => {
 		router.push({
-			pathname: "/home/settings/security/twoFactor"
+			pathname: "/settings/security/twoFactor"
 		})
 	}, [router])
 
 	const openBiometric = useCallback(() => {
 		router.push({
-			pathname: "/home/settings/security/biometric"
+			pathname: "/settings/security/biometric"
 		})
 	}, [router])
 
diff --git a/app/settings/security/twoFactor.tsx b/app/settings/security/twoFactor.tsx
diff --git a/components/biometric.tsx b/components/biometric.tsx
@@ -1,7 +1,7 @@
 import { memo, useEffect, useState, useMemo, useCallback, useRef } from "react"
 import { useMMKVObject } from "react-native-mmkv"
 import mmkvInstance from "@/lib/mmkv"
-import { type BiometricAuth, BIOMETRIC_AUTH_KEY, BIOMETRIC_MAX_TRIES } from "@/app/(app)/home/settings/security"
+import { type BiometricAuth, BIOMETRIC_AUTH_KEY, BIOMETRIC_MAX_TRIES } from "@/app/settings/security"
 import { AppState, BackHandler, View, Platform, type AppStateStatus } from "react-native"
 import Animated, { FadeOut } from "react-native-reanimated"
 import * as LocalAuthentication from "expo-local-authentication"
diff --git a/components/drive/header/dropdown.tsx b/components/drive/header/dropdown.tsx
@@ -731,15 +731,9 @@ export const Dropdown = memo(({ queryParams }: { queryParams: FetchCloudItemsPar
 
 					case "settings": {
 						routerPush({
-							pathname: "/home"
+							pathname: "/settings"
 						})
 
-						setTimeout(() => {
-							routerPush({
-								pathname: "/home/settings"
-							})
-						}, 10)
-
 						return
 					}
 
diff --git a/components/drive/header/rightView.tsx b/components/drive/header/rightView.tsx
@@ -16,7 +16,7 @@ import useNetInfo from "@/hooks/useNetInfo"
 import driveService from "@/services/drive.service"
 import { useMMKVObject } from "react-native-mmkv"
 import mmkvInstance from "@/lib/mmkv"
-import { type BiometricAuth, BIOMETRIC_AUTH_KEY } from "@/app/(app)/home/settings/security"
+import { type BiometricAuth, BIOMETRIC_AUTH_KEY } from "@/app/settings/security"
 
 export const RightView = memo(({ queryParams }: { queryParams: FetchCloudItemsParams }) => {
 	const { colors } = useColorScheme()
diff --git a/components/gallery/previews/video.tsx b/components/gallery/previews/video.tsx
@@ -20,7 +20,7 @@ import { Button } from "@/components/nativewindui/Button"
 import MaterialCommunityIcons from "@expo/vector-icons/MaterialCommunityIcons"
 import { useMMKVObject } from "react-native-mmkv"
 import mmkvInstance from "@/lib/mmkv"
-import { type BiometricAuth, BIOMETRIC_AUTH_KEY } from "@/app/(app)/home/settings/security"
+import { type BiometricAuth, BIOMETRIC_AUTH_KEY } from "@/app/settings/security"
 
 export const Video = memo(
 	({
diff --git a/components/home/header/dropdown.tsx b/components/home/header/dropdown.tsx
@@ -82,7 +82,7 @@ export const Dropdown = memo(() => {
 
 					case "settings": {
 						routerPush({
-							pathname: "/home/settings"
+							pathname: "/settings"
 						})
 
 						return
diff --git a/components/photos/header/rightView/dropdown.tsx b/components/photos/header/rightView/dropdown.tsx
@@ -252,7 +252,7 @@ export const Dropdown = memo(({ photos, queryParams }: { photos: DriveCloudItem[
 
 					case "settings": {
 						router.push({
-							pathname: "/photos/settings"
+							pathname: "/photosSettings"
 						})
 
 						break
diff --git a/components/settings/index.tsx b/components/settings/index.tsx
@@ -22,6 +22,7 @@ export type SettingsProps = {
 	loading?: boolean
 	listFooter?: React.ReactNode
 	listHeader?: React.ReactNode
+	iosBackButtonTitle?: string
 }
 
 export * from "./settings"
diff --git a/components/settings/settings.ios.tsx b/components/settings/settings.ios.tsx
@@ -141,6 +141,7 @@ export const Settings = memo((props: SettingsProps) => {
 				<LargeTitleHeader
 					title={props.title}
 					searchBar={headerSearchBar}
+					iosBackButtonTitle={props.iosBackButtonTitle}
 				/>
 			)}
 			{props.items.length > 0 && (
diff --git a/components/settings/settings.tsx b/components/settings/settings.tsx
@@ -88,6 +88,7 @@ export const Settings = memo((props: SettingsProps) => {
 				<LargeTitleHeader
 					title={props.title}
 					searchBar={headerSearchBar}
+					iosBackButtonTitle={props.iosBackButtonTitle}
 				/>
 			)}
 			{props.items.length > 0 && (
diff --git a/components/trackPlayer/bottom.tsx b/components/trackPlayer/bottom.tsx
@@ -29,7 +29,7 @@ export const Bottom = memo(() => {
 		if (
 			trackPlayerState.playingTrack &&
 			trackPlayerState.queue.length > 0 &&
-			!(pathname.startsWith("/notes/") || pathname.startsWith("/home/settings") || pathname.startsWith("/photos/settings"))
+			!(pathname.startsWith("/notes/") || pathname.startsWith("/settings") || pathname.startsWith("/photosSettings"))
 		) {
 			return true
 		}
diff --git a/locales/en.json b/locales/en.json
@@ -960,6 +960,7 @@
 		},
 		"index": {
 			"title": "Settings",
+			"back": "Back",
 			"items": {
 				"used": "{{used}} used of {{max}} ({{percentage}}%)",
 				"security": "Security",

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ export const Photos = memo(() => {`
`335`	`335`	`size="icon"`
`336`	`336`	`onPress={() => {`
`337`	`337`	`router.push({`
`338`		`- pathname: "/photos/settings"`
	`338`	`+ pathname: "/photosSettings"`
`339`	`339`	`})`
`340`	`340`	`}}`
`341`	`341`	`>`