From c27bb0d73feb28d7aada1ba3d446b1b599d40ad6 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 8 May 2022 02:30:22 -0400 Subject: [PATCH] Fix library searchbar moving up when tapped with collapsed toolbar on --- .../java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt | 1 + .../java/eu/kanade/tachiyomi/ui/library/LibraryController.kt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt index af049599c5..cde7f94c94 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt @@ -88,6 +88,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att /** A value used to determine the offset needed for a appbar's y to show only the smaller toolbar */ val yNeededForSmallToolbar: Int get() { + if (toolbarMode != ToolbarState.EXPANDED) return 0 val tabHeight = if (tabsFrameLayout?.isVisible == true) 48.dpToPx else 0 return -preLayoutHeight + (mainToolbar?.height ?: 0) + tabHeight } 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 ed327323f0..aca852a0b6 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 @@ -1735,10 +1735,6 @@ class LibraryController( !singleCategory && presenter.showAllCategories ) { showCategories(true) - binding.libraryGridRecycler.recycler.post { - activityBinding?.appBar?.y = (activityBinding?.appBar?.yNeededForSmallToolbar ?: 0).toFloat() - activityBinding?.appBar?.updateAppBarAfterY(binding.libraryGridRecycler.recycler) - } } }