Fix Merge issues

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/navigations/AppNavigator.kt

@@ -42,7 +42,7 @@ sealed class Destination(val route: String) {
 fun AppNavigator() {
     val navController = rememberNavController()
     val services = ServicesStub() // A changer si l'on veut passer au service API
-    NavHost(navController, startDestination = Destination.Login.route) {
+    NavHost(navController, startDestination = Destination.QuizMenu.route) {
         composable(Destination.Login.route) {
             LoginPage(
                 navControllerSignUp = { navController.navigate(Destination.SignUp.route) },

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/QuizEndPage.kt

@@ -42,18 +42,17 @@ fun QuizEndPage(idQuiz: Int, points: Int, navControllerQuizMenu: () -> Unit) {
             modifier = Modifier
                 .fillMaxWidth()
                 .weight(0.1f)
-                .background(Color(0xFF300052))
                 .padding(20.dp),
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically
         ) {
             Image(
-                painter = painterResource(id = R.drawable.quiz),
+                painter = painterResource(id = R.drawable.profile_icon),
                 contentDescription = "Profil",
-                modifier = Modifier.size(50.dp).background(Color.Yellow, CircleShape)
+                modifier = Modifier.size(50.dp)
             )
             Image(
-                painter = painterResource(id = R.drawable.quiz),
+                painter = painterResource(id = R.drawable.toggle),
                 contentDescription = "Profil"
             )
         }
@@ -97,30 +96,6 @@ fun QuizEndPage(idQuiz: Int, points: Int, navControllerQuizMenu: () -> Unit) {
                     color = Color.White,
                     style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
                 )
-                Row (
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceAround
-                ) {
-                    // Bouton Quiz Précédent
-                    Image(
-                        painter = painterResource(id = R.drawable.quiz),
-                        contentDescription = "Profil",
-                        modifier = Modifier.size(50.dp).background(Color.Yellow, CircleShape)
-                    )
-                    // Bouton Retour Menu Quiz
-                    Image(
-                        painter = painterResource(id = R.drawable.quiz),
-                        contentDescription = "Profil",
-                        modifier = Modifier.size(50.dp).background(Color.Yellow, CircleShape)
-                    )
-                    // Bouton Quiz Suivant
-                    Image(
-                        painter = painterResource(id = R.drawable.quiz),
-                        contentDescription = "Profil"
-                    )
-                }
-
             }
         }
 
@@ -136,9 +111,9 @@ fun QuizEndPage(idQuiz: Int, points: Int, navControllerQuizMenu: () -> Unit) {
         ) {
             // Bouton Likes
             Image(
-                painter = painterResource(id = R.drawable.quiz),
+                painter = painterResource(id = R.drawable.like_icon),
                 contentDescription = "Bouton",
-                modifier = Modifier.size(50.dp).background(Color.Yellow, CircleShape)
+                modifier = Modifier.size(50.dp)
             )
             // Bouton WhatTheFantasy
             Image(
@@ -148,9 +123,9 @@ fun QuizEndPage(idQuiz: Int, points: Int, navControllerQuizMenu: () -> Unit) {
             )
             // Bouton Quiz
             Image(
-            painter = painterResource(id = R.drawable.quiz),
+                painter = painterResource(id = R.drawable.quiz_icon),
                 contentDescription = "Bouton",
-            modifier = Modifier.size(50.dp).background(Color.Yellow, CircleShape)
+                modifier = Modifier.size(50.dp)
             )
         }
     }