diff --git a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt b/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt index d5b93d6..d574d60 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/ViewModels/PenduViewModel.kt @@ -21,18 +21,21 @@ class PenduViewModel : ViewModel() { uiState.value.motATrou ) } - if (uiState.value.motATrouver.contains(lettre)) { + if (uiState.value.motATrouver.lowercase().contains(lettre.lowercase())) { Log.d("PenduViewModel","L'utilisateur a trouvé une lettre") var nvMotATrou = uiState.value.motATrou for (index in uiState.value.motATrouver.indices) { - if (uiState.value.motATrouver[index] == lettre) { - nvMotATrou = nvMotATrou.replaceRange(index,index + 1, lettre.toString()) + if (uiState.value.motATrouver[index].lowercase() == lettre.lowercase()) { + nvMotATrou = nvMotATrou.replaceRange(index,index + 1, + uiState.value.motATrouver[index].toString() + ) } } var isWon = false if (nvMotATrou.equals(uiState.value.motATrouver)) { isWon = true } + uiState.value = PenduUIState(isWon, true, uiState.value.nbViesRestantes, diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt index fed615e..20ba2ae 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/games/Pendu.kt @@ -2,7 +2,9 @@ package fr.iut.sciencequest.view.games import android.content.Context import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text @@ -14,6 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import fr.iut.sciencequest.R import fr.iut.sciencequest.ViewModels.PenduViewModel @@ -28,20 +31,28 @@ fun PenduScreen(viewModel: PenduViewModel = viewModel(), Column(modifier = Modifier.fillMaxWidth()) { TopBar(goToAccount, goToHome, stringResource(id = R.string.pendu)) //Text(text = stringResource(id = R.string.pendu), modifier = Modifier.padding(top=10.dp)) - Column(modifier = Modifier.align(Alignment.CenterHorizontally)) + Column(modifier = Modifier + .align(Alignment.CenterHorizontally) + .fillMaxWidth()) { - Text(text = state.value.motATrou) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) { + Text(text = state.value.motATrou, fontSize = 30.sp) + } TextField(value = "", onValueChange = { if (it.isNotEmpty()) { viewModel.PlayAction(it[0]) if ((!state.value.isWon) && (state.value.nbViesRestantes == 0)) { goToHome() - } else { + } else if (state.value.isWon) { Toast.makeText(context,"Vous avez gagné !",Toast.LENGTH_LONG).show() + goToHome() } }}, - modifier = Modifier.padding(20.dp)) + modifier = Modifier.padding(20.dp).fillMaxWidth()) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) { + Text(text = state.value.nbViesRestantes.toString()) + } } } }