Merge pull request #64 from mattcarter11/fix-song-sort-order

fix liked songs order by date created or released order showing all library
DD3Boh · Oct 13, 2024 · 46c8912 · 46c8912
2 parents e29e55a + 70cc1c3
commit 46c8912
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/db/DatabaseDao.kt b/app/src/main/java/com/dd3boh/outertune/db/DatabaseDao.kt
@@ -134,11 +134,11 @@ interface DatabaseDao {
     fun likedSongsByCreateDateAsc(): Flow<List<Song>>
 
     @Transaction
-    @Query("SELECT * FROM song WHERE liked IS NOT NULL ORDER BY date")
+    @Query("SELECT * FROM song WHERE liked ORDER BY date")
     fun likedSongsByReleaseDateAsc(): Flow<List<Song>>
 
     @Transaction
-    @Query("SELECT * FROM song WHERE liked IS NOT NULL ORDER BY dateModified")
+    @Query("SELECT * FROM song WHERE liked ORDER BY dateModified")
     fun likedSongsByDateModifiedAsc(): Flow<List<Song>>
 
     @Transaction
@@ -164,9 +164,9 @@ interface DatabaseDao {
     fun likedSongs(sortType: SongSortType, descending: Boolean) =
         when (sortType) {
             SongSortType.CREATE_DATE -> likedSongsByCreateDateAsc()
-            SongSortType.MODIFIED_DATE -> songsByDateModifiedAsc()
+            SongSortType.MODIFIED_DATE -> likedSongsByDateModifiedAsc()
             SongSortType.RELEASE_DATE -> {
-                val songs = songsByReleaseDateAsc()
+                val songs = likedSongsByReleaseDateAsc()
                 runBlocking {
                     flowOf(songs.first().sortedBy {
                         it.song.getDateLong()