review comments

Author: aibrahim-

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt

@@ -214,20 +214,21 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     /**
      * One inset listener per view (each apply* replaces any prior listener on that view), and only on
      * the views that survive [configureOmnibar] (which removes the unused omnibar app bar):
-     * - sides go on [ActivitySystemSearchBinding.rootView] in both modes
-     * - top omnibar: status -> appBarLayout, nav + IME -> content (scrolling list)
-     * - bottom omnibar: status -> content; nav + IME -> rootView bottom margin, so the whole root
-     *   (including the fixed-height appBarLayoutBottom) rises above the keyboard/gesture nav - padding
-     *   the fixed-height bar directly would just squeeze its content instead of moving it
+     * - top omnibar: sides -> rootView, status -> appBarLayout, nav + IME -> content (scrolling list)
+     * - bottom omnibar: status -> content; sides + nav + IME -> rootView bottom margin (single combined
+     *   listener - rootView can't take both [EdgeToEdgeHandler.applyHorizontalSystemBarInsets] and
+     *   [EdgeToEdgeHandler.applyNavigationBarInsetsAsMargin] separately, the second would drop the first),
+     *   so the whole root (including the fixed-height appBarLayoutBottom) rises above the keyboard/gesture
+     *   nav - padding the fixed-height bar directly would just squeeze its content instead of moving it
      */
     private fun configureEdgeToEdgeInsets(isOmnibarAtTop: Boolean) {
-        edgeToEdgeHandler.applyHorizontalSystemBarInsets(binding.rootView)
         if (isOmnibarAtTop) {
+            edgeToEdgeHandler.applyHorizontalSystemBarInsets(binding.rootView)
             edgeToEdgeHandler.applyStatusBarInsets(binding.appBarLayout)
             edgeToEdgeHandler.applyScrollableNavigationBarInsets(binding.content)
         } else {
             edgeToEdgeHandler.applyStatusBarInsets(binding.content)
-            edgeToEdgeHandler.applyNavigationBarInsetsAsMargin(binding.rootView)
+            edgeToEdgeHandler.applyHorizontalInsetsAndNavigationBarMargin(binding.rootView)
         }
     }
 

common/common-utils/src/main/java/com/duckduckgo/common/utils/edgetoedge/EdgeToEdgeHandler.kt

@@ -201,6 +201,39 @@ class EdgeToEdgeHandler @Inject constructor() {
         ViewCompat.requestApplyInsets(view)
     }
 
+    /**
+     * Combines [applyHorizontalSystemBarInsets] and [applyNavigationBarInsetsAsMargin] in a single listener, for
+     * when both are needed on the *same* view: only one [androidx.core.view.OnApplyWindowInsetsListener] can be
+     * attached per view, so calling both separately on the same view would silently drop the first one.
+     *
+     * @param view The view to pad on the left/right edges and set the bottom margin on; must use [ViewGroup.MarginLayoutParams].
+     */
+    fun applyHorizontalInsetsAndNavigationBarMargin(view: View) {
+        val initialLeft = view.paddingLeft
+        val initialRight = view.paddingRight
+        val initialBottomMargin = (view.layoutParams as? ViewGroup.MarginLayoutParams)?.bottomMargin ?: 0
+        view.applyInsets { insets ->
+            val barsAndCutout = insets.getInsets(
+                WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.displayCutout(),
+            )
+            view.updatePadding(
+                left = initialLeft + barsAndCutout.left,
+                right = initialRight + barsAndCutout.right,
+            )
+
+            val bottom = insets.getInsets(
+                WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime(),
+            ).bottom
+            (view.layoutParams as? ViewGroup.MarginLayoutParams)?.let { lp ->
+                val newMargin = initialBottomMargin + bottom
+                if (lp.bottomMargin != newMargin) {
+                    lp.bottomMargin = newMargin
+                    view.requestLayout()
+                }
+            }
+        }
+    }
+
     /**
      * Pads [view] on all four edges by the system-bar (status + navigation), display-cutout and IME insets, in a
      * single listener. Use for a screen whose root carries a full-bleed background and has no separate toolbar: