From f8ec77e13761598635c6b5842dd9d8451c37162c Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Wed, 8 Jan 2025 13:14:53 -0700
Subject: [PATCH] main: fix unusable fast scroll below fab

---
 .../oxycblt/auxio/home/ThemedSpeedDialView.kt   | 17 +++++++++++++++--
 .../main/res/layout-w720dp/fragment_main.xml    |  1 +
 app/src/main/res/layout/fragment_main.xml       |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/home/ThemedSpeedDialView.kt b/app/src/main/java/org/oxycblt/auxio/home/ThemedSpeedDialView.kt
index d111899e1..7f686dec3 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/ThemedSpeedDialView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/ThemedSpeedDialView.kt
@@ -190,6 +190,8 @@ class ThemedSpeedDialView : SpeedDialView {
             val overlayColor = surfaceColor.defaultColor.withModulatedAlpha(0.87f)
             overlayLayout.setBackgroundColor(overlayColor)
         }
+        // Fix default margins added by library
+        (mainFab.layoutParams as LayoutParams).setMargins(0, 0, 0, 0)
     }
 
     private fun Int.withModulatedAlpha(
@@ -230,13 +232,24 @@ class ThemedSpeedDialView : SpeedDialView {
         return super.addActionItem(actionItem, position, animate)?.apply {
             fab.apply {
                 updateLayoutParams<MarginLayoutParams> {
-                    val horizontalMargin = context.getDimenPixels(R.dimen.spacing_mid_large)
-                    setMargins(horizontalMargin, 0, horizontalMargin, 0)
+                    val rightMargin = context.getDimenPixels(R.dimen.spacing_tiny)
+                    if (position == actionItems.lastIndex) {
+                        val bottomMargin = context.getDimenPixels(R.dimen.spacing_small)
+                        setMargins(0, 0, rightMargin, bottomMargin)
+                    } else {
+                        setMargins(0, 0, rightMargin, 0)
+                    }
                 }
                 useCompatPadding = false
             }
 
             labelBackground.apply {
+                updateLayoutParams<MarginLayoutParams> {
+                    if (position == actionItems.lastIndex) {
+                        val bottomMargin = context.getDimenPixels(R.dimen.spacing_small)
+                        setMargins(0, 0, rightMargin, bottomMargin)
+                    }
+                }
                 useCompatPadding = false
                 setContentPadding(spacingSmall, spacingSmall, spacingSmall, spacingSmall)
                 background =
diff --git a/app/src/main/res/layout-w720dp/fragment_main.xml b/app/src/main/res/layout-w720dp/fragment_main.xml
index a364dd452..90feb3b88 100644
--- a/app/src/main/res/layout-w720dp/fragment_main.xml
+++ b/app/src/main/res/layout-w720dp/fragment_main.xml
@@ -28,6 +28,7 @@
             android:layout_gravity="bottom|end"
             android:clipChildren="false"
             android:clipToPadding="false"
+            android:layout_margin="@dimen/spacing_medium"
             app:layout_anchor="@id/home_content">
 
             <org.oxycblt.auxio.home.ThemedSpeedDialView
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 682ce60ae..74a134760 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -33,6 +33,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="bottom|end"
             android:clipChildren="false"
+            android:layout_margin="@dimen/spacing_medium"
             android:clipToPadding="false"
             app:layout_anchor="@id/home_content">
 
@@ -54,7 +55,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|end"
-                android:layout_margin="@dimen/spacing_medium"
                 android:contentDescription="@string/lbl_shuffle"
                 android:src="@drawable/ic_shuffle_off_24" />