diff --git a/app/src/main/kotlin/com/subtracks/data/prefs/UserPreferences.kt b/app/src/main/kotlin/com/subtracks/data/prefs/UserPreferences.kt index 948af078..8840ab5c 100644 --- a/app/src/main/kotlin/com/subtracks/data/prefs/UserPreferences.kt +++ b/app/src/main/kotlin/com/subtracks/data/prefs/UserPreferences.kt @@ -186,7 +186,7 @@ class UserPreferences( fun sortNameMode(): Flow = store.data.map { prefs -> - prefs[sortNameModeKey]?.let { stored -> SortNameMode.entries.firstOrNull { it.name == stored } } ?: SortNameMode.SortName + prefs[sortNameModeKey]?.let { stored -> SortNameMode.entries.firstOrNull { it.name == stored } } ?: SortNameMode.Name } suspend fun setSortNameMode(mode: SortNameMode) { 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 1f404734..1fce06c3 100644 --- a/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/settings/SettingsScreen.kt @@ -210,7 +210,7 @@ fun SettingsScreen( syncInterval: Int = DEFAULT_SYNC_INTERVAL_MINUTES, replayGainMode: ReplayGainMode = ReplayGainMode.Auto, replayGainPreamp: Float = 0f, - sortNameMode: SortNameMode = SortNameMode.SortName, + sortNameMode: SortNameMode = SortNameMode.Name, onSelectSource: (Long) -> Unit, onEditServer: (Long) -> Unit, onWifiQualityChange: (StreamQuality) -> Unit, diff --git a/app/src/main/kotlin/com/subtracks/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/subtracks/ui/settings/SettingsViewModel.kt index ab0e28c2..f37a23ee 100644 --- a/app/src/main/kotlin/com/subtracks/ui/settings/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/subtracks/ui/settings/SettingsViewModel.kt @@ -80,7 +80,7 @@ class SettingsViewModel( val sortNameMode: StateFlow = userPreferences .sortNameMode() - .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), SortNameMode.SortName) + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), SortNameMode.Name) val keepScreenOn: StateFlow = userPreferences diff --git a/app/src/test/kotlin/com/subtracks/data/prefs/UserPreferencesTest.kt b/app/src/test/kotlin/com/subtracks/data/prefs/UserPreferencesTest.kt index 1fd8352b..5495f695 100644 --- a/app/src/test/kotlin/com/subtracks/data/prefs/UserPreferencesTest.kt +++ b/app/src/test/kotlin/com/subtracks/data/prefs/UserPreferencesTest.kt @@ -58,7 +58,7 @@ class UserPreferencesTest { val store = PreferenceDataStoreFactory.create(scope = backgroundScope) { file } val prefs = UserPreferences(store) - assertEquals(SortNameMode.SortName, prefs.sortNameMode().first()) + assertEquals(SortNameMode.Name, prefs.sortNameMode().first()) prefs.setSortNameMode(SortNameMode.NonLatin)