merge

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

@@ -91,6 +91,7 @@ fun AppNavigator() {
                         navAccueil = { navController.navigate(Accueil(favorite.userIndex)) },
                         navQuiz = { navController.navigate(QuizMenu(favorite.userIndex)) },
                         navProfil = { navController.navigate(Profil(favorite.userIndex)) },
+                        navQuote = {  quoteId -> navController.navigate(OneQuote(quoteId,favorite.userIndex)) },
                         services = services
                     )
                 }
@@ -109,8 +110,8 @@ fun AppNavigator() {
                         services = services
                     )
                 }
-                composable<Quote> {
+                composable<OneQuote> {
-                    val quote: Quote = it.toRoute()
+                    val quote: OneQuote = it.toRoute()
                     QuotePage(
                         quoteId = quote.quoteId,
                         index = quote.userIndex,

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

@@ -1,6 +1,7 @@
 package com.example.what_the_fantasy.ui.screens
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -31,6 +32,7 @@ fun AccueilPage(
     navProfil: (Int) -> Unit,
     navQuote: (Int) -> Unit,
     services: IServices
+
 ) {
     var itemCount by remember { mutableStateOf(15) }
     val dailyQuote = DailyQuoteStub.dailyQuote
@@ -78,8 +80,13 @@ fun AccueilPage(
                     )
                 }
                 items(quotes) { quote ->
+
+                    Column(Modifier.clickable {navQuote(quote.id)}
+                    ) {
                         if(quote.language == user.language){
                             QuoteLittle(quote)
+                            Spacer(modifier = Modifier.height(16.dp))
+                        }
                     }
                 }
                 if (itemCount < QuoteStub.allQuotes.size) {

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

@@ -1,6 +1,7 @@
 package com.example.what_the_fantasy.ui.screens
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -18,6 +19,7 @@ import com.example.what_the_fantasy.data.local.FavoriteStub
 import com.example.what_the_fantasy.data.services.IServices
 import com.example.what_the_fantasy.ui.components.NavBar
 import com.example.what_the_fantasy.ui.components.QuoteLittle
+import com.example.what_the_fantasy.ui.navigations.OneQuote
 import com.example.what_the_fantasy.ui.theme.colorBackground
 
 @Composable
@@ -26,6 +28,7 @@ fun FavoritePage(
     navAccueil: (Int) -> Unit,
     navQuiz: (Int) -> Unit,
     navProfil: (Int) -> Unit,
+    navQuote: (Int) -> Unit,
     services: IServices
 ) {
     val user = services.getUserById(index) ?: return
@@ -57,7 +60,11 @@ fun FavoritePage(
                     )
                 }
                 items(quotes) { quote ->
+                    Column (Modifier.clickable {  navQuote( quote.id )} ){
                         QuoteLittle(quote)
+
+                        Spacer(modifier = Modifier.height(16.dp))
+                    }
                 }
             }
         }

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

@@ -44,8 +44,7 @@ fun QuizEndPage(
     navProfil:(Int) -> Unit,
     navQuiz: (Int) -> Unit,
 ) {
-    NavBar(onQuiz = true,
+    NavBar(index = index,
-        index = index,
         navControllerFavorite = navFavorite,
         navControllerAccueil = navAccueil,
         navControllerProfil = navProfil,

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

@@ -61,8 +61,7 @@ fun QuizPage(
         if (idCurrentQuestion < questions.size - 1) idCurrentQuestion++
         else navControllerQuizEnd(idQuiz, pts) // Retour menu
     }
-    NavBar(onQuiz = true,
+    NavBar(index = index,
-        index = index,
         navControllerFavorite = navFavorite,
         navControllerAccueil = navAccueil,
         navControllerProfil = navProfil,