jonas6482917/Polly
1
0
Fork 0
Code Issues 33 Pull Requests Actions Packages Projects Releases Wiki Activity

update LanguageChip icon, enable default shuffling in ExerciseConfig, and refine onClose navigation in VocabularyExerciseHostScreen

Browse Source
This commit is contained in:
jonasgaudian
2026-02-17 13:30:03 +01:00
parent d249da5f52
commit a0b6509367
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/gaudian/translator/view/exercises/StartExerciseScreen.kt
View File

@@ -406,7 +406,7 @@ fun LanguagePairSection(
availablePairs.forEach { pair -> availablePairs.forEach { pair ->
val isSelected = selectedPairs.contains(pair) val isSelected = selectedPairs.contains(pair)
LanguageChip( LanguageChip(
text = "${pair.first.name} → ${pair.second.name}", text = "${pair.first.name} ⇄ ${pair.second.name}",
isSelected = isSelected, isSelected = isSelected,
modifier = Modifier.widthIn(min = 160.dp), modifier = Modifier.widthIn(min = 160.dp),
onClick = { onClick = {

8
app/src/main/java/eu/gaudian/translator/view/vocabulary/VocabularyExerciseHostScreen.kt
View File

@@ -30,6 +30,7 @@ import eu.gaudian.translator.R
import eu.gaudian.translator.utils.Log import eu.gaudian.translator.utils.Log
import eu.gaudian.translator.utils.findActivity import eu.gaudian.translator.utils.findActivity
import eu.gaudian.translator.view.composable.AppAlertDialog import eu.gaudian.translator.view.composable.AppAlertDialog
import eu.gaudian.translator.view.composable.Screen
import eu.gaudian.translator.viewmodel.ScreenState import eu.gaudian.translator.viewmodel.ScreenState
import eu.gaudian.translator.viewmodel.VocabularyExerciseViewModel import eu.gaudian.translator.viewmodel.VocabularyExerciseViewModel
import eu.gaudian.translator.viewmodel.VocabularyViewModel import eu.gaudian.translator.viewmodel.VocabularyViewModel
@@ -148,7 +149,12 @@ fun VocabularyExerciseHostScreen(
onRetryWrong = { _ -> onRetryWrong = { _ ->
exerciseViewModel.retryWrongAnswers(originalItems) exerciseViewModel.retryWrongAnswers(originalItems)
}, },
onClose = onClose onClose = {
navController.navigate(Screen.Home.route) {
popUpTo(Screen.Home.route) { inclusive = true }
launchSingleTop = true
}
}
) )
} }
} }

4
app/src/main/java/eu/gaudian/translator/viewmodel/VocabularyExerciseViewModel.kt
View File

@@ -31,8 +31,8 @@ enum class ScreenState {
} }
data class ExerciseConfig( data class ExerciseConfig(
val shuffleCards: Boolean = false, val shuffleCards: Boolean = true,
val shuffleLanguages: Boolean = false, val shuffleLanguages: Boolean = true,
val trainingMode: Boolean = false, val trainingMode: Boolean = false,
val dueTodayOnly: Boolean = false, val dueTodayOnly: Boolean = false,
val selectedExerciseTypes: Set<VocabularyExerciseType> = setOf(VocabularyExerciseType.GUESSING), val selectedExerciseTypes: Set<VocabularyExerciseType> = setOf(VocabularyExerciseType.GUESSING),