From 9ed25aaab48a239b402d7751dd2ae0423437b560 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 19 Dec 2023 11:29:22 +0100 Subject: [PATCH] fmt --- .../memorisationapplication/HomeScreen.kt | 34 ++++++++++--------- .../memorisationapplication/ui/ErrorsAjout.kt | 2 +- .../ui/HomeViewModel.kt | 6 ++++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/HomeScreen.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/HomeScreen.kt index fbe9b1c..1e4f007 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/HomeScreen.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/HomeScreen.kt @@ -107,7 +107,7 @@ fun HomeScreen(padding: PaddingValues, model: HomeViewModel = viewModel()) { onClick = { Toast.makeText(context, "Start", Toast.LENGTH_SHORT).show() }) { Text(text = context.getString(R.string.main_button_start), fontSize = 30.sp) } - + Spacer(modifier = Modifier.padding(top = 50.dp)) DeleteRow(context, model) @@ -119,8 +119,10 @@ private fun DeleteRow( context: Context, model: HomeViewModel ) { - Row(modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.Center,/*, horizontalArrangement = Arrangement.SpaceEvenly*/) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center,/*, horizontalArrangement = Arrangement.SpaceEvenly*/ + ) { Button(onClick = { (model::doAction)(ActionHome.DELETION_DB) }, colors = ButtonDefaults.buttonColors(containerColor = colorResource(id = R.color.red))) { @@ -169,13 +171,13 @@ private fun ActionRow( @Composable fun CreationDialog( dismiss: () -> Unit, - model : HomeViewModel = viewModel() + model: HomeViewModel = viewModel() ) { val sujet by model.sujet AlertDialog( onDismissRequest = dismiss, - title = { Text(text ="Créer un sujet") }, + title = { Text(text = "Créer un sujet") }, text = { OutlinedTextField( sujet, @@ -205,7 +207,7 @@ fun ImportDialog( model: HomeViewModel ) { val radioOptions = listOf("Locale", "Internet") - val (selectedOption, onOptionSelected) = remember {mutableStateOf(radioOptions[0])} + val (selectedOption, onOptionSelected) = remember { mutableStateOf(radioOptions[0]) } var lien by remember { mutableStateOf("") } @@ -241,8 +243,8 @@ fun ImportDialog( OutlinedTextField( value = lien, - onValueChange = {newTextValue -> lien = newTextValue}, - label = {Text(text = "Lien") } + onValueChange = { newTextValue -> lien = newTextValue }, + label = { Text(text = "Lien") } ) } }, @@ -265,25 +267,25 @@ fun ImportDialog( @Composable fun ErrorDialog(errMsg: String, dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss, - title = { Text(text = "Erreur")}, + title = { Text(text = "Erreur") }, text = { Text(text = errMsg) }, - confirmButton = {Button(onClick = dismiss) { Text(text = "Ok") }} + confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } } ) @Composable fun DeletionDialog(dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss, - title = { Text(text = "Supprimer un jeu de question")}, + title = { Text(text = "Supprimer un jeu de question") }, text = { Text(text = "Voulez-vous supprimer ce jeu de question ?") }, - confirmButton = {Button(onClick = dismiss) { Text(text = "Ok") }} + confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } } ) @Composable fun DeletionDBDialog(dismiss: () -> Unit) = AlertDialog(onDismissRequest = dismiss, - title = { Text(text = "Supprimer la base de données")}, + title = { Text(text = "Supprimer la base de données") }, text = { Text(text = "Voulez-vous supprimer la base de données ?") }, - confirmButton = {Button(onClick = dismiss) { Text(text = "Ok") }} + confirmButton = { Button(onClick = dismiss) { Text(text = "Ok") } } ) @Composable @@ -321,10 +323,10 @@ fun ListItem( Modifier.fillMaxSize(), colors = CardDefaults.cardColors(containerColor) ) { - Row ( + Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly - ){ + ) { Text(set.toString(), modifier = Modifier.padding(2.dp)) } } diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ErrorsAjout.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ErrorsAjout.kt index fa034bb..a030e35 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ErrorsAjout.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ErrorsAjout.kt @@ -1,3 +1,3 @@ package fr.uparis.diamantkennel.memorisationapplication.ui -enum class ErrorsAjout { BAD_ENTRY, DUPLICATE} \ No newline at end of file +enum class ErrorsAjout { BAD_ENTRY, DUPLICATE } diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/HomeViewModel.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/HomeViewModel.kt index f64839a..6a28795 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/HomeViewModel.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/HomeViewModel.kt @@ -68,19 +68,23 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { ActionHome.CREATION -> { creation.value = true } + ActionHome.IMPORTATION -> { importation.value = true } + ActionHome.MODIFIER -> { if (selected.value != null) { modification.value = true } } + ActionHome.DELETION_SELECT -> { if (selected.value != null) { deletionSelect.value = true } } + ActionHome.DELETION_DB -> { deletionDB.value = true } @@ -114,9 +118,11 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { fun dismissCreation() { creation.value = false } + fun dismissModification() { modification.value = false } + fun dismissImportation() { importation.value = false }