refactor and update app navigator

This commit is contained in:
2026-02-11 13:13:23 +01:00
parent 18474d30ab
commit b0caa50e7c
+31 -7
View File
@@ -2,16 +2,20 @@ import React from 'react';
import { View, ActivityIndicator } from 'react-native'; import { View, ActivityIndicator } from 'react-native';
import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { createNativeStackNavigator } from '@react-navigation/native-stack';
import AuthScreen from '../screens/AuthScreen'; import AuthScreen from '../screens/AuthScreen';
import HomeScreen from '../screens/HomeScreen';
import TabNavigator from './TabNavigator'; import TabNavigator from './TabNavigator';
import EditProfileScreen from '../screens/EditProfileScreen';
import DocumentViewScreen from '../screens/DocumentViewScreen';
import ForgotPasswordScreen from '../screens/ForgotPasswordScreen'; import ForgotPasswordScreen from '../screens/ForgotPasswordScreen';
import { useAuthStore } from '../store/useAuthStore'; import { useAuthStore } from '../store/useAuthStore';
// Define the types for your stack // Define the types for the stack
export type RootStackParamList = { export type RootStackParamList = {
Auth: undefined; Auth: undefined;
Home: undefined; // This is now a nested navigator Home: undefined; // This is now a nested navigator
Main: undefined; // The tab navigator 'Main' Main: undefined; // The tab navigator
EditProfile: undefined;
DocumentView: { uri: string };
ForgotPassword: undefined;
}; };
const Stack = createNativeStackNavigator<RootStackParamList>(); const Stack = createNativeStackNavigator<RootStackParamList>();
@@ -29,20 +33,40 @@ export default function AppNavigator() {
} }
return ( return (
<Stack.Navigator screenOptions={{ headerShown: false }}> <Stack.Navigator id="RootStack" screenOptions={{ headerShown: false }}>
{user ? ( {user ? (
// Screens for logged-in users // Screens for logged-in users
<Stack.Screen name="Main" component={TabNavigator} options={{ headerShown: false }} /> <>
<Stack.Screen name="Main" component={TabNavigator} options={{ headerShown: false }} />
<Stack.Screen
name="EditProfile"
component={EditProfileScreen}
options={{
title: 'Edit Profile',
headerBackTitle: '',
headerShown: true,
}}
/>
<Stack.Screen
name="DocumentView"
component={DocumentViewScreen}
options={{
title: 'Document',
headerBackTitle: '',
headerShown: true,
}}
/>
</>
) : ( ) : (
// Screens for logged-out users // Screens for logged-out users
<Stack.Group> <>
<Stack.Screen name="Auth" component={AuthScreen} /> <Stack.Screen name="Auth" component={AuthScreen} />
<Stack.Screen <Stack.Screen
name="ForgotPassword" name="ForgotPassword"
component={ForgotPasswordScreen} component={ForgotPasswordScreen}
options={{ presentation: 'fullScreenModal' }} options={{ presentation: 'fullScreenModal' }}
/> />
</Stack.Group> </>
)} )}
</Stack.Navigator> </Stack.Navigator>
); );