Show undo snackbars with padding with static bottom toolbar

This specifically fixes the close tab snackbar.  This commit mirrors
the logic when not using Undo from
9e876ebc44.  References #14982.
pull/184/head
Andrew Gaul 4 years ago committed by Sebastian Kaspari
parent 01e802fef0
commit cfbad1dae9

@ -275,6 +275,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
{ {
requireComponents.useCases.tabsUseCases.undo.invoke() requireComponents.useCases.tabsUseCases.undo.invoke()
}, },
paddedForBottomToolbar = true,
operation = { } operation = { }
) )
} }

@ -60,6 +60,7 @@ fun CoroutineScope.allowUndo(
// writing a volatile variable. // writing a volatile variable.
val requestedUndo = AtomicBoolean(false) val requestedUndo = AtomicBoolean(false)
@Suppress("ComplexCondition")
fun showUndoSnackbar() { fun showUndoSnackbar() {
val snackbar = FenixSnackbar val snackbar = FenixSnackbar
.make( .make(
@ -82,6 +83,7 @@ fun CoroutineScope.allowUndo(
val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar
val toolbarHeight = view.resources.getDimensionPixelSize(R.dimen.browser_toolbar_height) val toolbarHeight = view.resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
val dynamicToolbarEnabled = view.context.settings().isDynamicToolbarEnabled
snackbar.view.updatePadding( snackbar.view.updatePadding(
bottom = if ( bottom = if (
@ -92,7 +94,7 @@ fun CoroutineScope.allowUndo(
// can't intelligently position the snackbar on the upper most view. // can't intelligently position the snackbar on the upper most view.
// Ideally we should not pass ContentFrameLayout in, but it's the only // Ideally we should not pass ContentFrameLayout in, but it's the only
// way to display snackbars through a fragment transition. // way to display snackbars through a fragment transition.
view is ContentFrameLayout (view is ContentFrameLayout || !dynamicToolbarEnabled)
) { ) {
toolbarHeight toolbarHeight
} else { } else {

Loading…
Cancel
Save