From 3e7ad9dbd3c2745402d63e74aed8466abecb1491 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 9 Apr 2021 12:08:24 -0400 Subject: [PATCH] Fixed ext bottom sheet not being able to drag in some casesq case being: 1. open sheet 2. scroll down 3. press back (collapses sheet) 4. push new screen 5. go back --- .../tachiyomi/ui/extension/RecyclerWithScrollerView.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt index 8fbc216304..b75cd5d178 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.databinding.RecyclerWithScrollerBinding +import eu.kanade.tachiyomi.util.view.isExpanded import eu.kanade.tachiyomi.util.view.updatePaddingRelative class RecyclerWithScrollerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : @@ -28,7 +29,10 @@ class RecyclerWithScrollerView @JvmOverloads constructor(context: Context, attrs override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) - if (sheet.isOnView(this@RecyclerWithScrollerView) && recyclerView.canScrollVertically(-1)) { + if (sheet.isOnView(this@RecyclerWithScrollerView) && + sheet.sheetBehavior.isExpanded() && + recyclerView.canScrollVertically(-1) + ) { sheet.sheetBehavior?.isDraggable = false } }