Skip to content

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
carolynzhuang committed Nov 21, 2024
1 parent bd29cad commit e584324
Show file tree
Hide file tree
Showing 5 changed files with 6,794 additions and 16,341 deletions.
43 changes: 10 additions & 33 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -1,57 +1,34 @@
import * as React from 'react';
import React from 'react';
import { DefaultTheme, NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import QRCodeScanner from '@/components/QRCodeScanner/QRCodeScanner';
import AllTreesScreen from '@/screens/all_trees/AllTreesScreen';
import AvailableTreesScreen from '@/screens/available_trees/AvailableTreesScreen';
import HomeScreen from '@/screens/Home/Home';
import LoginScreen from '@/screens/login/LoginScreen';
import TreeInfoPage from '@/screens/TreeInfo/TreeInfo';
import { LoginStackParamList, RootStackParamList } from '@/types/navigation';

const RootStack = createNativeStackNavigator<RootStackParamList>();
const LoginStack = createNativeStackNavigator<LoginStackParamList>();
DefaultTheme.colors.background = '#FFFFFF';
import { LoginStackParamList } from '@/types/navigation';

const Stack = createNativeStackNavigator<LoginStackParamList>();
DefaultTheme.colors.background = '#FFFFFF';

export default function App() {
return (
<NavigationContainer>
<LoginStack.Navigator initialRouteName="Login">
<LoginStack.Screen
<Stack.Navigator initialRouteName="Login">
<Stack.Screen
name="Login"
component={LoginScreen}
options={{ headerShown: false }}
/>
<LoginStack.Screen
name="AllTrees"
component={AllTreesScreen}
options={{ headerShown: false }}
/>
<LoginStack.Screen
<Stack.Screen
name="AvailableTrees"
component={AvailableTreesScreen}
options={{ headerShown: false }}
/>
</LoginStack.Navigator>
{/* <RootStack.Navigator initialRouteName="Home">
<RootStack.Screen
name="Home"
component={HomeScreen}
options={{ headerShown: false }}
/>
<RootStack.Screen
name="Scanner"
component={QRCodeScanner}
options={{ headerShown: false }}
/>
<RootStack.Screen
name="TreeInfoPage"
component={TreeInfoPage}
<Stack.Screen
name="AllTrees"
component={AllTreesScreen}
options={{ headerShown: false }}
/>
</RootStack.Navigator> */}
</Stack.Navigator>
</NavigationContainer>
);
}
Loading

0 comments on commit e584324

Please sign in to comment.