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

sort: add disc number sorting to other sorts

Browse source 
Add disc number sorting to sorts that originally sorted by track.

Forgot to add disc sorting to the other sort modes when adding disc
number support. Fix that.
This commit is contained in:
OxygenCobalt 2022-05-26 15:58:35 -06:00
parent c0da3673c2
commit df4ecc0137
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/oxycblt/auxio/ui/Sort.kt
View file

@ -134,6 +134,7 @@ sealed class Sort(open val isAscending: Boolean) {
songs.sortWith(
MultiComparator(
compareByDynamic(NameComparator()) { it.album },
compareBy(NullableComparator()) { it.disc },
compareBy(NullableComparator()) { it.track },
compareBy(NameComparator()) { it }))
}
@ -155,6 +156,7 @@ sealed class Sort(open val isAscending: Boolean) {
compareByDynamic(NameComparator()) { it.album.artist },
compareByDescending(NullableComparator()) { it.album.year },
compareByDescending(NameComparator()) { it.album },
compareBy(NullableComparator()) { it.disc },
compareBy(NullableComparator()) { it.track },
compareBy(NameComparator()) { it }))
}
@ -183,6 +185,7 @@ sealed class Sort(open val isAscending: Boolean) {
MultiComparator(
compareByDynamic(NullableComparator()) { it.album.year },
compareByDescending(NameComparator()) { it.album },
compareBy(NullableComparator()) { it.disc },
compareBy(NullableComparator()) { it.track },
compareBy(NameComparator()) { it }))
}