mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-11 15:29:15 +01:00
ui: default to regular names when sorting
This commit is contained in:
@@ -186,7 +186,7 @@ class UserPreferences(
|
|||||||
|
|
||||||
fun sortNameMode(): Flow<SortNameMode> =
|
fun sortNameMode(): Flow<SortNameMode> =
|
||||||
store.data.map { prefs ->
|
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) {
|
suspend fun setSortNameMode(mode: SortNameMode) {
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ fun SettingsScreen(
|
|||||||
syncInterval: Int = DEFAULT_SYNC_INTERVAL_MINUTES,
|
syncInterval: Int = DEFAULT_SYNC_INTERVAL_MINUTES,
|
||||||
replayGainMode: ReplayGainMode = ReplayGainMode.Auto,
|
replayGainMode: ReplayGainMode = ReplayGainMode.Auto,
|
||||||
replayGainPreamp: Float = 0f,
|
replayGainPreamp: Float = 0f,
|
||||||
sortNameMode: SortNameMode = SortNameMode.SortName,
|
sortNameMode: SortNameMode = SortNameMode.Name,
|
||||||
onSelectSource: (Long) -> Unit,
|
onSelectSource: (Long) -> Unit,
|
||||||
onEditServer: (Long) -> Unit,
|
onEditServer: (Long) -> Unit,
|
||||||
onWifiQualityChange: (StreamQuality) -> Unit,
|
onWifiQualityChange: (StreamQuality) -> Unit,
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class SettingsViewModel(
|
|||||||
val sortNameMode: StateFlow<SortNameMode> =
|
val sortNameMode: StateFlow<SortNameMode> =
|
||||||
userPreferences
|
userPreferences
|
||||||
.sortNameMode()
|
.sortNameMode()
|
||||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), SortNameMode.SortName)
|
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), SortNameMode.Name)
|
||||||
|
|
||||||
val keepScreenOn: StateFlow<Boolean> =
|
val keepScreenOn: StateFlow<Boolean> =
|
||||||
userPreferences
|
userPreferences
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class UserPreferencesTest {
|
|||||||
val store = PreferenceDataStoreFactory.create(scope = backgroundScope) { file }
|
val store = PreferenceDataStoreFactory.create(scope = backgroundScope) { file }
|
||||||
val prefs = UserPreferences(store)
|
val prefs = UserPreferences(store)
|
||||||
|
|
||||||
assertEquals(SortNameMode.SortName, prefs.sortNameMode().first())
|
assertEquals(SortNameMode.Name, prefs.sortNameMode().first())
|
||||||
|
|
||||||
prefs.setSortNameMode(SortNameMode.NonLatin)
|
prefs.setSortNameMode(SortNameMode.NonLatin)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user