From f0fb7b3d4976607f03dd46591476c048803c1cbd Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 31 Mar 2021 14:06:15 -0400 Subject: [PATCH] Fix downloads scroll issue at the bottom Fixes #696 --- .../eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt | 2 -- .../eu/kanade/tachiyomi/ui/recents/RecentsController.kt | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt index 7599d9438d..69c192424f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt @@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.databinding.DownloadBottomSheetBinding import eu.kanade.tachiyomi.ui.extension.ExtensionDividerItemDecoration import eu.kanade.tachiyomi.ui.recents.RecentsController -import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener import eu.kanade.tachiyomi.util.view.collapse import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsets import eu.kanade.tachiyomi.util.view.expand @@ -64,7 +63,6 @@ class DownloadBottomSheet @JvmOverloads constructor( adapter?.fastScroller = binding.fastScroller binding.dlRecycler.setHasFixedSize(true) binding.dlRecycler.addItemDecoration(ExtensionDividerItemDecoration(context)) - binding.dlRecycler.setOnApplyWindowInsetsListener(RecyclerWindowInsetsListener) this.controller = controller updateDLTitle() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index 89bfec5482..5c0f3b1c86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -124,12 +124,18 @@ class RecentsController(bundle: Bundle? = null) : afterInsets = { headerHeight = it.systemWindowInsetTop + appBarHeight binding.recycler.updatePaddingRelative(bottom = activityBinding?.bottomNav?.height ?: 0) + binding.downloadBottomSheet.dlRecycler.updatePaddingRelative(bottom = activityBinding?.bottomNav?.height ?: 0) }, onBottomNavUpdate = { setBottomPadding() } ) + activityBinding?.bottomNav?.post { + binding.recycler.updatePaddingRelative(bottom = activityBinding?.bottomNav?.height ?: 0) + binding.downloadBottomSheet.dlRecycler.updatePaddingRelative(bottom = activityBinding?.bottomNav?.height ?: 0) + } + presenter.onCreate() if (presenter.recentItems.isNotEmpty()) { adapter.updateDataSet(presenter.recentItems)