correction de la navbar + remise en forme du AppNavigator

What_The_Fantasy/app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlinx.serialization)
 }
 
 android {

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/BackBar.kt

@@ -0,0 +1,64 @@
+package com.example.what_the_fantasy.ui.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.AccountCircle
+import androidx.compose.material.icons.rounded.ArrowBack
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonColors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.example.what_the_fantasy.R
+import com.example.what_the_fantasy.ui.theme.colorButtonNav
+import com.example.what_the_fantasy.ui.theme.colorNavBar
+
+@Composable
+fun BackBar(navBack : () ->Unit ,
+            content : @Composable ()-> Unit  ){
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(70.dp)
+                .background(colorNavBar),
+            Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.Bottom
+        ) {
+            IconButton(onClick = {navBack()},
+                modifier = Modifier
+                    .size(60.dp)
+            ) {
+                Icon(Icons.Rounded.ArrowBack,
+                    contentDescription = "Back",
+                    modifier = Modifier
+                        .size(60.dp)
+                )
+            }
+
+        }
+
+        Box(modifier = Modifier.background(Color.Black).fillMaxHeight()) {
+            content()
+        }
+    }
+}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt

@@ -44,7 +44,6 @@ fun NavBar(onProfile : Boolean = false ,
            navControllerAccueil: (Int) -> Unit,
            navControllerQuiz: (Int) -> Unit,
 
-
            content : @Composable ()-> Unit ) {
 
     Column(
@@ -89,25 +88,11 @@ fun NavBar(onProfile : Boolean = false ,
             ButtonIconPainterInt(painterResource(R.mipmap.ic_launcher_foreground),"Accueil",navControllerAccueil,index,onAccueil)
 
             ButtonIconVectorInt(Icons.Rounded.Create,"Quiz",navControllerQuiz,index,onQuiz)
+
         }
     }
 }
