From df4ecc0137fc369c6c1eabb71505ff21b88ec678 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Thu, 26 May 2022 15:58:35 -0600 Subject: [PATCH] sort: add disc number sorting to other sorts 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. --- app/src/main/java/org/oxycblt/auxio/ui/Sort.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/org/oxycblt/auxio/ui/Sort.kt b/app/src/main/java/org/oxycblt/auxio/ui/Sort.kt index 6fee2dcd1..085d58163 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/Sort.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/Sort.kt @@ -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 })) }