Fixed fake bottom bar showing up too tall when moving to new controller while library filter sheet is expanded

This commit is contained in:
Jays2Kings 2021-10-07 16:28:57 -04:00
parent 2b014931c4
commit ae278f3da2

View file

@ -36,6 +36,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.MainActivityBinding
import eu.kanade.tachiyomi.ui.base.controller.BaseController
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.base.controller.OneWayFadeChangeHandler
import eu.kanade.tachiyomi.ui.main.BottomSheetController
import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface
@ -322,14 +323,16 @@ fun Controller.scrollViewWith(
v.layoutParams = params
onLeavingController?.invoke()
}
if (!customPadding && router.backstackSize == 2 && changeType == ControllerChangeType.PUSH_EXIT) {
if (!customPadding && router.backstackSize == 2 && changeType == ControllerChangeType.PUSH_EXIT &&
router.backstack.lastOrNull()?.controller !is DialogController
) {
val parent = recycler.parent as? ViewGroup ?: return
val bottomNav = activityBinding?.bottomNav ?: return
val v = View(activity)
fakeBottomNavView = v
parent.addView(v, parent.indexOfChild(recycler) + 1)
parent.addView(v)
val params = fakeBottomNavView?.layoutParams
params?.height = recycler.paddingBottom
params?.height = bottomNav.height
(params as? FrameLayout.LayoutParams)?.gravity = Gravity.BOTTOM
fakeBottomNavView?.translationY = bottomNav.translationY
params?.width = MATCH_PARENT