From 9f7a0127064189e77ff1da4cdb8bea12427a8ebe Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Fri, 2 Sep 2022 21:43:39 -0600
Subject: [PATCH] queue: remove fast scroller

Temporarily remove the fast scroller for now, as I want to bundle it
with adding a scroller to the detail view in a single release.
---
 CHANGELOG.md                                           |  1 -
 .../main/java/org/oxycblt/auxio/image/ImageGroup.kt    | 10 ++++------
 app/src/main/res/layout/fragment_queue.xml             |  2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef1c85f38..e2483c375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@
     - Search and library now show playing indicators
     - Playing indicators are now animated when playback is ongoing
 - Added smooth seeking
-- Queue now has a fast scroller
 
 #### What's Fixed
 - Fixed issue where fast scroller popup would not appear
diff --git a/app/src/main/java/org/oxycblt/auxio/image/ImageGroup.kt b/app/src/main/java/org/oxycblt/auxio/image/ImageGroup.kt
index 01f9f2a66..07313b57d 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/ImageGroup.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ImageGroup.kt
@@ -96,7 +96,10 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
         invalidateIndicator()
     }
 
-    fun updateIndicator(isActive: Boolean, isPlaying: Boolean) {}
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        invalidateIndicator()
+    }
 
     var isPlaying: Boolean
         get() = indicator.isPlaying
@@ -104,11 +107,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
             indicator.isPlaying = value
         }
 
-    override fun setEnabled(enabled: Boolean) {
-        super.setEnabled(enabled)
-        invalidateIndicator()
-    }
-
     private fun invalidateIndicator() {
         if (isActivated) {
             alpha = 1f
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index 73c898f2b..6178934a0 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.oxycblt.auxio.ui.fastscroll.FastScrollRecyclerView
+    <org.oxycblt.auxio.ui.recycler.AuxioRecyclerView
         android:id="@+id/queue_recycler"
         style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"