From 7220483540d6435f989626cc11b10761918a92a1 Mon Sep 17 00:00:00 2001
From: tonyfages <tony.fages@etu.uca.fr>
Date: Sun, 31 Mar 2024 19:50:16 +0200
Subject: [PATCH] tp8

---
 JokesApp/navigation/Navigation.tsx      |  9 +++---
 JokesApp/navigation/StackNavigation.tsx | 40 +++++++++++++++++++++----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/JokesApp/navigation/Navigation.tsx b/JokesApp/navigation/Navigation.tsx
index 1dcd4c0..05a38b8 100644
--- a/JokesApp/navigation/Navigation.tsx
+++ b/JokesApp/navigation/Navigation.tsx
@@ -8,7 +8,7 @@ import {AccueilScreen} from "../screens/AccueilScreen";
 import {AddJokeScreen} from "../screens/AddJokeScreen";
 import {SettingsScreen} from "../screens/SettingsScreen";
 import {JokeListItems} from "../components/ListeJokeComponent";
-import StackNavigation from "./StackNavigation";
+import {CatalogueScreen, FavoriteScreen} from "./StackNavigation";
 const homeIcon = require("../assets/home_icon.png");
 const listIcon = require("../assets/list_icon.png");
 const addIcon = require("../assets/add_icon.png");
@@ -58,7 +58,7 @@ export function Navigation(){
                                                    />
                                                )
                                            }}/>
-                <BottomTabNavigator.Screen name="Catalogue" component={StackNavigation}
+                <BottomTabNavigator.Screen name="Catalogue" component={CatalogueScreen}
                                            options={{
                                                tabBarIcon: ({focused}) => (
                                                    <Image source={listIcon}
@@ -79,13 +79,14 @@ export function Navigation(){
 
                                            }}/>
 
-                <BottomTabNavigator.Screen name="Favoris" component={ListFavoriteJokeScreen}
+                <BottomTabNavigator.Screen name="Favoris" component={FavoriteScreen}
                                            options={{
                                                tabBarIcon: ({focused}) => (
                                                    <Image source={favIcon}
                                                           style={{ tintColor: focused ? darksalmonColor : purpleColor }}
                                                    />
-                                               )
+                                               ),
+                                               headerShown: false,
                                            }}/>
                 <BottomTabNavigator.Screen name="Paramètres" component={SettingsScreen}
                                            options={{
diff --git a/JokesApp/navigation/StackNavigation.tsx b/JokesApp/navigation/StackNavigation.tsx
index ee39198..ada3973 100644
--- a/JokesApp/navigation/StackNavigation.tsx
+++ b/JokesApp/navigation/StackNavigation.tsx
@@ -6,12 +6,40 @@ import {DetailJoke} from "../components/DetailJoke";
 import JokeDetailScreen from "../screens/JokeDetailScreen";
 import {ListJokeScreen} from "../screens/ListJokeScreen";
 import {darksalmonColor, indigo, purpleColor} from "../Theme";
+import {ListFavoriteJokeScreen} from "../screens/ListFavoriteJokeScreen";
 
-export default function StackNavigation() {
 
+export function CatalogueScreen(){
+const Stack = createStackNavigator();
+return(
+    <Stack.Navigator initialRouteName="CatalogueStack" screenOptions={
+        {
+            headerTitleStyle: {
+                fontSize: 24,
+                fontWeight: 'bold',
+                color: darksalmonColor,
+
+            },
+            headerStyle: {
+                backgroundColor: indigo,
+
+            },
+            headerTitle : "Catalogue",
+            headerBackTitleVisible: false,
+            headerTintColor: darksalmonColor,
+        }
+
+    }>
+            <Stack.Screen name="CatalogueStack" component={ListJokeScreen} options={{ headerTitle: 'Catalogue' }}/>
+            <Stack.Screen name="JokeDetail" component={JokeDetailScreen} options={{ headerTitle: 'Detail d une blague' }
+            } />
+    </Stack.Navigator>
+)}
+
+export function FavoriteScreen(){
     const Stack = createStackNavigator();
     return(
-        <Stack.Navigator initialRouteName="CatalogueStack" screenOptions={
+        <Stack.Navigator initialRouteName="FavoriteStack" screenOptions={
             {
                 headerTitleStyle: {
                     fontSize: 24,
@@ -23,15 +51,15 @@ export default function StackNavigation() {
                     backgroundColor: indigo,
 
                 },
-                headerTitle : "Catalogue",
+                headerTitle : "Favoris",
                 headerBackTitleVisible: false,
                 headerTintColor: darksalmonColor,
             }
 
         }>
-                <Stack.Screen name="CatalogueStack" component={ListJokeScreen} options={{ headerTitle: 'Catalogue' }}/>
-                <Stack.Screen name="JokeDetail" component={JokeDetailScreen} options={{ headerTitle: 'Detail d une blague' }
-                } />
+            <Stack.Screen name="FavoriteStack" component={ListFavoriteJokeScreen} options={{ headerTitle: 'Favoris' }}/>
+            <Stack.Screen name="JokeDetail" component={JokeDetailScreen} options={{ headerTitle: 'Detail d une blague' }
+            } />
         </Stack.Navigator>
     )
 }
\ No newline at end of file