ui: misc bottom sheet changes

Tweak parts of the bottom sheet system for UI consistency.
2022-07-30 09:15:38 -06:00 · 2022-07-30 09:15:38 -06:00 · 7467d89a45
commit 7467d89a45
parent ed2f836280
9 changed files with 39 additions and 33 deletions
--- a/app/src/main/java/com/google/android/material/bottomsheet/NeoBottomSheetBehavior.java
+++ b/app/src/main/java/com/google/android/material/bottomsheet/NeoBottomSheetBehavior.java
@ -506,8 +506,6 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
    }

    if (viewRef == null) {
-
-    Log.d("NeoBottomSheetBehavior", "Lay out time");
      // First layout with this behavior.
      peekHeightMin =
          parent.getResources().getDimensionPixelSize(R.dimen.design_bottom_sheet_peek_height_min);
@ -762,6 +760,7 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
      if (fitToContents) {
        targetState = STATE_EXPANDED;
      } else {
+        // MODIFICATION: Fix nested scrolling with skipping half-expanded state
        int currentTop = child.getTop();
        if (currentTop < halfExpandedOffset) {
          targetState = STATE_EXPANDED;
@ -795,6 +794,7 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
            }
          }
        } else {
+          // MODIFICATION: Fix nested scrolling with skipping half-expanded state
          if (shouldSkipHalfExpandedStateWhenDragging() || Math.abs(currentTop - halfExpandedOffset) >= Math.abs(currentTop - collapsedOffset)) {
            targetState = STATE_COLLAPSED;
          } else {
@ -806,6 +806,7 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
      if (fitToContents) {
        targetState = STATE_COLLAPSED;
      } else {
+        // MODIFICATION: Fix nested scrolling with skipping half-expanded state
        // Settle to nearest height.
        int currentTop = child.getTop();
        if (shouldSkipHalfExpandedStateWhenDragging() || Math.abs(currentTop - halfExpandedOffset) >= Math.abs(currentTop - collapsedOffset)) {
@ -1078,7 +1079,6 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
   */
  public float calculateSlideOffset() {
    if (viewRef == null) {
-      Log.d("NeoBottomSheetBehavior", "No view ref");
      return Float.MIN_VALUE;
    }

@ -1087,8 +1087,6 @@ public class NeoBottomSheetBehavior<V extends View> extends CoordinatorLayout.Be
      return calculateSlideOffset(bottomSheet.getTop());
    }

-    Log.d("NeoBottomSheetBehavior", "No bottom sheet");
-
    return Float.MIN_VALUE;
  }

--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@ -28,7 +28,6 @@ import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.transition.MaterialFadeThrough
-import java.util.*
 import kotlin.math.max
 import kotlin.math.min
 import org.oxycblt.auxio.databinding.FragmentMainBinding
@ -160,7 +159,7 @@ class MainFragment :
        binding.queueFragment.alpha = queueRatio

        playbackSheetBehavior.isDraggable =
-            !playbackSheetBehavior.isHideable &&
+            playbackSheetBehavior.state != BottomSheetBehavior.STATE_HIDDEN &&
                queueSheetBehavior.state == BottomSheetBehavior.STATE_COLLAPSED
    }

@ -227,7 +226,7 @@ class MainFragment :
        val playbackSheetBehavior =
            binding.playbackSheet.coordinatorLayoutBehavior as PlaybackSheetBehavior
        if (song != null) {
-            playbackSheetBehavior.unsideSafe()
+            playbackSheetBehavior.unhideSafe()
        } else {
            playbackSheetBehavior.hideSafe()
        }
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSheetBehavior.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSheetBehavior.kt
@ -26,7 +26,6 @@ import android.view.WindowInsets
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import kotlin.math.max
 import org.oxycblt.auxio.ui.AuxioSheetBehavior
-import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.systemBarInsetsCompat
 import org.oxycblt.auxio.util.systemGestureInsetsCompat

@ -46,7 +45,7 @@ class PlaybackSheetBehavior<V : View>(context: Context, attributeSet: AttributeS
        val success = super.onLayoutChild(parent, child, layoutDirection)

        (child as ViewGroup).apply {
-            setOnApplyWindowInsetsListener { v, insets ->
+            setOnApplyWindowInsetsListener { _, insets ->
                lastInsets = insets
                val bars = insets.systemBarInsetsCompat
                val gestures = insets.systemGestureInsetsCompat
@ -64,9 +63,8 @@ class PlaybackSheetBehavior<V : View>(context: Context, attributeSet: AttributeS
        state = STATE_HIDDEN
    }

-    fun unsideSafe() {
+    fun unhideSafe() {
        isHideable = false
        isDraggable = true
-        logD(state)
    }
 }
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueDragCallback.kt
@ -93,7 +93,6 @@ class QueueDragCallback(private val playbackModel: QueueViewModel) : ItemTouchHe
                .setDuration(100)
                .setUpdateListener {
                    bg.alpha = ((holder.itemView.translationZ / elevation) * 255).toInt()
-                    logD("in ${bg.alpha} ${holder.itemView.translationZ}")
                }
                .setInterpolator(AccelerateDecelerateInterpolator())
                .start()
@ -134,7 +133,6 @@ class QueueDragCallback(private val playbackModel: QueueViewModel) : ItemTouchHe
                .setDuration(100)
                .setUpdateListener {
                    bg.alpha = ((holder.itemView.translationZ / elevation) * 255).toInt()
-                    logD("out ${bg.alpha} ${holder.itemView.translationZ} ${elevation}")
                }
                .setInterpolator(AccelerateDecelerateInterpolator())
                .start()
--- a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentViewBehavior.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetContentViewBehavior.kt
@ -24,10 +24,11 @@ import android.view.WindowInsets
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.android.material.bottomsheet.NeoBottomSheetBehavior
 import kotlin.math.abs
+import org.oxycblt.auxio.util.coordinatorLayoutBehavior
 import org.oxycblt.auxio.util.replaceSystemBarInsetsCompat
 import org.oxycblt.auxio.util.systemBarInsetsCompat

-class BottomSheetContentViewBehavior<V : View>(context: Context, attributeSet: AttributeSet?) :
+class BottomSheetContentBehavior<V : View>(context: Context, attributeSet: AttributeSet?) :
    CoordinatorLayout.Behavior<V>(context, attributeSet) {
    private var lastInsets: WindowInsets? = null
    private var dep: View? = null
@ -55,9 +56,7 @@ class BottomSheetContentViewBehavior<V : View>(context: Context, attributeSet: A
                val dep = dep ?: return@setOnApplyWindowInsetsListener insets

                val bars = insets.systemBarInsetsCompat
-                val behavior =
-                    (dep.layoutParams as CoordinatorLayout.LayoutParams).behavior
-                        as NeoBottomSheetBehavior
+                val behavior = dep.coordinatorLayoutBehavior as NeoBottomSheetBehavior

                val offset = behavior.calculateSlideOffset()
                if (behavior.peekHeight < 0 || offset == Float.MIN_VALUE) {
@ -78,8 +77,7 @@ class BottomSheetContentViewBehavior<V : View>(context: Context, attributeSet: A
    }

    private fun measureContent(parent: View, child: View, dep: View): Boolean {
-        val behavior =
-            (dep.layoutParams as CoordinatorLayout.LayoutParams).behavior as NeoBottomSheetBehavior
+        val behavior = dep.coordinatorLayoutBehavior as NeoBottomSheetBehavior

        val offset = behavior.calculateSlideOffset()
        if (behavior.peekHeight < 0 || offset == Float.MIN_VALUE) {
@ -107,8 +105,7 @@ class BottomSheetContentViewBehavior<V : View>(context: Context, attributeSet: A
    }

    override fun layoutDependsOn(parent: CoordinatorLayout, child: V, dependency: View): Boolean {
-        if ((dependency.layoutParams as CoordinatorLayout.LayoutParams).behavior
-            is NeoBottomSheetBehavior) {
+        if (dependency.coordinatorLayoutBehavior is NeoBottomSheetBehavior) {
            dep = dependency
            return true
        }
@ -121,6 +118,11 @@ class BottomSheetContentViewBehavior<V : View>(context: Context, attributeSet: A
        child: V,
        dependency: View
    ): Boolean {
+        val behavior = dependency.coordinatorLayoutBehavior as NeoBottomSheetBehavior
+        if (behavior.calculateSlideOffset() > 0) {
+            return false
+        }
+
        lastInsets?.let(child::dispatchApplyWindowInsets)
        return measureContent(parent, child, dependency) &&
            onLayoutChild(parent, child, parent.layoutDirection)
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@ -12,7 +12,7 @@
        android:name="androidx.navigation.fragment.NavHostFragment"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentViewBehavior"
+        app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentBehavior"
        app:navGraph="@navigation/nav_explore"
        tools:layout="@layout/fragment_home" />

@ -33,7 +33,7 @@
            android:name="org.oxycblt.auxio.playback.PlaybackPanelFragment"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentViewBehavior" />
+            app:layout_behavior="org.oxycblt.auxio.ui.BottomSheetContentBehavior" />

        <LinearLayout
            android:id="@+id/queue_sheet"
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.oxycblt.auxio.ui.recycler.EdgeRecyclerView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/queue_recycler"
+    android:id="@+id/queue_layout"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:overScrollMode="ifContentScrolls"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-    tools:listitem="@layout/item_queue_song" />
+    android:layout_height="match_parent">
+
+    <org.oxycblt.auxio.ui.recycler.EdgeRecyclerView
+        android:id="@+id/queue_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:overScrollMode="ifContentScrolls"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        tools:listitem="@layout/item_queue_song" />
+
+    <com.google.android.material.divider.MaterialDivider
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
--- a/app/src/main/res/layout/item_queue_song.xml
+++ b/app/src/main/res/layout/item_queue_song.xml
@ -71,7 +71,7 @@
            style="@style/Widget.Auxio.Button.Icon.Small"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_tiny"
+            android:layout_marginEnd="@dimen/spacing_mid_medium"
            android:contentDescription="@string/desc_queue_handle"
            app:icon="@drawable/ic_handle_24"
            app:layout_constraintBottom_toBottomOf="@+id/song_album_cover"
--- a/app/src/main/res/layout/item_sort_header.xml
+++ b/app/src/main/res/layout/item_sort_header.xml
@ -21,7 +21,7 @@
        style="@style/Widget.Auxio.Button.Icon.Small"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_tiny"
+        android:layout_marginEnd="@dimen/spacing_small"
        android:contentDescription="@string/lbl_sort"
        app:icon="@drawable/ic_sort_24"
        app:layout_constraintBottom_toTopOf="@id/header_divider"