From dc4b501aea73210ccd685240ae5d07605bd8fbfc Mon Sep 17 00:00:00 2001
From: tomivt <nguyentommy0708@icloud.com>
Date: Tue, 4 Mar 2025 15:20:36 +0100
Subject: [PATCH] Correct Merge issues

---
 .../ui/navigations/AppNavigator.kt            | 22 +++++++++----------
 .../ui/screens/QuizEndPage.kt                 |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt
index 6b81787..8b9186b 100644
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt
@@ -129,20 +129,20 @@ fun AppNavigator() {
         composable(Destination.SubmitQuote.route) { SubmitQuotePage() }
 
         composable(Destination.QuizMenu.route) {
-            val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
+            //val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
             QuizMenu(
-                index = userIndex,
-                navAccueil = { userIndex ->
-                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
-                },
-                navFavorite = { userIndex ->
-                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
-                },
+                //index = userIndex,
+//                navAccueil = { userIndex ->
+//                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
+//                },
+//                navFavorite = { userIndex ->
+//                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
+//                },
+//                navProfil = { userIndex ->
+//                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
+//                },
                 navControllerQuiz = { id ->
                     navController.navigate(Destination.Quiz.createId(id))
-                },
-                navProfil = { userIndex ->
-                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
                 }
             )
         }
diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt
index 945366e..69fb7a4 100644
--- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt
+++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.what_the_fantasy.R
 import com.example.what_the_fantasy.data.local.QuestionStub
+import com.example.what_the_fantasy.data.local.QuizStub
 
 val gradient = Brush.linearGradient(
     colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)),