Bug 1879370 - Add a ClippingBehavior supporting multiple toolbars

fenix/.buildconfig.yml

@@ -83,6 +83,7 @@ projects:
     - support-rusthttp
     - support-rustlog
     - support-test
+    - support-test-fakes
     - support-test-libstate
     - support-utils
     - support-webextensions

fenix/app/build.gradle

@@ -621,6 +621,7 @@ dependencies {
     implementation project(':lib-push-firebase')
     implementation project(':lib-state')
     implementation project(':lib-dataprotect')
+    testImplementation project(':support-test-fakes')
 
     debugImplementation ComponentsDependencies.leakcanary
     debugImplementation ComponentsDependencies.androidx_compose_ui_tooling

fenix/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt

@@ -108,7 +108,7 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User
                             tryAgain = downloadsFeature.get()!!::tryAgain,
                             onCannotOpenFile = onCannotOpenFile,
                             binding = getDownloadDialogLayoutBinding(),
-                            toolbarHeight = 0,
+                            bottomToolbarHeight = 0,
                         ) {}.show()
                     },
                 )

fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -113,7 +113,6 @@ import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlin.getOrigin
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.locale.ActivityContextWrapper
-import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
 import mozilla.components.ui.widgets.withCenterAlignedButtons
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FeatureFlags
@@ -141,10 +140,13 @@ import org.mozilla.fenix.components.toolbar.IncompleteRedesignToolbarFeature
 import org.mozilla.fenix.components.toolbar.ToolbarIntegration
 import org.mozilla.fenix.components.toolbar.ToolbarMenu
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
+import org.mozilla.fenix.components.toolbar.getBottomToolbarHeight
+import org.mozilla.fenix.components.toolbar.getTopToolbarHeight
 import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
 import org.mozilla.fenix.components.toolbar.navbar.BottomToolbarContainerView
 import org.mozilla.fenix.components.toolbar.navbar.BrowserNavBar
+import org.mozilla.fenix.components.toolbar.navbar.EngineViewClippingBehavior
 import org.mozilla.fenix.components.toolbar.navbar.NavbarIntegration
 import org.mozilla.fenix.compose.Divider
 import org.mozilla.fenix.crashes.CrashContentIntegration
@@ -181,7 +183,6 @@ import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
 import java.lang.ref.WeakReference
 import kotlin.coroutines.cancellation.CancellationException
