fix: incorrect albums songs sort (#409

zyrouge · Jan 11, 2024 · fc971c5 · fc971c5
1 parent cf3efad
commit fc971c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/Settings.kt b/app/src/main/java/io/github/zyrouge/symphony/services/Settings.kt
@@ -185,7 +185,8 @@ class SettingsManager(private val symphony: Symphony) {
     val lastUsedPlaylistSongsSortReverse = _lastUsedPlaylistSongsSortReverse.asStateFlow()
     private val _lastUsedAlbumSongsSortBy = MutableStateFlow(getLastUsedAlbumSongsSortBy())
     val lastUsedAlbumSongsSortBy = _lastUsedAlbumSongsSortBy.asStateFlow()
-    private val _lastUsedAlbumSongsSortReverse = MutableStateFlow(getLastUsedAlbumsSortReverse())
+    private val _lastUsedAlbumSongsSortReverse =
+        MutableStateFlow(getLastUsedAlbumSongsSortReverse())
     val lastUsedAlbumSongsSortReverse = _lastUsedAlbumSongsSortReverse.asStateFlow()
     private val _lastUsedTreePathSortBy = MutableStateFlow(getLastUsedTreePathSortBy())
     val lastUsedTreePathSortBy = _lastUsedTreePathSortBy.asStateFlow()

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/SongList.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/SongList.kt
@@ -146,12 +146,10 @@ fun SongListType.getLastUsedSortBy(context: ViewContext) = when (this) {
     SongListType.Playlist -> context.symphony.settings.lastUsedPlaylistSongsSortBy
 }
 
-fun SongListType.setLastUsedSortBy(context: ViewContext, sort: SongSortBy) {
-    when (this) {
-        SongListType.Default -> context.symphony.settings.setLastUsedSongsSortBy(sort)
-        SongListType.Playlist -> context.symphony.settings.setLastUsedPlaylistSongsSortBy(sort)
-        SongListType.Album -> context.symphony.settings.setLastUsedAlbumSongsSortBy(sort)
-    }
+fun SongListType.setLastUsedSortBy(context: ViewContext, sort: SongSortBy) = when (this) {
+    SongListType.Default -> context.symphony.settings.setLastUsedSongsSortBy(sort)
+    SongListType.Playlist -> context.symphony.settings.setLastUsedPlaylistSongsSortBy(sort)
+    SongListType.Album -> context.symphony.settings.setLastUsedAlbumSongsSortBy(sort)
 }
 
 fun SongListType.getLastUsedSortReverse(context: ViewContext) = when (this) {
@@ -160,13 +158,8 @@ fun SongListType.getLastUsedSortReverse(context: ViewContext) = when (this) {
     SongListType.Album -> context.symphony.settings.lastUsedAlbumSongsSortReverse
 }
 
-fun SongListType.setLastUsedSortReverse(context: ViewContext, reverse: Boolean) {
-    when (this) {
-        SongListType.Default -> context.symphony.settings.setLastUsedSongsSortReverse(reverse)
-        SongListType.Playlist -> context.symphony.settings.setLastUsedPlaylistSongsSortReverse(
-            reverse
-        )
-
-        SongListType.Album -> context.symphony.settings.setLastUsedAlbumSongsSortReverse(reverse)
-    }
+fun SongListType.setLastUsedSortReverse(context: ViewContext, reverse: Boolean) = when (this) {
+    SongListType.Default -> context.symphony.settings.setLastUsedSongsSortReverse(reverse)
+    SongListType.Playlist -> context.symphony.settings.setLastUsedPlaylistSongsSortReverse(reverse)
+    SongListType.Album -> context.symphony.settings.setLastUsedAlbumSongsSortReverse(reverse)
 }