From 93e490d1cd6bf71c418835f76307c9fcbe5d00b8 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 8 Jan 2024 09:16:15 +0100 Subject: [PATCH] fmt --- .../memorisationapplication/MainActivity.kt | 1 - .../memorisationapplication/PlayScreen.kt | 13 ++++++++----- .../ui/ModifySetViewModel.kt | 2 ++ .../memorisationapplication/ui/PlayViewModel.kt | 13 ++++++++----- .../memorisationapplication/ui/SettingsViewModel.kt | 8 ++++++-- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/MainActivity.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/MainActivity.kt index 65c24ff..2c5f2a2 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/MainActivity.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/MainActivity.kt @@ -150,4 +150,3 @@ fun ShowDialog( dialog() } } - diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/PlayScreen.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/PlayScreen.kt index 67e3f1b..7e4caa6 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/PlayScreen.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/PlayScreen.kt @@ -35,7 +35,7 @@ fun PlayScreen( navController: NavController, snackbarHostState: SnackbarHostState, idSet: Int, - model: PlayViewModel = viewModel() + model: PlayViewModel = viewModel(), ) { // First update the list of questions model.updateQuestionList(idSet) @@ -85,7 +85,7 @@ fun Play( question: Question?, reponse: String, correction: AnswerType?, - delay: Int + delay: Int, ) { val context = LocalContext.current @@ -94,7 +94,10 @@ fun Play( horizontalAlignment = Alignment.CenterHorizontally ) { if (question == null) { - Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { Text(context.getString(R.string.no_question), fontSize = 30.sp) } } else { @@ -163,7 +166,7 @@ fun SnackbarAnswer( model: PlayViewModel, snackbarHostState: SnackbarHostState, cpt: Int, - correction: AnswerType? + correction: AnswerType?, ) { val context = LocalContext.current if (correction != null) { @@ -178,4 +181,4 @@ fun SnackbarAnswer( model.resetAfterSb() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ModifySetViewModel.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ModifySetViewModel.kt index c9a7c32..8cb86b4 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ModifySetViewModel.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/ModifySetViewModel.kt @@ -67,9 +67,11 @@ class ModifySetViewModel(application: Application) : AndroidViewModel(applicatio fun modifAction() { action.value = ActionModifySet.MODIFICATION } + fun ajoutAction() { action.value = ActionModifySet.AJOUT } + fun supprAction() { action.value = ActionModifySet.SUPPRIMER } diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/PlayViewModel.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/PlayViewModel.kt index 5d2e71f..8c28b9b 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/PlayViewModel.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/PlayViewModel.kt @@ -6,12 +6,12 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.intPreferencesKey import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope +import fr.uparis.diamantkennel.memorisationapplication.DELAY import fr.uparis.diamantkennel.memorisationapplication.MemoApplication import fr.uparis.diamantkennel.memorisationapplication.STATS_TOTAL_BAD import fr.uparis.diamantkennel.memorisationapplication.STATS_TOTAL_DONE import fr.uparis.diamantkennel.memorisationapplication.STATS_TOTAL_GOOD import fr.uparis.diamantkennel.memorisationapplication.STATS_TOTAL_TRIED -import fr.uparis.diamantkennel.memorisationapplication.DELAY import fr.uparis.diamantkennel.memorisationapplication.data.Question import fr.uparis.diamantkennel.memorisationapplication.dataStore import kotlinx.coroutines.Dispatchers @@ -28,7 +28,7 @@ class PlayViewModel(application: Application) : AndroidViewModel(application) { private val statsKeyTotalGood = intPreferencesKey(STATS_TOTAL_GOOD) private val statsKeyTotalBad = intPreferencesKey(STATS_TOTAL_BAD) - private val delayKey= intPreferencesKey(DELAY) + private val delayKey = intPreferencesKey(DELAY) val delay = datastore.data.map { it[delayKey] ?: 5000 } var currentQuestion = mutableStateOf(null) @@ -47,7 +47,9 @@ class PlayViewModel(application: Application) : AndroidViewModel(application) { dao.loadQuestions(setId).collect { questionList -> questions.value = questionList.shuffled() if (questions.value.isNotEmpty()) { - datastore.edit { it[statsKeyTotal] = (it[statsKeyTotal] ?: 0) + 1 } + datastore.edit { + it[statsKeyTotal] = (it[statsKeyTotal] ?: 0) + 1 + } } updateQuestion() } @@ -106,7 +108,8 @@ class PlayViewModel(application: Application) : AndroidViewModel(application) { } fun checkAnswer() { - val probaReponse = calcSimilarite(currentQuestion.value!!.reponse, proposedAnswer.value) + val probaReponse = + calcSimilarite(currentQuestion.value!!.reponse, proposedAnswer.value) if (probaReponse >= .70f) { evaluatedAnswer.value = AnswerType.GOOD } else { @@ -153,4 +156,4 @@ class PlayViewModel(application: Application) : AndroidViewModel(application) { showAnswer.value = true } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/SettingsViewModel.kt b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/SettingsViewModel.kt index aa63325..9eeca7a 100644 --- a/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/SettingsViewModel.kt +++ b/app/src/main/java/fr/uparis/diamantkennel/memorisationapplication/ui/SettingsViewModel.kt @@ -15,9 +15,9 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager +import fr.uparis.diamantkennel.memorisationapplication.DELAY import fr.uparis.diamantkennel.memorisationapplication.HOUR import fr.uparis.diamantkennel.memorisationapplication.MINUTE -import fr.uparis.diamantkennel.memorisationapplication.DELAY import fr.uparis.diamantkennel.memorisationapplication.MemoApplication import fr.uparis.diamantkennel.memorisationapplication.RappelWorker import fr.uparis.diamantkennel.memorisationapplication.STATS_TOTAL_BAD @@ -51,7 +51,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application val statTotalGood = datastore.data.map { it[statsKeyTotalGood] ?: 0 } val statTotalBad = datastore.data.map { it[statsKeyTotalBad] ?: 0 } - var prefConfigTime = datastore.data.map { TimeConfig(it[notifH] ?: 8, it[notifM] ?: 0) } + var prefConfigTime = + datastore.data.map { TimeConfig(it[notifH] ?: 8, it[notifM] ?: 0) } var deletionDB = mutableStateOf(false) var deletionStat = mutableStateOf(false) @@ -159,12 +160,15 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application fun dismissDeletionDB() { deletionDB.value = false } + fun dismissDeletionStat() { deletionStat.value = false } + fun dismissNotif() { notif.value = false } + fun dismissDelayRequest() { delayRequest.value = false }