From 84e7c33cb34a7f2238d1625dace46641a3e6c4bc Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 26 Mar 2021 15:32:19 -0400 Subject: [PATCH] Category hopper now follows same snap distance as bottom nav Also fixed hopper not scrolling away when bottom nav is locked --- .../tachiyomi/ui/library/LibraryController.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index c0667f0e1d..a6c0db2747 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -222,6 +222,9 @@ class LibraryController( hopperOffset += dy hopperOffset = hopperOffset.coerceIn(0f, 55f.dpToPx) } + if (!preferences.hideBottomNavOnScroll().get()) { + updateFilterSheetY() + } up_category.alpha = if (isAtTop()) 0.25f else 1f down_category.alpha = if (isAtBottom()) 0.25f else 1f } @@ -291,12 +294,18 @@ class LibraryController( } } - fun updateHopperPosition(show: Boolean = false) { + fun updateHopperPosition() { val shortAnimationDuration = resources?.getInteger( android.R.integer.config_shortAnimTime ) ?: 0 if (preferences.autohideHopper().get()) { - val end = if (!show && hopperOffset > 25f.dpToPx) 55f.dpToPx else 0f + // Flow same snap rules as bottom nav + val closerToHopperBottom = hopperOffset > 25f.dpToPx + val halfWayBottom = activity!!.bottom_nav.height.toFloat() / 2 + val closerToBottom = activity!!.bottom_nav.translationY > halfWayBottom + val atTop = !recycler.canScrollVertically(-1) + val closerToEdge = if (preferences.hideBottomNavOnScroll().get()) (closerToBottom && !atTop) else closerToHopperBottom + val end = if (closerToEdge) 55f.dpToPx else 0f val alphaAnimation = ValueAnimator.ofFloat(hopperOffset, end) alphaAnimation.addUpdateListener { valueAnimator -> hopperOffset = valueAnimator.animatedValue as Float