vuminh224/mmm-projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction merge selectChantier

Browse Source
This commit is contained in:
Rochas
2025-12-11 21:56:35 +01:00
parent ef916b2f9b
commit 78152b84ae
4 changed files with 112 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/(tabs)/_layout.tsx
View File

@@ -23,67 +23,61 @@ export default function TabLayout() {
const colorScheme = useColorScheme();
return (
<UserProvider>
<ChantierProvider>
<RessourcesProvider>
<Tabs.Navigator
initialRouteName='explore'
screenOptions={{
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
headerShown: false,
tabBarButton: HapticTab,
}}>
<Tabs.Screen
name="home"
component={Home}
options={{
title: 'Home',
tabBarIcon: ({ color }) => (
<IconSymbol size={28} name="house.fill" color={color} />
),
}}
/>
<Tabs.Screen
name="gestionnaire_ressource"
component={ListMateriel}
options={{
title: 'Ressources',
tabBarIcon: ({ color }) => (
<IconSymbol size={28} name="backpack.fill" color={color} />
),
}}
/>
<Tabs.Screen
name="GestionOuvrier"
component={GestionOuvrier}
options={{
title: 'Bonjour',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
}}
/>
<Tabs.Screen
name="explore"
component={MapScreen}
options={{
title: 'MapScreen',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="paperplane.fill" color={color} />,
}}
>
</Tabs.Screen>
<Tabs.Screen
name="addChantier"
component={AddChantier}
options={{
title: 'Ajouter',
tabBarIcon: ({ color }) => (
<AntDesign name="plus" size={24} color={color} />
),
}}
/>
<Tabs.Navigator
initialRouteName='explore'
screenOptions={{
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
headerShown: false,
tabBarButton: HapticTab,
}}>
<Tabs.Screen
name="home"
component={Home}
options={{
title: 'Home',
tabBarIcon: ({ color }) => (
<IconSymbol size={28} name="house.fill" color={color} />
),
}}
/>
<Tabs.Screen
name="gestionnaire_ressource"
component={ListMateriel}
options={{
title: 'Ressources',
tabBarIcon: ({ color }) => (
<IconSymbol size={28} name="backpack.fill" color={color} />
),
}}
/>
<Tabs.Screen
name="GestionOuvrier"
component={GestionOuvrier}
options={{
title: 'Bonjour',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
}}
/>
<Tabs.Screen
name="explore"
component={MapScreen}
options={{
title: 'MapScreen',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="paperplane.fill" color={color} />,
}}
>
</Tabs.Screen>
<Tabs.Screen
name="addChantier"
component={AddChantier}
options={{
title: 'Ajouter',
tabBarIcon: ({ color }) => (
<AntDesign name="plus" size={24} color={color} />
),
}}
/>
</Tabs.Navigator>
</RessourcesProvider>
</ChantierProvider>
</UserProvider>
</Tabs.Navigator>
);
}

5
app/(tabs)/addChantier.tsx
View File

@@ -103,8 +103,9 @@ export default function AddChantier() {
<ThemedTextInput lvl = {1} style = {styles.input} placeholder='Adresse du chantier' value = {adresse} onChangeText={setAdresse} />
<ThemedTextInput lvl = {1} style = {styles.input} placeholder='durée estimée (en jours)' value = {duree} onChangeText={setDuree} />
<ThemedTextInput lvl = {1} style = {styles.input} placeholder='chef de chantier' value= {chefChantier} onChangeText={setChefChantier}/>
<ThemedText style={{ fontWeight: "bold", marginTop: 15 }}>Équipe</ThemedText>
<Text style={{ fontWeight: "bold", marginTop: 15 }}>Ressources</Text>
<ThemedText style = {styles.text}>Ajouter un équipier</ThemedText>
<ThemedText style = {styles.text}>Ajouter une ressources</ThemedText>
<ThemedButton
lvl={1}
shadow={true}

34
app/_layout.tsx
View File

@@ -14,6 +14,8 @@ import { auth, db } from "../firebase_config";
import { Platform, UIManager } from 'react-native';
import { ChantierProvider } from "./ContextChantier";
import { UserProvider } from "./ContextUser";
import { RessourcesProvider } from "./ContextRessource";
export const unstable_settings = {
@@ -61,19 +63,23 @@ export default function RootLayout() {
}, []);
return (
<ChantierProvider>
<ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
<Stack>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen name="selectChantier" options={{ headerShown: false }}/>
<Stack.Screen
name="modal"
options={{ presentation: "modal", title: "Modal" }}
/>
<Stack.Screen name="login" options={{ headerShown: false }} />
</Stack>
<StatusBar style="auto" />
</ThemeProvider>
</ChantierProvider>
<UserProvider>
<ChantierProvider>
<RessourcesProvider>
<ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
<Stack>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen name="selectChantier" options={{ headerShown: false }}/>
<Stack.Screen
name="modal"
options={{ presentation: "modal", title: "Modal" }}
/>
<Stack.Screen name="login" options={{ headerShown: false }} />
</Stack>
<StatusBar style="auto" />
</ThemeProvider>
</RessourcesProvider>
</ChantierProvider>
</UserProvider>
);
}