From 0134d8f861b9bfced4c0f0b63f98202b309a21bc Mon Sep 17 00:00:00 2001 From: Alix JEUDI--LEMOINE Date: Tue, 2 Apr 2024 17:18:19 +0200 Subject: [PATCH] =?UTF-8?q?Modification=20comportement=20si=20gagn=C3=A9/p?= =?UTF-8?q?erdu,=20gel=20de=20l'input=20et=20affichage=20gagn=C3=A9/perdu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/iut/sciencequest/view/games/Pendu.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 30a3618..7922a2b 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,16 +2,12 @@ package fr.iut.sciencequest.view.games import android.content.Context import android.widget.Toast -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement 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.padding -import androidx.compose.foundation.text.KeyboardActions import androidx.compose.material3.Button import androidx.compose.material3.Text import androidx.compose.material3.TextField @@ -21,9 +17,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel @@ -54,9 +48,16 @@ fun PenduScreen(viewModel: PenduViewModel = viewModel(), TextField(value = "", onValueChange = { onLetterEntered(it, viewModel, context, goToHome) }, modifier = Modifier.padding(20.dp), + enabled = !state.value.isWon && state.value.nbViesRestantes > 0, + placeholder = { Text(if(!state.value.isWon) "Entrez une lettre" else "Cliquez sur Nouvelle Partie") } ) afficherVies(state.value.nbViesRestantes) Text("Lettres utilisées: " + state.value.lettresUtilises) + if(state.value.isWon) { + Text(modifier = Modifier.padding(top=10.dp), text = "Vous avez gagné !") + } else if (state.value.nbViesRestantes == 0) { + Text(modifier = Modifier.padding(top=10.dp), text = "Vous avez perdu :(") + } } Button(onClick = { viewModel.InitPartie() }) { Text(text = stringResource(id = R.string.reset_game)) @@ -73,7 +74,7 @@ fun onLetterEntered(entered: String, if (entered.isNotEmpty()) { vm.PlayAction(entered[0]) if ((!state.value.isWon) && (state.value.nbViesRestantes == 0)) { - goToHome() + Toast.makeText(context,"Vous avez perdu :(",Toast.LENGTH_LONG).show() } else if (state.value.isWon) { Toast.makeText(context,"Vous avez gagné !",Toast.LENGTH_LONG).show() }