From 7092d09ba8c58899d6b0d5d609641a5cbd30dd07 Mon Sep 17 00:00:00 2001
From: Rochas <thibaut.rochas@etudiant.univ-rennes1.fr>
Date: Thu, 11 Dec 2025 21:24:28 +0100
Subject: [PATCH] clean des composants, dossiers

---
 app/(tabs)/_layout.tsx                        |  2 +-
 app/(tabs)/addChantier.tsx                    | 20 ++++++-------------
 app/(tabs)/explore.tsx                        |  8 ++++----
 app/(tabs)/gestion_ouvrier.tsx                |  6 +++---
 app/(tabs)/gestionnaire_ressource.tsx         |  8 ++++----
 app/(tabs)/home.tsx                           |  2 +-
 app/(tabs)/index.tsx                          |  8 ++++----
 app/(tabs)/mapScreen.tsx                      |  2 +-
 app/(tabs)/templateSreen.tsx                  |  2 +-
 app/login/login.tsx                           |  6 +++---
 app/modal.tsx                                 |  4 ++--
 components/anomaly.tsx                        |  4 ++--
 components/chantierSummary.tsx                |  4 ++--
 .../{ => expoExempleComponents}/example.tsx   |  0
 .../external-link.tsx                         |  0
 .../haptic-tab.tsx                            |  0
 .../hello-wave.tsx                            |  0
 .../parallax-scroll-view.tsx                  |  4 ++--
 components/selectChantier.tsx                 | 10 +++++-----
 components/setStatus.tsx                      |  6 +++---
 components/{ => theme}/themed-button.tsx      |  0
 components/{ => theme}/themed-mapview.tsx     |  0
 components/{ => theme}/themed-text.tsx        |  0
 components/{ => theme}/themed-textinput.tsx   |  0
 components/{ => theme}/themed-view.tsx        |  0
 components/ui/collapsible.tsx                 |  4 ++--
 26 files changed, 46 insertions(+), 54 deletions(-)
 rename components/{ => expoExempleComponents}/example.tsx (100%)
 rename components/{ => expoExempleComponents}/external-link.tsx (100%)
 rename components/{ => expoExempleComponents}/haptic-tab.tsx (100%)
 rename components/{ => expoExempleComponents}/hello-wave.tsx (100%)
 rename components/{ => expoExempleComponents}/parallax-scroll-view.tsx (93%)
 rename components/{ => theme}/themed-button.tsx (100%)
 rename components/{ => theme}/themed-mapview.tsx (100%)
 rename components/{ => theme}/themed-text.tsx (100%)
 rename components/{ => theme}/themed-textinput.tsx (100%)
 rename components/{ => theme}/themed-view.tsx (100%)

diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
index 784ad33..1542e4e 100644
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -3,7 +3,7 @@ import { } from 'expo-router';
 import React from 'react';
 
 
-import { HapticTab } from '@/components/haptic-tab';
+import { HapticTab } from '@/components/expoExempleComponents/haptic-tab';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
 import { useColorScheme } from '@/hooks/use-color-scheme';
diff --git a/app/(tabs)/addChantier.tsx b/app/(tabs)/addChantier.tsx
index f2bec10..36513ee 100644
--- a/app/(tabs)/addChantier.tsx
+++ b/app/(tabs)/addChantier.tsx
@@ -1,7 +1,7 @@
 import ChantierSummary from '@/components/chantierSummary';
 import SelectChantier from '@/components/selectChantier';
 import SetStatus from '@/components/setStatus';
-import { ThemedView } from '@/components/themed-view';
+import { ThemedView } from '@/components/theme/themed-view';
 import React, { useEffect, useState } from 'react';
 import { StyleSheet, ScrollView, Button, TextInput, Text } from 'react-native';
 import { useChantier } from '../ContextChantier';
@@ -9,9 +9,9 @@ import { useRessources } from '../ContextRessource';
 import { useUser } from '../ContextUser';
 import { getRessources, getUsers, addChantier } from '@/services/ressourcesService';
 import { Chantier, Ressources } from '@/class/class';
