From 6daa17efd5cc0e2340bf049cb8af096c1f0dc380 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sun, 5 Dec 2021 14:05:42 +0100 Subject: [PATCH] Show folder header in Artist list --- .../main/kotlin/org/moire/ultrasonic/adapters/ImageHelper.kt | 1 - .../main/kotlin/org/moire/ultrasonic/model/ArtistListModel.kt | 4 ++++ .../kotlin/org/moire/ultrasonic/model/GenericListModel.kt | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ImageHelper.kt diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ImageHelper.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ImageHelper.kt deleted file mode 100644 index 5a3abd0b..00000000 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ImageHelper.kt +++ /dev/null @@ -1 +0,0 @@ -package org.moire.ultrasonic.adapters diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ArtistListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ArtistListModel.kt index 8861a9ef..6c2de732 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ArtistListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ArtistListModel.kt @@ -67,6 +67,10 @@ class ArtistListModel(application: Application) : GenericListModel(application) artists.postValue(result.toMutableList().sortedWith(comparator)) } + override fun showSelectFolderHeader(args: Bundle?): Boolean { + return true + } + companion object { val comparator: Comparator = compareBy(Collator.getInstance()) { t -> t.name } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt index c03880fe..2d4b4aea 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt @@ -41,7 +41,6 @@ open class GenericListModel(application: Application) : val musicFolders: MutableLiveData> = MutableLiveData(listOf()) - @Suppress("UNUSED_PARAMETER") open fun showSelectFolderHeader(args: Bundle?): Boolean { return false }