From d9ccdad5cb61133d2cc78f1a9c878d3450d2299f Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Fri, 29 Mar 2024 15:19:13 +0100 Subject: [PATCH] =?UTF-8?q?[FIX]=20Refactor=20entr=C3=A9e=20dans=20pendu?= =?UTF-8?q?=20pour=20code=20+=20lisible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/iut/sciencequest/view/games/Pendu.kt | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 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 265d7e1..8112688 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 @@ -35,15 +35,7 @@ fun PenduScreen(viewModel: PenduViewModel = viewModel(), { Text(text = state.value.motATrou) TextField(value = "", - onValueChange = { - if (it.isNotEmpty()) { - viewModel.PlayAction(it[0]) - if ((!state.value.isWon) && (state.value.nbViesRestantes == 0)) { - goToHome() - } else if (state.value.isWon) { - Toast.makeText(context,"Vous avez gagné !",Toast.LENGTH_LONG).show() - } - }}, + onValueChange = { onLetterEntered(it, viewModel, context, goToHome) }, modifier = Modifier.padding(20.dp)) afficherVies(state.value.nbViesRestantes) Button(onClick = { viewModel.InitPartie() }) { @@ -53,6 +45,21 @@ fun PenduScreen(viewModel: PenduViewModel = viewModel(), } } +fun onLetterEntered(entered: String, + vm: PenduViewModel, + context: Context, + goToHome: () -> Unit) { + val state = vm.uiState + if (entered.isNotEmpty()) { + vm.PlayAction(entered[0]) + if ((!state.value.isWon) && (state.value.nbViesRestantes == 0)) { + goToHome() + } else if (state.value.isWon) { + Toast.makeText(context,"Vous avez gagné !",Toast.LENGTH_LONG).show() + } + } +} + @Preview @Composable fun afficherVies(nbVies : Int = 10) {