From 7be208d630395457d3e66a362f03918ce998fe55 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 31 Mar 2021 16:37:55 -0400 Subject: [PATCH] Fix padding for exts/migration sheet --- .../kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt | 8 +++++--- .../tachiyomi/ui/extension/RecyclerWithScrollerView.kt | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt index 444eefa2fd..bd8669c232 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt @@ -31,6 +31,7 @@ import eu.kanade.tachiyomi.util.view.collapse import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsets import eu.kanade.tachiyomi.util.view.expand import eu.kanade.tachiyomi.util.view.isExpanded +import eu.kanade.tachiyomi.util.view.updatePaddingRelative import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get @@ -91,8 +92,8 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At this.controller = controller binding.pager.doOnApplyWindowInsets { _, _, _ -> val bottomBar = controller.activityBinding?.bottomNav - // extRecyler?.updatePaddingRelative(bottom = bottomBar?.height ?: 0) - // migRecyler?.updatePaddingRelative(bottom = bottomBar?.height ?: 0) + extensionFrameLayout?.binding?.recycler?.updatePaddingRelative(bottom = bottomBar?.height ?: 0) + migrationFrameLayout?.binding?.recycler?.updatePaddingRelative(bottom = bottomBar?.height ?: 0) } binding.tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { override fun onTabSelected(tab: TabLayout.Tab?) { @@ -322,7 +323,8 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At override fun createView(container: ViewGroup): View { val binding = RecyclerWithScrollerBinding.inflate(LayoutInflater.from(container.context), container, false) val view: RecyclerWithScrollerView = binding.root - view.setUp(this@ExtensionBottomSheet, binding) + view.setUp(this@ExtensionBottomSheet, binding, this@ExtensionBottomSheet.controller.activityBinding?.bottomNav?.height ?: 0) + return view } 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 54de439a7e..a2838c381e 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 @@ -6,15 +6,17 @@ import android.widget.FrameLayout import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.databinding.RecyclerWithScrollerBinding +import eu.kanade.tachiyomi.util.view.updatePaddingRelative class RecyclerWithScrollerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { var binding: RecyclerWithScrollerBinding? = null - fun setUp(sheet: ExtensionBottomSheet, binding: RecyclerWithScrollerBinding) { + fun setUp(sheet: ExtensionBottomSheet, binding: RecyclerWithScrollerBinding, height: Int) { binding.recycler.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context) binding.recycler.setHasFixedSize(true) binding.recycler.addItemDecoration(ExtensionDividerItemDecoration(context)) + binding.recycler.updatePaddingRelative(bottom = height) this.binding = binding }