-import { ThemedText } from '@/components/themed-text';
-import { ThemedButton } from '@/components/themed-button';
-import { ThemedTextInput } from '@/components/themed-textinput';
+import { ThemedText } from '@/components/theme/themed-text';
+import { ThemedButton } from '@/components/theme/themed-button';
+import { ThemedTextInput } from '@/components/theme/themed-textinput';
 
 export default function AddChantier() {
   const { chantier, setChantier } = useChantier();
@@ -96,19 +96,11 @@ export default function AddChantier() {
         <ThemedTextInput lvl = {0} style = {styles.input} placeholder='chef de chantier' value= {chefChantier} onChangeText={setChefChantier}/>
         <ThemedText style={{ fontWeight: "bold", marginTop: 15 }}>Équipe</ThemedText>
         <SelectChantier
-        data={user}
-        multiple
-        selected={userSelect}
-        onChange={setUserSelect}
-        placeholder="Sélectionner l'équipe"
+
       />
       <Text style={{ fontWeight: "bold", marginTop: 15 }}>Ressources</Text>
       <SelectChantier
-        data={ressources}
-        multiple
-        selected={ressourcesSelect}
-        onChange={setRessourcesSelect}
-        placeholder="Sélectionner les ressources"
+
       />
       <ThemedButton
         lvl={1}
diff --git a/app/(tabs)/explore.tsx b/app/(tabs)/explore.tsx
index 48ad339..d272d95 100644
--- a/app/(tabs)/explore.tsx
+++ b/app/(tabs)/explore.tsx
@@ -1,11 +1,11 @@
 import { Image } from 'expo-image';
 import { Platform, StyleSheet } from 'react-native';
 
-import { ExternalLink } from '@/components/external-link';
-import ParallaxScrollView from '@/components/parallax-scroll-view';
+import { ExternalLink } from '@/components/expoExempleComponents/external-link';
+import ParallaxScrollView from '@/components/expoExempleComponents/parallax-scroll-view';
 import SelectChantier from '@/components/selectChantier';
-import { ThemedText } from '@/components/themed-text';
-import { ThemedView } from '@/components/themed-view';
+import { ThemedText } from '@/components/theme/themed-text';
+import { ThemedView } from '@/components/theme/themed-view';
 import { Collapsible } from '@/components/ui/collapsible';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Fonts } from '@/constants/theme';
diff --git a/app/(tabs)/gestion_ouvrier.tsx b/app/(tabs)/gestion_ouvrier.tsx
index f496147..0b68cc9 100644
--- a/app/(tabs)/gestion_ouvrier.tsx
+++ b/app/(tabs)/gestion_ouvrier.tsx
@@ -1,6 +1,6 @@
-import { ThemedText } from "@/components/themed-text";
-import { ThemedTextInput } from "@/components/themed-textinput";
-import { ThemedView } from "@/components/themed-view";
+import { ThemedText } from "@/components/theme/themed-text";
+import { ThemedTextInput } from "@/components/theme/themed-textinput";
+import { ThemedView } from "@/components/theme/themed-view";
 import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
 import { useLocalSearchParams, useRouter } from "expo-router";
 import React, { useMemo, useState } from "react";
diff --git a/app/(tabs)/gestionnaire_ressource.tsx b/app/(tabs)/gestionnaire_ressource.tsx
index 1f3c301..a6b17d5 100644
--- a/app/(tabs)/gestionnaire_ressource.tsx
+++ b/app/(tabs)/gestionnaire_ressource.tsx
@@ -1,9 +1,9 @@
-import { ThemedText } from "@/components/themed-text";
-import { ThemedTextInput } from "@/components/themed-textinput";
-import { ThemedView } from "@/components/themed-view";
+import { ThemedText } from "@/components/theme/themed-text";
+import { ThemedTextInput } from "@/components/theme/themed-textinput";
+import { ThemedView } from "@/components/theme/themed-view";
 import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
 
-import { ThemedButton } from "@/components/themed-button";
+import { ThemedButton } from "@/components/theme/themed-button";
 import { useLocalSearchParams, useRouter } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { FlatList, Image, StyleSheet, Text, View } from "react-native";
diff --git a/app/(tabs)/home.tsx b/app/(tabs)/home.tsx
index cdaabe2..de104ae 100644
--- a/app/(tabs)/home.tsx
+++ b/app/(tabs)/home.tsx
@@ -1,7 +1,7 @@
 import ChantierSummary from '@/components/chantierSummary';
 import SelectChantier from '@/components/selectChantier';
 import SetStatus from '@/components/setStatus';
-import { ThemedView, } from '@/components/themed-view';
+import { ThemedView, } from '@/components/theme/themed-view';
 import Constants from 'expo-constants'; //pour connaître la taille de la barre menu de l'OS en haut
 import React from 'react';
 import { StyleSheet, View,Text } from 'react-native';
diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx
index a648286..41288d0 100644
--- a/app/(tabs)/index.tsx
+++ b/app/(tabs)/index.tsx
@@ -1,10 +1,10 @@
 import { Image } from 'expo-image';
 import { Platform, StyleSheet } from 'react-native';
 
-import { HelloWave } from '@/components/hello-wave';
-import ParallaxScrollView from '@/components/parallax-scroll-view';
-import { ThemedText } from '@/components/themed-text';
-import { ThemedView } from '@/components/themed-view';
+import { HelloWave } from '@/components/expoExempleComponents/hello-wave';
+import ParallaxScrollView from '@/components/expoExempleComponents/parallax-scroll-view';
+import { ThemedText } from '@/components/theme/themed-text';
+import { ThemedView } from '@/components/theme/themed-view';
 import { Link } from 'expo-router';
 
 export default function HomeScreen() {
diff --git a/app/(tabs)/mapScreen.tsx b/app/(tabs)/mapScreen.tsx
index d49992b..42315e1 100644
--- a/app/(tabs)/mapScreen.tsx
+++ b/app/(tabs)/mapScreen.tsx
@@ -1,5 +1,5 @@
 // MapScreen.tsx
-import { ThemedMapView } from '@/components/themed-mapview';
+import { ThemedMapView } from '@/components/theme/themed-mapview';
 import React, { useEffect, useState } from 'react';
 import { StyleSheet, View, Dimensions, Image, Text } from 'react-native';
 import MapView, { Marker, Callout, CalloutSubview, PROVIDER_DEFAULT } from 'react-native-maps';
diff --git a/app/(tabs)/templateSreen.tsx b/app/(tabs)/templateSreen.tsx
index d553d87..1dc367d 100644
--- a/app/(tabs)/templateSreen.tsx
+++ b/app/(tabs)/templateSreen.tsx
@@ -1,4 +1,4 @@
-import { ThemedView } from "@/components/themed-view";
+import { ThemedView } from "@/components/theme/themed-view";
 import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
 import React from "react";
 import {StyleSheet, View } from "react-native";
diff --git a/app/login/login.tsx b/app/login/login.tsx
index 2f8531f..1efc88d 100644
--- a/app/login/login.tsx
+++ b/app/login/login.tsx
@@ -1,6 +1,6 @@
-import { ThemedText } from "@/components/themed-text";
-import { ThemedTextInput } from "@/components/themed-textinput";
-import { ThemedView } from "@/components/themed-view";
+import { ThemedText } from "@/components/theme/themed-text";
+import { ThemedTextInput } from "@/components/theme/themed-textinput";
+import { ThemedView } from "@/components/theme/themed-view";
 import { router } from "expo-router";
 import {
   signInWithEmailAndPassword
diff --git a/app/modal.tsx b/app/modal.tsx
index 6dfbc1a..d429357 100644
--- a/app/modal.tsx
+++ b/app/modal.tsx
@@ -1,8 +1,8 @@
 import { Link } from 'expo-router';
 import { StyleSheet } from 'react-native';
 
-import { ThemedText } from '@/components/themed-text';
-import { ThemedView } from '@/components/themed-view';
+import { ThemedText } from '@/components/theme/themed-text';
+import { ThemedView } from '@/components/theme/themed-view';
 
 export default function ModalScreen() {
   return (
diff --git a/components/anomaly.tsx b/components/anomaly.tsx
index f56b395..9f5955f 100644
--- a/components/anomaly.tsx
+++ b/components/anomaly.tsx
@@ -1,8 +1,8 @@
 import { Chantier } from '@/class/class';
-import { ThemedView, } from '@/components/themed-view';
+import { ThemedView, } from '@/components/theme/themed-view';
 import React from 'react';
 import { Image, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { ThemedText } from './themed-text';
+import { ThemedText } from './theme/themed-text';
 
 
 type Props = {
diff --git a/components/chantierSummary.tsx b/components/chantierSummary.tsx
index 66ced7d..e5f973c 100644
--- a/components/chantierSummary.tsx
+++ b/components/chantierSummary.tsx
@@ -1,8 +1,8 @@
 import { Chantier } from '@/class/class';
-import { ThemedView, } from '@/components/themed-view';
+import { ThemedView, } from '@/components/theme/themed-view';
 import React from 'react';
 import { Image, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { ThemedText } from './themed-text';
+import { ThemedText } from './theme/themed-text';
 
 
 type Props = {
diff --git a/components/example.tsx b/components/expoExempleComponents/example.tsx
similarity index 100%
rename from components/example.tsx
rename to components/expoExempleComponents/example.tsx
diff --git a/components/external-link.tsx b/components/expoExempleComponents/external-link.tsx
similarity index 100%
rename from components/external-link.tsx
rename to components/expoExempleComponents/external-link.tsx
diff --git a/components/haptic-tab.tsx b/components/expoExempleComponents/haptic-tab.tsx
similarity index 100%
rename from components/haptic-tab.tsx
rename to components/expoExempleComponents/haptic-tab.tsx
diff --git a/components/hello-wave.tsx b/components/expoExempleComponents/hello-wave.tsx
similarity index 100%
rename from components/hello-wave.tsx
rename to components/expoExempleComponents/hello-wave.tsx
diff --git a/components/parallax-scroll-view.tsx b/components/expoExempleComponents/parallax-scroll-view.tsx
similarity index 93%
rename from components/parallax-scroll-view.tsx
rename to components/expoExempleComponents/parallax-scroll-view.tsx
index 6f674a7..78c639b 100644
--- a/components/parallax-scroll-view.tsx
+++ b/components/expoExempleComponents/parallax-scroll-view.tsx
@@ -7,7 +7,7 @@ import Animated, {
   useScrollOffset,
 } from 'react-native-reanimated';
 
-import { ThemedView } from '@/components/themed-view';
+import { ThemedView } from '@/components/theme/themed-view';
 import { useColorScheme } from '@/hooks/use-color-scheme';
 import { useThemeColor } from '@/hooks/use-theme-color';
 
@@ -23,7 +23,7 @@ export default function ParallaxScrollView({
   headerImage,
   headerBackgroundColor,
 }: Props) {
-  const backgroundColor = useThemeColor({}, 'background');
+  const backgroundColor = useThemeColor({}, 'background3');
   const colorScheme = useColorScheme() ?? 'light';
   const scrollRef = useAnimatedRef<Animated.ScrollView>();
   const scrollOffset = useScrollOffset(scrollRef);
diff --git a/components/selectChantier.tsx b/components/selectChantier.tsx
index cf81ed5..0a8879c 100644
--- a/components/selectChantier.tsx
+++ b/components/selectChantier.tsx
@@ -15,10 +15,10 @@ import {
 import Animated, {
   LinearTransition
 } from "react-native-reanimated";
-import { ThemedButton } from "./themed-button";
-import { ThemedText } from "./themed-text";
-import { ThemedTextInput } from "./themed-textinput";
-import { ThemedView } from "./themed-view";
+import { ThemedButton } from "./theme/themed-button";
+import { ThemedText } from "./theme/themed-text";
+import { ThemedTextInput } from "./theme/themed-textinput";
+import { ThemedView } from "./theme/themed-view";
 
 const screenHeight = Dimensions.get("window").height;
 const { width, height } = Dimensions.get("window");
@@ -57,7 +57,7 @@ export default function SelectChantier() {
   }
 
   function onPressAddChantier(){
-    router.push('/(tabs)/ajoute_chantier')
+    router.push('/(tabs)/addChantier')
     setIsOpen(false)
   }
 
diff --git a/components/setStatus.tsx b/components/setStatus.tsx
index 94acd19..5880ec6 100644
--- a/components/setStatus.tsx
+++ b/components/setStatus.tsx
@@ -3,9 +3,9 @@ import { changeChantierStatus } from "@/services/ressourcesService";
 import { useState } from 'react';
 import { Dimensions, LayoutAnimation, Modal, Pressable, StyleSheet, View } from 'react-native';
 import Animated, { LinearTransition } from 'react-native-reanimated';
-import { ThemedButton } from './themed-button';
-import { ThemedText } from './themed-text';
-import { ThemedView } from "./themed-view";
+import { ThemedButton } from './theme/themed-button';
+import { ThemedText } from './theme/themed-text';
+import { ThemedView } from "./theme/themed-view";
 
 const { width, height } = Dimensions.get("window");
 
diff --git a/components/themed-button.tsx b/components/theme/themed-button.tsx
similarity index 100%
rename from components/themed-button.tsx
rename to components/theme/themed-button.tsx
diff --git a/components/themed-mapview.tsx b/components/theme/themed-mapview.tsx
similarity index 100%
rename from components/themed-mapview.tsx
rename to components/theme/themed-mapview.tsx
diff --git a/components/themed-text.tsx b/components/theme/themed-text.tsx
similarity index 100%
rename from components/themed-text.tsx
rename to components/theme/themed-text.tsx
diff --git a/components/themed-textinput.tsx b/components/theme/themed-textinput.tsx
similarity index 100%
rename from components/themed-textinput.tsx
rename to components/theme/themed-textinput.tsx
diff --git a/components/themed-view.tsx b/components/theme/themed-view.tsx
similarity index 100%
rename from components/themed-view.tsx
rename to components/theme/themed-view.tsx
diff --git a/components/ui/collapsible.tsx b/components/ui/collapsible.tsx
index 6345fde..19be159 100644
--- a/components/ui/collapsible.tsx
+++ b/components/ui/collapsible.tsx
@@ -1,8 +1,8 @@
 import { PropsWithChildren, useState } from 'react';
 import { StyleSheet, TouchableOpacity } from 'react-native';
 
-import { ThemedText } from '@/components/themed-text';
-import { ThemedView } from '@/components/themed-view';
+import { ThemedText } from '@/components/theme/themed-text';
+import { ThemedView } from '@/components/theme/themed-view';
 import { IconSymbol } from '@/components/ui/icon-symbol';
 import { Colors } from '@/constants/theme';
 import { useColorScheme } from '@/hooks/use-color-scheme';