From 992a4690fac4a04a00cfd139e6f55bad486ec96a Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Mon, 31 Mar 2025 07:03:43 +0100 Subject: [PATCH] jsp --- .../what_the_fantasy/data/services/ServicesStub.kt | 4 +--- .../com/example/what_the_fantasy/ui/components/NavBar.kt | 5 ----- .../example/what_the_fantasy/ui/screens/AccueilPage.kt | 2 +- .../example/what_the_fantasy/ui/screens/FavoritePage.kt | 8 ++------ 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt index 61f0201..054b3d2 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt @@ -1,7 +1,6 @@ package com.example.what_the_fantasy.data.services import android.annotation.SuppressLint -import android.util.Log import com.example.what_the_fantasy.data.local.UserStub.users import com.example.what_the_fantasy.data.model.User import com.example.what_the_fantasy.Logs.LogsUsers @@ -9,7 +8,6 @@ import com.example.what_the_fantasy.data.local.FavoriteStub.favorites import com.example.what_the_fantasy.data.local.QuoteStub.quotes import com.example.what_the_fantasy.data.model.Favorite import com.example.what_the_fantasy.data.local.CommentStub.comments -import com.example.what_the_fantasy.data.local.QuoteStub import com.example.what_the_fantasy.data.model.Comment import com.example.what_the_fantasy.data.model.Quote import com.example.what_the_fantasy.data.model.SrcLanguage @@ -132,7 +130,7 @@ class ServicesStub : IServices { return quotes.subList(fromIndex, toIndex).toMutableList() } override fun isFavorite(id: Int, user: User): Boolean { - var quote = getFavorite(user) + val quote = getFavorite(user) return quote.find{ it.id == id } != null } diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt index 01216d0..55b229e 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/NavBar.kt @@ -11,14 +11,12 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.* import androidx.compose.material3.BottomAppBar import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.IconButtonColors -import androidx.compose.material3.IconToggleButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.NavigationBar import androidx.compose.runtime.Composable @@ -26,7 +24,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector @@ -34,7 +31,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.example.what_the_fantasy.R -import com.example.what_the_fantasy.ui.theme.* @Composable fun NavBar(onProfile : Boolean = false , @@ -49,7 +45,6 @@ fun NavBar(onProfile : Boolean = false , content : @Composable ()-> Unit ) { - var theme by remember { mutableStateOf(true) } Column( modifier = Modifier .fillMaxSize() diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt index ad0d1af..eb6607a 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/AccueilPage.kt @@ -130,7 +130,7 @@ fun AccueilPage( CircularProgressIndicator() } } else { - LaunchedEffect(state.firstVisibleItemIndex, state.layoutInfo.totalItemsCount) { + LaunchedEffect(remember { derivedStateOf { state.firstVisibleItemIndex } }, state.layoutInfo.totalItemsCount) { if (!isLoading.value && state.layoutInfo.visibleItemsInfo.isNotEmpty()) { val lastVisibleItem = state.layoutInfo.visibleItemsInfo.last() if (lastVisibleItem.index >= state.layoutInfo.totalItemsCount - 1) { diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt index 03f86c4..9ae741b 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/FavoritePage.kt @@ -1,6 +1,5 @@ package com.example.what_the_fantasy.ui.screens -import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -11,17 +10,14 @@ import androidx.compose.material3.Text import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign 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.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.theme.colorBackground @Composable fun FavoritePage( @@ -37,7 +33,7 @@ fun FavoritePage( val quotes = services.getFavorite(user) - val TitlePage = stringResource(R.string.TitleFavorite) + val titlePage = stringResource(R.string.TitleFavorite) NavBar(onFavorite = true, navControllerAccueil = navAccueil, navControllerProfil = navProfil, @@ -53,7 +49,7 @@ fun FavoritePage( LazyColumn { item { Text( - text = TitlePage, + text = titlePage, color = MaterialTheme.colorScheme.onBackground, fontSize = 24.sp, modifier = Modifier