-import mozilla.components.ui.widgets.behavior.ToolbarPosition as MozacToolbarPosition
 
 /**
  * Base fragment extended by [BrowserFragment].
@@ -363,8 +364,6 @@ abstract class BaseBrowserFragment :
         val store = context.components.core.store
         val activity = requireActivity() as HomeActivity
 
-        val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
-
         browserAnimator = BrowserAnimator(
             fragment = WeakReference(this),
             engineView = WeakReference(binding.engineView),
@@ -476,9 +475,12 @@ abstract class BaseBrowserFragment :
                 )
             }
 
+            val shouldHideOnScroll =
+                !context.settings().shouldUseFixedTopToolbar && context.settings().isDynamicToolbarEnabled
             _bottomToolbarContainerView = BottomToolbarContainerView(
                 context = context,
                 parent = binding.browserLayout,
+                hideOnScroll = shouldHideOnScroll,
                 composableContent = {
                     FirefoxTheme {
                         Column {
@@ -698,6 +700,8 @@ abstract class BaseBrowserFragment :
             },
         )
 
+        val bottomToolbarHeight = context.getBottomToolbarHeight()
+
         downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus ->
             val onCannotOpenFile: (DownloadState) -> Unit = {
                 FenixSnackbar.make(
@@ -732,7 +736,7 @@ abstract class BaseBrowserFragment :
                         tryAgain = downloadFeature::tryAgain,
                         onCannotOpenFile = onCannotOpenFile,
                         binding = binding.viewDynamicDownloadDialog,
-                        toolbarHeight = toolbarHeight,
+                        bottomToolbarHeight = bottomToolbarHeight,
                     ) {
                         sharedViewModel.downloadDialogState.remove(downloadState.sessionId)
                     }.show()
@@ -745,7 +749,7 @@ abstract class BaseBrowserFragment :
             getCurrentTab()?.id,
             store,
             context,
-            toolbarHeight,
+            bottomToolbarHeight,
         )
 
         shareDownloadsFeature.set(
@@ -1078,7 +1082,11 @@ abstract class BaseBrowserFragment :
             owner = this,
             view = view,
         )
-        initializeEngineView(toolbarHeight)
+
+        initializeEngineView(
+            topToolbarHeight = context.getTopToolbarHeight(),
+            bottomToolbarHeight = bottomToolbarHeight,
+        )
     }
 
     protected fun showUndoSnackbar(message: String) {
@@ -1214,7 +1222,7 @@ abstract class BaseBrowserFragment :
         sessionId: String?,
         store: BrowserStore,
         context: Context,
-        toolbarHeight: Int,
+        bottomToolbarHeight: Int,
     ) {
         val savedDownloadState =
             sharedViewModel.downloadDialogState[sessionId]
@@ -1252,7 +1260,7 @@ abstract class BaseBrowserFragment :
                     .show()
             },
             binding = binding.viewDynamicDownloadDialog,
-            toolbarHeight = toolbarHeight,
+            bottomToolbarHeight = bottomToolbarHeight,
             onDismiss = onDismiss,
         ).show()
 
@@ -1267,36 +1275,31 @@ abstract class BaseBrowserFragment :
     }
 
     @VisibleForTesting
-    internal fun initializeEngineView(toolbarHeight: Int) {
+    internal fun initializeEngineView(
+        topToolbarHeight: Int,
+        bottomToolbarHeight: Int,
+    ) {
         val context = requireContext()
 
         if (!context.settings().shouldUseFixedTopToolbar && context.settings().isDynamicToolbarEnabled) {
-            getEngineView().setDynamicToolbarMaxHeight(toolbarHeight)
+            getEngineView().setDynamicToolbarMaxHeight(topToolbarHeight + bottomToolbarHeight)
 
-            val toolbarPosition = when (context.settings().toolbarPosition) {
-                ToolbarPosition.BOTTOM -> MozacToolbarPosition.BOTTOM
-                ToolbarPosition.TOP -> MozacToolbarPosition.TOP
-            }
             (getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams).behavior =
                 EngineViewClippingBehavior(
-                    context,
-                    null,
-                    getSwipeRefreshLayout(),
-                    toolbarHeight,
-                    toolbarPosition,
+                    context = context,
+                    attrs = null,
+                    engineViewParent = getSwipeRefreshLayout(),
+                    topToolbarHeight = topToolbarHeight,
+                    hasTopToolbar = !requireComponents.settings.shouldUseBottomToolbar,
                 )
         } else {
             // Ensure webpage's bottom elements are aligned to the very bottom of the engineView.
             getEngineView().setDynamicToolbarMaxHeight(0)
 
-            // Effectively place the engineView on top/below of the toolbar if that is not dynamic.
-            val swipeRefreshParams =
-                getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams
-            if (context.settings().toolbarPosition == ToolbarPosition.TOP) {
-                swipeRefreshParams.topMargin = toolbarHeight
-            } else {
-                swipeRefreshParams.bottomMargin = toolbarHeight
-            }
+            // Effectively place the engineView on top/below of the toolbars if that is not dynamic.
+            val swipeRefreshParams = getSwipeRefreshLayout().layoutParams as CoordinatorLayout.LayoutParams
+            swipeRefreshParams.topMargin = topToolbarHeight
+            swipeRefreshParams.bottomMargin = bottomToolbarHeight
         }
     }
 
@@ -1374,9 +1377,9 @@ abstract class BaseBrowserFragment :
                 fullScreenChanged(false)
                 browserToolbarView.expand()
 
-                val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
                 val context = requireContext()
-                resumeDownloadDialogState(selectedTab.id, context.components.core.store, context, toolbarHeight)
+                val bottomToolbarHeight = context.getBottomToolbarHeight()
+                resumeDownloadDialogState(selectedTab.id, context.components.core.store, context, bottomToolbarHeight)
                 it.announceForAccessibility(selectedTab.toDisplayTitle())
             }
         } else {
@@ -1699,8 +1702,10 @@ abstract class BaseBrowserFragment :
             }
             if (webAppToolbarShouldBeVisible) {
                 browserToolbarView.view.isVisible = true
-                val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
-                initializeEngineView(toolbarHeight)
+                initializeEngineView(
+                    topToolbarHeight = requireContext().getTopToolbarHeight(),
+                    bottomToolbarHeight = requireContext().getBottomToolbarHeight(),
+                )
                 browserToolbarView.expand()
             }
             if (customTabSessionId == null && requireContext().settings().isTabletAndTabStripEnabled) {

fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/RedesignToolbarFeature.kt

@@ -4,6 +4,9 @@
 
 package org.mozilla.fenix.components.toolbar
 
+import android.content.Context
+import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.Settings
 
 /**
@@ -40,3 +43,37 @@ class IncompleteRedesignToolbarFeature(
     override val isEnabled: Boolean
         get() = settings.enableIncompleteToolbarRedesign
 }
+
+/**
+ * Returns the height of the bottom toolbar.
+ *
+ * The bottom toolbar can consist of a navigation bar,
+ * a combination of a navigation and address bar, or be absent.
+ */
+fun Context.getBottomToolbarHeight(): Int {
+    val isNavBarEnabled = IncompleteRedesignToolbarFeature(settings()).isEnabled
+    val isToolbarAtBottom = settings().shouldUseBottomToolbar
+    val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
+    val navbarHeight = resources.getDimensionPixelSize(R.dimen.browser_navbar_height)
+
+    return when {
+        isNavBarEnabled && isToolbarAtBottom -> toolbarHeight + navbarHeight
+        isNavBarEnabled -> navbarHeight
+        isToolbarAtBottom -> toolbarHeight
+        else -> 0
+    }
+}
+
+/**
+ * Returns the height of the top toolbar.
+ */
+fun Context.getTopToolbarHeight(): Int {
+    val isToolbarAtTop = !settings().shouldUseBottomToolbar
+    val toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
+
+    return if (isToolbarAtTop) {
+        toolbarHeight
+    } else {
+        0
+    }
+}

fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/navbar/BottomToolbarContainerView.kt

@@ -21,11 +21,13 @@ import mozilla.components.ui.widgets.behavior.ViewPosition
  *
  * @param context The Context the view is running in.
  * @param parent The ViewGroup into which the NavigationBar composable will be added.
+ * @param hideOnScroll If the container should react to the [EngineView] content being scrolled.
  * @param composableContent
  */
 class BottomToolbarContainerView(
     context: Context,
     parent: ViewGroup,
+    hideOnScroll: Boolean = false,
     composableContent: @Composable () -> Unit,
 ) {
 
@@ -46,7 +48,9 @@ class BottomToolbarContainerView(
             CoordinatorLayout.LayoutParams.WRAP_CONTENT,
         ).apply {
             gravity = Gravity.BOTTOM
-            behavior = EngineViewScrollingBehavior(parent.context, null, ViewPosition.BOTTOM)
+            if (hideOnScroll) {
+                behavior = EngineViewScrollingBehavior(parent.context, null, ViewPosition.BOTTOM)
+            }
         }
 
         parent.addView(toolbarContainerView)