-@Composable
+
-fun ButtonIconVector(img : ImageVector, name : String, nav : ()->Unit ,onPage : Boolean){
-    IconButton(onClick = {nav()},
-        enabled = !onPage,
-        colors = IconButtonColors(Color.Transparent,Color.White,//couleur quand il n'est pas selectionné
-                                Color.Transparent, colorButtonNav),//couleur quand il est selectionné
-        modifier = Modifier
-            .size(60.dp)
-    ) {
-        Icon(img,
-            contentDescription = name,
-            modifier = Modifier
-                .size(60.dp)
-        )
-    }
-}
 @Composable
 fun ButtonIconVectorInt(img : ImageVector, name : String, nav : (Int)->Unit ,index: Int,onPage : Boolean){
     IconButton(onClick = {nav(index)},
@@ -126,22 +111,6 @@ fun ButtonIconVectorInt(img : ImageVector, name : String, nav : (Int)->Unit ,ind
 }
 
 
-@Composable
-fun ButtonIconPainter(img : Painter, name : String, nav : ()->Unit,onPage : Boolean){
-    IconButton(onClick = {nav()},
-        enabled = !onPage,
-        colors = IconButtonColors(Color.Transparent,Color.White,//couleur quand il n'est pas selectionné
-            Color.Transparent, colorButtonNav),//couleur quand il est selectionné
-        modifier = Modifier
-            .size(60.dp)
-    ) {
-        Icon(img,
-            contentDescription = name,
-            modifier = Modifier
-                .size(60.dp)
-        )
-    }
-}
 @Composable
 fun ButtonIconPainterInt(img : Painter, name : String, nav : (Int)->Unit,index: Int,onPage : Boolean){
     IconButton(onClick = {nav(index)},

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.toRoute
 import com.example.what_the_fantasy.data.services.ServicesStub
 import com.example.what_the_fantasy.ui.screens.AccueilPage
 import com.example.what_the_fantasy.ui.screens.FavoritePage
@@ -16,155 +17,128 @@ import com.example.what_the_fantasy.ui.screens.QuotePage
 import com.example.what_the_fantasy.ui.screens.SearchPage
 import com.example.what_the_fantasy.ui.screens.SignUpPage
 import com.example.what_the_fantasy.ui.screens.SubmitQuotePage
+import kotlinx.serialization.Serializable
 
+@Serializable
+data class Accueil(val userIndex: Int)
+@Serializable
+data object Login
+@Serializable
+data class Favorite(val userIndex: Int)
+@Serializable
+data class Profil(val userIndex: Int)
+@Serializable
+data class  QuizMenu(val userIndex: Int)
+@Serializable
+data class Quiz(val userIndex : Int, val idQuiz : Int)
+@Serializable
+data class QuizEnd(val userIndex : Int, val idQuiz : Int,val pts : Int)
+@Serializable
+data object Quote
+@Serializable
+data object Search
+@Serializable
+data object SignUp
+@Serializable
+data object SubmitQuote
 
 
-sealed class Destination(val route: String) {
-    data object Login : Destination("Login")
-    data object Accueil : Destination("Accueil/{userIndex}") {  // Ajout du paramètre userIndex
-        fun createRoute(userIndex: Int) = "Accueil/$userIndex"  // Fonction pour créer la route avec l'index
-    }
-    data object Favorite : Destination("Favorite/{userIndex}") {  // Ajout du paramètre userIndex
-        fun createRoute(userIndex: Int) = "Favorite/$userIndex"  // Fonction pour créer la route avec l'index
-    }
-    data object Profil : Destination("Profil/{userIndex}") {  // Ajout du paramètre userIndex
-        fun createRoute(userIndex: Int) = "Profil/$userIndex"  // Fonction pour créer la route avec l'index
-    }
-    data object QuizMenu : Destination("QuizMenu/{userIndex}") {  // Ajout du paramètre userIndex
-        fun createRoute(userIndex: Int) = "QuizMenu/$userIndex"  // Fonction pour créer la route avec l'index
-    }
-    data object Quiz : Destination("Quiz/{idQuiz}") {
-        // Ajout paramètre idQuiz
-        fun createId(idQuiz : Int) = "Quiz/$idQuiz"
-    }
-    data object QuizEnd : Destination("QuizEnd/{idQuiz}/{pts}") {
-        // Ajout paramètres idQuiz et pts
-        fun createIdAndPts(idQuiz : Int, pts : Int) = "QuizEnd/$idQuiz/$pts"
-    }
-    data object Quote : Destination("Quote")
-    data object Search : Destination("Search")
-    data object SignUp : Destination("SignUp")
-    data object SubmitQuote : Destination("SubmitQuote")
-}
-
 @Composable
 fun AppNavigator() {
     val navController = rememberNavController()
     val services = ServicesStub()
-    NavHost(navController, startDestination = Destination.Login.route) {
+    NavHost(navController, startDestination = Login) {
-        composable(Destination.Login.route) {
+        composable<Login> {
             LoginPage(
-                navControllerSignUp = {
+                navControllerSignUp = { navController.navigate(SignUp) },
-                    navController.navigate(Destination.SignUp.route)
-                },
                 navControllerProfil = { userIndex ->
-                    navController.navigate(Destination.Profil.createRoute(userIndex)) {
+                    navController.navigate(Profil(userIndex)) {
                         // Vider pile de navigation pour empêcher le retour à la page Login
-                        popUpTo(Destination.Login.route) { inclusive = true }
+                        popUpTo(Login) { inclusive = true }
                     }
                 },
-                services
+                services = services
             )
         }
-        composable(Destination.Accueil.route) {
+        composable<Accueil> {
-            val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
+            val accueil: Accueil = it.toRoute()
             AccueilPage(
-                index = userIndex,
+                index = accueil.userIndex,
-                navFavorite = { userIndex ->
+                navFavorite = { navController.navigate(Favorite(accueil.userIndex)) },
-                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
+                navQuiz =  { navController.navigate(QuizMenu(accueil.userIndex)) },
-                },
+                navProfil = { navController.navigate(Profil(accueil.userIndex)) }
-                navQuiz =  { userIndex ->
-                    navController.navigate(Destination.QuizMenu.createRoute(userIndex))  // Passe l'index à Profil
-                },
-                navProfil = { userIndex ->
-                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
-                }
         ) }
-        composable(Destination.Favorite.route) {
+        composable<Favorite> {
-            val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
+            val favorite: Favorite = it.toRoute()
             FavoritePage(
-                index = userIndex,
+                index = favorite.userIndex,
-                navAccueil ={ userIndex ->
+                navAccueil ={ navController.navigate( Accueil(favorite.userIndex) ) },
-                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
+                navQuiz =  { navController.navigate(QuizMenu(favorite.userIndex)) },
-                },
+                navProfil = { navController.navigate(Profil(favorite.userIndex)) }
-                navQuiz =  { userIndex ->
-                    navController.navigate(Destination.QuizMenu.createRoute(userIndex))  // Passe l'index à Profil
-                },
-                navProfil = { userIndex ->
-                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
-                }
         ) }
-        composable(Destination.Profil.route) {
+        composable<Profil>{
-            // Récupère l'index passé dans la route
+            val profil:Profil = it.toRoute()
-            val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
             ProfilPage(
-                index = userIndex,
+                index = profil.userIndex,
-                navFavorite = { userIndex ->
+                navFavorite = { navController.navigate(Favorite(profil.userIndex)) },
-                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
+                navAccueil ={ navController.navigate( Accueil(profil.userIndex) ) },
-                },
+                navQuiz =  { navController.navigate( QuizMenu(profil.userIndex)) },
-                navAccueil ={ userIndex ->
-                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
-                },
-                navQuiz =  { userIndex ->
-                    navController.navigate(Destination.QuizMenu.createRoute(userIndex))  // Passe l'index à Profil
-                },
                 navUnLog = {
-                    navController.navigate(Destination.Login.route) {
+                    navController.navigate(Login) {
                         // Vider pile de navigation pour empêcher le retour à la page profil
-                        popUpTo(Destination.Profil.route) { inclusive = true }
+                        popUpTo(profil) { inclusive = true }
                     }
                 },
                 services = services
             )
         }
-        composable(Destination.Quote.route) { QuotePage() }
+        composable<Quote> { QuotePage() }
-        composable(Destination.Search.route) { SearchPage() }
+        composable<Search> { SearchPage() }
-        composable(Destination.SignUp.route) { SignUpPage(
+        composable<SignUp> { SignUpPage(
             navControllerLogin = {
-                navController.navigate(Destination.Login.route){
+                navController.navigate(Login){
                     // Vider pile de navigation pour empêcher le retour à la page Sign up
-                    popUpTo(Destination.Login.route) { inclusive = true }
+                    popUpTo(Login) { inclusive = true }
                 }
             },services) }
-        composable(Destination.SubmitQuote.route) { SubmitQuotePage() }
+        composable<SubmitQuote> { SubmitQuotePage() }
 
-        composable(Destination.QuizMenu.route) {
+        composable<QuizMenu> {
-            //val userIndex = it.arguments?.getString("userIndex")?.toInt() ?: -1
+            val quizMenu:QuizMenu=it.toRoute()
             QuizMenu(
-                //index = userIndex,
+                index = quizMenu.userIndex,
-//                navAccueil = { userIndex ->
+                navAccueil = { navController.navigate( Accueil(quizMenu.userIndex) ) },
-//                    navController.navigate(Destination.Accueil.createRoute(userIndex))  // Passe l'index à Profil
+                navFavorite = { navController.navigate(Favorite(quizMenu.userIndex)) },
-//                },
+                navProfil = { navController.navigate(Profil(quizMenu.userIndex)) },
-//                navFavorite = { userIndex ->
+                navControllerQuiz = { idQuiz ->
-//                    navController.navigate(Destination.Favorite.createRoute(userIndex))  // Passe l'index à Profil
+                    navController.navigate(Quiz(quizMenu.userIndex,idQuiz))
-//                },
-//                navProfil = { userIndex ->
-//                    navController.navigate(Destination.Profil.createRoute(userIndex))  // Passe l'index à Profil
-//                },
-                navControllerQuiz = { id ->
-                    navController.navigate(Destination.Quiz.createId(id))
                 }
             )
         }
-        composable(Destination.Quiz.route) { backStackEntry ->
+        composable<Quiz> {
-            val idQuiz = backStackEntry.arguments?.getString("idQuiz")?.toInt() ?: 0
+            val quiz:Quiz=it.toRoute()
             QuizPage(
+                index = quiz.userIndex,
+                navAccueil = { navController.navigate( Accueil(quiz.userIndex) ) },
+                navFavorite = { navController.navigate(Favorite(quiz.userIndex)) },
+                navProfil = { navController.navigate(Profil(quiz.userIndex)) },
+                navQuiz =  { navController.navigate(QuizMenu(quiz.userIndex)) },
                 navControllerQuizEnd = { idQuiz, pts ->
-                    navController.navigate(Destination.QuizEnd.createIdAndPts(idQuiz, pts))
+                    navController.navigate(QuizEnd(quiz.userIndex,idQuiz, pts))
                 },
-                navControllerQuizMenu = { navController.navigate(Destination.QuizMenu.route) },
+                idQuiz =  quiz.idQuiz
-                navControllerMenu = { navController.navigate(Destination.Accueil.route) },
-                idQuiz
             )
         }
-        composable(Destination.QuizEnd.route) { backStackEntry ->
+        composable<QuizEnd> {
-            val idQuiz = backStackEntry.arguments?.getString("idQuiz")?.toInt() ?: 0
+            val quizEnd: QuizEnd = it.toRoute()
-            val pts = backStackEntry.arguments?.getString("pts")?.toInt() ?: 0
             QuizEndPage(
-                idQuiz,
+                idQuiz = quizEnd.idQuiz,
-                pts,
+                points = quizEnd.pts,
-                navControllerQuizMenu = { navController.navigate(Destination.QuizMenu.route) },
+                index = quizEnd.userIndex,
-                navControllerMenu = { navController.navigate(Destination.Accueil.route) }
+                navAccueil = { navController.navigate( Accueil(quizEnd.userIndex) ) },
+                navFavorite = { navController.navigate(Favorite(quizEnd.userIndex)) },
+                navProfil = { navController.navigate(Profil(quizEnd.userIndex)) },
+                navQuiz =  { navController.navigate(QuizMenu(quizEnd.userIndex)) }
             )
         }
     }

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

@@ -26,6 +26,7 @@ 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
+import com.example.what_the_fantasy.ui.components.NavBar
 
 val gradient = Brush.linearGradient(
     colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)),
@@ -37,31 +38,21 @@ val gradient = Brush.linearGradient(
 fun QuizEndPage(
     idQuiz: Int,
     points: Int,
-    navControllerQuizMenu: () -> Unit,
+    index: Int,
-    navControllerMenu: () -> Unit
+    navFavorite: (Int) -> Unit,
+    navAccueil: (Int) -> Unit,
+    navProfil:(Int) -> Unit,
+    navQuiz: (Int) -> Unit,
 ) {
+    NavBar(onQuiz = true,
+        index = index,
+        navControllerFavorite = navFavorite,
+        navControllerAccueil = navAccueil,
+        navControllerProfil = navProfil,
+        navControllerQuiz = navQuiz) {
         Column(
             modifier = Modifier.fillMaxSize().background(Color(0xFF100C1B))
         ) {
-        // Bandeau supérieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Image(
-                painter = painterResource(id = R.drawable.profile_icon),
-                contentDescription = "Profil",
-                modifier = Modifier.size(50.dp)
-            )
-            Image(
-                painter = painterResource(id = R.drawable.toggle),
-                contentDescription = "Profil"
-            )
-        }
 
             // Contenu principal
             Column(
@@ -74,7 +65,11 @@ fun QuizEndPage(
                 Text(
                     text = "▶ Résultats ◀",
                     color = Color.White,
-                style = TextStyle(fontSize = 25.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                    style = TextStyle(
+                        fontSize = 25.sp,
+                        fontWeight = FontWeight.Bold,
+                        textAlign = TextAlign.Center
+                    )
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 Column(
@@ -90,17 +85,29 @@ fun QuizEndPage(
                     Text(
                         text = "${quiz?.name}",
                         color = Color.White,
-                    style = TextStyle(fontSize = 25.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                        style = TextStyle(
+                            fontSize = 25.sp,
+                            fontWeight = FontWeight.Bold,
+                            textAlign = TextAlign.Center
+                        )
                     )
                     Text(
                         text = "Nombres de Questions : $nbQuestions",
                         color = Color.White,
-                    style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            fontWeight = FontWeight.Bold,
+                            textAlign = TextAlign.Center
+                        )
                     )
                     Text(
                         text = "Nombres de bonnes réponses : $points",
                         color = Color.White,
-                    style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            fontWeight = FontWeight.Bold,
+                            textAlign = TextAlign.Center
+                        )
                     )
 
                     val pourcentage = (points.toDouble() / nbQuestions!!) * 100
@@ -132,37 +139,6 @@ fun QuizEndPage(
                     }
                 }
             }
-
-        // Bandeau inférieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                .background(Color(0xFF300052))
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceAround,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            // Bouton Likes
-            Image(
-                painter = painterResource(id = R.drawable.like_icon),
-                contentDescription = "Bouton",
-                modifier = Modifier.size(50.dp)
-            )
-            // Bouton WhatTheFantasy
-            Image(
-                painter = painterResource(R.drawable.wf_logo),
-                contentDescription = "Menu Button",
-                Modifier.clickable { navControllerMenu() }
-            )
-            // Bouton Menu Quiz
-            Image(
-                painter = painterResource(id = R.drawable.quiz_icon),
-                contentDescription = "Bouton",
-                modifier = Modifier
-                    .size(50.dp)
-                    .clickable { navControllerQuizMenu() }
-            )
         }
     }
 }

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

@@ -41,31 +41,23 @@ import com.example.what_the_fantasy.ui.components.NavBar
 
 
 @Composable
-fun QuizMenu(navControllerQuiz: (Int) -> Unit) {
+fun QuizMenu(    index: Int,
+                 navFavorite: (Int) -> Unit,
+                 navAccueil: (Int) -> Unit,
+                 navProfil:(Int) -> Unit,
+                 navControllerQuiz: (Int) -> Unit
+) {
+    NavBar(onQuiz = true,
+        index = index,
+        navControllerFavorite = navFavorite,
+        navControllerAccueil = navAccueil,
+        navControllerProfil = navProfil,
+        navControllerQuiz = {  }
+    ) {
 
         Column(
             modifier = Modifier.fillMaxSize().background(Color(0xFF100C1B))
         ) {
-        // Bandeau supérieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                //background(Color(0xFF300052))
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Image(
-                painter = painterResource(id = R.drawable.profile_icon),
-                contentDescription = "Profil"
-            )
-            Image(
-                painter = painterResource(id = R.drawable.toggle),
-                contentDescription = "Profil"
-            )
-        }
-
             // Contenu princiapl
             Column(
                 modifier = Modifier
@@ -77,7 +69,11 @@ fun QuizMenu(navControllerQuiz: (Int) -> Unit) {
                 Text(
                     text = "▶ Menu des Quiz ◀",
                     color = Color.White,
-                style = TextStyle(fontSize = 25.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                    style = TextStyle(
+                        fontSize = 25.sp,
+                        fontWeight = FontWeight.Bold,
+                        textAlign = TextAlign.Center
+                    )
                 )
                 Spacer(Modifier.height(20.dp))
                 Column(
@@ -131,33 +127,6 @@ fun QuizMenu(navControllerQuiz: (Int) -> Unit) {
                     }
                 }
             }
-
-        // Bandeau inférieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                .background(Color(0xFF300052))
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceAround,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            // Bouton Likes
-            Image(
-                painter = painterResource(id = R.drawable.like_icon),
-                contentDescription = "Bouton"
-            )
-            // Bouton WhatTheFantasy
-            Image(
-                painter = painterResource(R.drawable.wf_logo),
-                contentDescription = "Menu Button",
-                Modifier.clickable { }
-            )
-            // Bouton Quiz
-            Image(
-                painter = painterResource(id = R.drawable.quiz_icon),
-                contentDescription = "Bouton"
-            )
         }
     }
 }

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

@@ -22,12 +22,19 @@ 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
+import com.example.what_the_fantasy.ui.components.BackBar
+import com.example.what_the_fantasy.ui.components.NavBar
 
 @Composable
 fun QuizPage(
+    index: Int,
+    navFavorite: (Int) -> Unit,
+    navAccueil: (Int) -> Unit,
+    navProfil:(Int) -> Unit,
+    navQuiz: (Int) -> Unit,
+
     navControllerQuizEnd: (Int, Int) -> Unit,
-    navControllerQuizMenu: () -> Unit,
+
-    navControllerMenu: () -> Unit,
     idQuiz: Int
     ) {
     val quiz = QuizStub.getQuizById(idQuiz)
@@ -54,30 +61,16 @@ fun QuizPage(
         if (idCurrentQuestion < questions.size - 1) idCurrentQuestion++
         else navControllerQuizEnd(idQuiz, pts) // Retour menu
     }
-
+    NavBar(onQuiz = true,
+        index = index,
+        navControllerFavorite = navFavorite,
+        navControllerAccueil = navAccueil,
+        navControllerProfil = navProfil,
+        navControllerQuiz = navQuiz
+    ){
         Column (
         modifier = Modifier.fillMaxSize().background(Color(0xFF100C1B))
     ) {
-        // Bandeau supérieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                //.background(Color(0xFF300052))
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Image(
-                painter = painterResource(id = R.drawable.profile_icon),
-                contentDescription = "Profil"
-            )
-            Image(
-                painter = painterResource(id = R.drawable.toggle),
-                contentDescription = "Profil"
-            )
-        }
-
             // Contenu princiapl
             Column(
                 modifier = Modifier
@@ -95,7 +88,11 @@ fun QuizPage(
                         Text(
                             text = "▶ ${quiz.name} ◀",
                             color = Color.White,
-                        style = TextStyle(fontSize = 20.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center)
+                            style = TextStyle(
+                                fontSize = 20.sp,
+                                fontWeight = FontWeight.Bold,
+                                textAlign = TextAlign.Center
+                            )
                         )
                     }
                     Spacer(Modifier.height(20.dp))
@@ -148,34 +145,6 @@ fun QuizPage(
                     }
                 }
             }
-
-        // Bandeau inférieur
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(0.1f)
-                .background(Color(0xFF300052))
-                .padding(20.dp),
-            horizontalArrangement = Arrangement.SpaceAround,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            // Bouton Likes
-            Image(
-                painter = painterResource(id = R.drawable.like_icon),
-                contentDescription = "Bouton"
-            )
-            // Bouton WhatTheFantasy
-            Image(
-                painter = painterResource(R.drawable.wf_logo),
-                contentDescription = "Menu Button",
-                Modifier.clickable { navControllerMenu() }
-            )
-            // Bouton Menu Quiz
-            Image(
-                painter = painterResource(id = R.drawable.quiz_icon),
-                contentDescription = "Bouton",
-                Modifier.clickable { navControllerQuizMenu() }
-            )
         }
     }
 }

What_The_Fantasy/gradle/libs.versions.toml

@@ -38,4 +38,4 @@ androidx-navigation-common-android = { group = "androidx.navigation", name = "na
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}