From 0602f835dc053c83335ae56171260bb8498e1aed Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Wed, 21 Oct 2026 06:42:12 +0000 Subject: [PATCH] ui: list the default sort mode first --- .../main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt | 5 ++++- .../kotlin/com/subtracks/ui/settings/SettingsScreenTest.kt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt index 1fce06c3..849e436f 100644 --- a/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt @@ -780,6 +780,9 @@ private fun SyncModeDialog( ) } +private val sortNameModeOptions = + listOf(SortNameMode.Name, SortNameMode.SortName, SortNameMode.NonLatin) + private fun sortNameModeLabel( resources: Resources, mode: SortNameMode, @@ -804,7 +807,7 @@ private fun SortNameModeDialog( text = { ChoiceGroup( header = stringResource(R.string.settings_sort_names_prompt), - options = SortNameMode.entries.map { it to sortNameModeLabel(resources, it) }, + options = sortNameModeOptions.map { it to sortNameModeLabel(resources, it) }, selected = draft, onSelect = { draft = it }, ) diff --git a/app/src/test/kotlin/com/subtracks/ui/settings/SettingsScreenTest.kt b/app/src/test/kotlin/com/subtracks/ui/settings/SettingsScreenTest.kt index 0b0ade90..6686964d 100644 --- a/app/src/test/kotlin/com/subtracks/ui/settings/SettingsScreenTest.kt +++ b/app/src/test/kotlin/com/subtracks/ui/settings/SettingsScreenTest.kt @@ -75,11 +75,11 @@ class SettingsScreenTest { ) composeRule.onNodeWithText("Sort names").performClick() - composeRule.onNodeWithText("Use regular names").performClick() + composeRule.onNodeWithText("Use sort names").performClick() composeRule.onNodeWithText("Done").performClick() composeRule.waitForIdle() - assertEquals(SortNameMode.Name, requested) + assertEquals(SortNameMode.SortName, requested) } private fun renderSettings(