From 0042f42ced2320f599c451700c609b1e46858ba2 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Tue, 20 Jun 2023 21:49:57 -0600
Subject: [PATCH] playback: fix queue sheet scroll behavior

Fix an issue where an upwards nested scroll past the top of the queue
list would not actually collapse the sheet.

This was apparently caused by something introduced in recyclerview
1.3.0-alpha01. No idea why. Roll back to the working version.
---
 CHANGELOG.md     |  5 +++++
 app/build.gradle | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9b79c7e4..15003e252 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 #### What's New
 - Updated to Android 14
+- Added option to re-enable old album cover cropping behavior
+
+#### What's Fixed
+- Fixed an issue where the queue sheet would not collapse when scrolling
+the song list in some cases
 
 ## 3.1.2
 
diff --git a/app/build.gradle b/app/build.gradle
index 9d30bb38c..ff160bdd6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ android {
         versionName "3.1.2"
         versionCode 32
 
-        minSdk 24
+        minSdk 21
         targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -80,6 +80,7 @@ dependencies {
     def coroutines_version = '1.7.1'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
 
     // --- SUPPORT ---
 
@@ -89,11 +90,14 @@ dependencies {
     implementation "androidx.activity:activity-ktx:1.7.2"
     implementation "androidx.fragment:fragment-ktx:1.6.0"
 
-    // UI
-    implementation "androidx.recyclerview:recyclerview:1.3.0"
+    // Components
+    // Deliberately kept on 1.2.1 to prevent a bug where the queue sheet will not collapse on
+    // certain upwards scrolling events
+    // TODO: Report this issue and hope for a timely fix
+    // noinspection GradleDependency
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
 
     // Lifecycle
     def lifecycle_version = "2.6.1"
@@ -128,8 +132,6 @@ dependencies {
     implementation 'io.coil-kt:coil-base:2.4.0'
 
     // Material
-    // TODO: Stuck on 1.8.0-alpha01 until ripple bug with tab layout is actually available
-    //  in a version that I can build with
     // TODO: Exactly figure out the conditions that the 1.7.0 ripple bug occurred so you can just
     //  PR a fix.
     implementation "com.google.android.material:material:1.10.0-alpha04"