From f8fbcac4826a2ae9f3a262072f762d0f914baff6 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 3 Jul 2023 20:34:25 -0600 Subject: [PATCH] ui: fix queue sheet not being scrollable Fix an issue where the recent BackportBottomSheetBehavior update would break queue sheet scrolling, as the queue sheet would be set to invisible and prevent the findScrollingChild helper from being able to locate it. Fix this by removing that visibility check in the first place. --- CHANGELOG.md | 13 +++++++++++++ .../bottomsheet/BackportBottomSheetBehavior.java | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2063c3684..788f25287 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## dev + +#### What's New +- Menus have been refreshed with a cleaner look + +#### What's Fixed +- Fixed issue where one could not navigate to settings after navigating +elsewhere +- Fixed the queue list being non-scrollable in certain cases + +#### Dev/Meta +- Unified navigation graph + ## 3.1.3 #### What's New diff --git a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java index ab55a48dc..214f6ac62 100644 --- a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java +++ b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java @@ -1671,9 +1671,8 @@ public class BackportBottomSheetBehavior extends CoordinatorLayo @Nullable @VisibleForTesting View findScrollingChild(View view) { - if (view.getVisibility() != View.VISIBLE) { - return null; - } + // MODIFICATION: Remove visibility check that broke nested scrolling in the queue sheet + // due to it being set to invisible when completely hidden if (ViewCompat.isNestedScrollingEnabled(view)) { return view; }