Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix liked songs order by date created or released order showing all library #64

Merged
merged 1 commit into from
Oct 13, 2024
Merged

fix liked songs order by date created or released order showing all library #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/com/dd3boh/outertune/db/DatabaseDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down