Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

list: fix sort regressions

Browse source
This commit is contained in:
Alexander Capehart 2024-07-03 20:41:47 -06:00
parent 4c92ac0f85
commit c761544eb7
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt
View file

@ -195,10 +195,10 @@ data class Sort(val mode: Mode, val direction: Direction) {
override val stringRes = R.string.lbl_artist override val stringRes = R.string.lbl_artist
override fun sortSongs(songs: MutableList<Song>, direction: Direction) { override fun sortSongs(songs: MutableList<Song>, direction: Direction) {
songs.sortByDescending { it.album.dates }
songs.sortByDescending { it.album.name }
songs.sortBy { it.disc }
songs.sortBy { it.track } songs.sortBy { it.track }
songs.sortBy { it.disc }
songs.sortBy { it.album.name }
songs.sortByDescending { it.album.dates }
when (direction) { when (direction) {
Direction.ASCENDING -> songs.sortBy { it.artists.firstOrNull()?.name } Direction.ASCENDING -> songs.sortBy { it.artists.firstOrNull()?.name }
Direction.DESCENDING -> Direction.DESCENDING ->
@ -221,9 +221,9 @@ data class Sort(val mode: Mode, val direction: Direction) {
override val stringRes = R.string.lbl_date override val stringRes = R.string.lbl_date
override fun sortSongs(songs: MutableList<Song>, direction: Direction) { override fun sortSongs(songs: MutableList<Song>, direction: Direction) {
songs.sortByDescending { it.album.name }
songs.sortBy { it.disc }
songs.sortBy { it.track } songs.sortBy { it.track }
songs.sortBy { it.disc }
songs.sortByDescending { it.album.name }
when (direction) { when (direction) {
Direction.ASCENDING -> songs.sortBy { it.album.dates } Direction.ASCENDING -> songs.sortBy { it.album.dates }
Direction.DESCENDING -> songs.sortByDescending { it.album.dates } Direction.DESCENDING -> songs.sortByDescending { it.album.dates }
@ -316,8 +316,8 @@ data class Sort(val mode: Mode, val direction: Direction) {
override val stringRes = R.string.lbl_disc override val stringRes = R.string.lbl_disc
override fun sortSongs(songs: MutableList<Song>, direction: Direction) { override fun sortSongs(songs: MutableList<Song>, direction: Direction) {
songs.sortBy { it.track }
songs.sortBy { it.name } songs.sortBy { it.name }
songs.sortBy { it.track }
when (direction) { when (direction) {
Direction.ASCENDING -> songs.sortBy { it.disc } Direction.ASCENDING -> songs.sortBy { it.disc }
Direction.DESCENDING -> songs.sortByDescending { it.disc } Direction.DESCENDING -> songs.sortByDescending { it.disc }