From b89499fb369046bb861b2134f73ca0b8c5105039 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Thu, 4 Jul 2024 15:24:27 -0600
Subject: [PATCH] ui: only offset bottom sheet content via insets

---
 .../auxio/ui/BottomSheetContentBehavior.kt     |  6 ++----
 .../res/layout-w600dp-land/fragment_main.xml   | 18 +++++++++++++-----
 app/src/main/res/layout/fragment_main.xml      |  6 +++++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentBehavior.kt b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentBehavior.kt
index 238086454..9b034dfe7 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentBehavior.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentBehavior.kt
@@ -114,7 +114,7 @@ class BottomSheetContentBehavior<V : View>(context: Context, attributeSet: Attri
                 val bars = insets.systemBarInsetsCompat
 
                 insets.replaceSystemBarInsetsCompat(
-                    bars.left, bars.top, bars.right, (bars.bottom - consumed).coerceAtLeast(0))
+                    bars.left, bars.top, bars.right, consumed.coerceAtLeast(bars.bottom))
             }
 
             setup = true
@@ -127,9 +127,7 @@ class BottomSheetContentBehavior<V : View>(context: Context, attributeSet: Attri
         val contentWidthSpec =
             View.MeasureSpec.makeMeasureSpec(parent.measuredWidth, View.MeasureSpec.EXACTLY)
         val contentHeightSpec =
-            View.MeasureSpec.makeMeasureSpec(
-                parent.measuredHeight - consumed, View.MeasureSpec.EXACTLY)
-
+            View.MeasureSpec.makeMeasureSpec(parent.measuredHeight, View.MeasureSpec.EXACTLY)
         child.measure(contentWidthSpec, contentHeightSpec)
     }
 
diff --git a/app/src/main/res/layout-w600dp-land/fragment_main.xml b/app/src/main/res/layout-w600dp-land/fragment_main.xml
index 6c900b3f9..726c9c74a 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_main.xml
+++ b/app/src/main/res/layout-w600dp-land/fragment_main.xml
@@ -17,19 +17,24 @@
         app:navGraph="@navigation/inner"
         tools:layout="@layout/fragment_home" />
 
-    <View android:id="@+id/main_scrim" android:layout_height="match_parent" android:layout_width="match_parent"/>
+    <View
+        android:id="@+id/main_scrim"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <View
         android:id="@+id/main_sheet_scrim"
-        android:background="?attr/colorSurfaceContainerLow"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:alpha="0"
-        android:layout_height="match_parent" />
+        android:background="?attr/colorSurfaceContainerLow" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/playback_sheet"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true"
         app:layout_behavior="org.oxycblt.auxio.playback.PlaybackBottomSheetBehavior">
 
         <androidx.fragment.app.FragmentContainerView
@@ -39,9 +44,9 @@
             android:layout_height="wrap_content" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            style="@style/Widget.Auxio.DisableDropShadows"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-        style="@style/Widget.Auxio.DisableDropShadows"
             android:orientation="horizontal">
 
             <androidx.fragment.app.FragmentContainerView
@@ -82,7 +87,10 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <View android:id="@+id/sheet_scrim" android:layout_height="match_parent" android:layout_width="match_parent"/>
+        <View
+            android:id="@+id/sheet_scrim"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 137612186..ebaa7bc32 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -34,6 +34,8 @@
         android:id="@+id/playback_sheet"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+            android:clickable="true"
+            android:focusable="true"
         app:layout_behavior="org.oxycblt.auxio.playback.PlaybackBottomSheetBehavior">
 
         <androidx.fragment.app.FragmentContainerView
@@ -54,7 +56,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-                android:elevation="1dp"
+            android:elevation="1dp"
+            android:clickable="true"
+            android:focusable="true"
             app:layout_behavior="org.oxycblt.auxio.playback.queue.QueueBottomSheetBehavior">
 
             <androidx.constraintlayout.widget.ConstraintLayout