Bug 1977765 - Reuse existing navigation bar view id to anchor other popups r=android-reviewers,Roger

From the previous navigation bar implementation we had the `toolbar_navbar_container`
view id still lingering in the application but unused.
Since we saw that when using the new navigation bar it would be added in the layout
with the same id as the composable toolbar we'll go with using the pre-existent
navigation bar id to distinguish between the two and ensure application popups will be
correctly anchored.

Renamed the `toolbar_navbar_container` to `navigation_bar` because with the new
implementation we don't have a container.

Differential Revision: https://phabricator.services.mozilla.com/D259088

Author: Mugurell

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt

@@ -480,7 +480,7 @@ class HomeScreenRobot {
 
     fun verifyNavigationToolbarIsSetToTheBottomOfTheHomeScreen() {
         Log.i(TAG, "verifyAddressBarPosition: Trying to verify that the navigation toolbar is set to bottom")
-        onView(withId(R.id.toolbar_navbar_container)).check(isPartiallyBelow(withId(R.id.homepageView)))
+        onView(withId(R.id.navigation_bar)).check(isPartiallyBelow(withId(R.id.homepageView)))
         Log.i(TAG, "verifyAddressBarPosition: Verified that the navigation toolbar is set to bottom")
     }
 

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt

@@ -222,7 +222,7 @@ class NavigationToolbarRobot {
         mDevice.findObject(
             By.desc(buttonDescription)
                 .enabled(true)
-                .hasAncestor(By.res("$packageName:id/toolbar_navbar_container")),
+                .hasAncestor(By.res("$packageName:id/navigation_bar")),
         )
             .click(LONG_CLICK_DURATION)
         Log.i(TAG, "longTapNavButton: Long clicked the nav bar $buttonDescription button.")
@@ -245,7 +245,7 @@ class NavigationToolbarRobot {
     // Verifies that the address bar is displayed separately, or merged with the navbar in landscape mode.
     fun verifyAddressBarIsDisplayedSeparately(isSeparate: Boolean, isAtTop: Boolean) {
         val addressBar = "$packageName:id/toolbar"
-        val navBar = "$packageName:id/toolbar_navbar_container"
+        val navBar = "$packageName:id/navigation_bar"
 
         if (isSeparate) {
             assertUIObjectExists(itemWithResId(addressBar), itemWithResId(navBar))
@@ -269,7 +269,7 @@ class NavigationToolbarRobot {
 
     fun verifyNavBarBarPosition(isAtBottom: Boolean) {
         Log.i(TAG, "verifyNavBarBarPosition: Trying to verify the toolbar navbar position is at the bottom: $isAtBottom.")
-        onView(allOf(withId(R.id.toolbar_navbar_container), isCompletelyDisplayed())).check(
+        onView(allOf(withId(R.id.navigation_bar), isCompletelyDisplayed())).check(
             if (isAtBottom) {
                 isPartiallyBelow(withId(R.id.engineView))
             } else {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/AutofillSelectBarBehavior.kt

@@ -23,7 +23,7 @@ class AutofillSelectBarBehavior<V : View>(
 
     // Priority list of possible anchors for the autofill bars.
     private val dependenciesIds = buildList {
-        add(R.id.toolbar_navbar_container)
+        add(R.id.navigation_bar)
         if (toolbarPosition == ToolbarPosition.BOTTOM) {
             add(R.id.toolbar)
             add(R.id.composable_toolbar)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/SnackbarBehavior.kt

@@ -35,7 +35,7 @@ class SnackbarBehavior<V : View>(
         add(R.id.suggestStrongPasswordBar)
         add(R.id.creditCardSelectBar)
         add(R.id.addressSelectBar)
-        add(R.id.toolbar_navbar_container)
+        add(R.id.navigation_bar)
         if (
             toolbarPosition == ToolbarPosition.BOTTOM ||
             (toolbarPosition == ToolbarPosition.TOP && shouldUseExpandedToolbar)

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

@@ -33,7 +33,7 @@ class BottomToolbarContainerView(
 ) {
 
     val toolbarContainerView = ToolbarContainerView(context).apply {
-        id = R.id.toolbar_navbar_container
+        id = R.id.navigation_bar
     }
     private val composeView = ComposeView(context).apply {
         setContent {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserNavigationBar.kt

@@ -22,6 +22,7 @@ import mozilla.components.compose.browser.toolbar.store.ToolbarGravity.Bottom
 import mozilla.components.compose.browser.toolbar.store.ToolbarGravity.Top
 import mozilla.components.feature.toolbar.ToolbarBehaviorController
 import mozilla.components.lib.state.ext.observeAsState
+import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.utils.KeyboardState
 import org.mozilla.fenix.compose.utils.keyboardAsState
 import org.mozilla.fenix.theme.FirefoxTheme
@@ -70,6 +71,8 @@ class BrowserNavigationBar(
 
             DefaultNavigationBarContent()
         }.apply {
+            id = R.id.navigation_bar
+
             container.addView(
                 this,
                 LayoutParams(

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/toolbar/HomeNavigationBar.kt

@@ -19,11 +19,9 @@ import mozilla.components.compose.browser.toolbar.store.BrowserToolbarStore
 import mozilla.components.compose.browser.toolbar.store.ToolbarGravity.Bottom
 import mozilla.components.compose.browser.toolbar.store.ToolbarGravity.Top
 import mozilla.components.lib.state.ext.observeAsState
-import org.mozilla.fenix.components.AppStore
-import org.mozilla.fenix.components.StoreProvider
+import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.utils.KeyboardState
 import org.mozilla.fenix.compose.utils.keyboardAsState
-import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.utils.Settings
 
@@ -73,6 +71,8 @@ class HomeNavigationBar(
     }
 
     override val layout = ComposeView(context).apply {
+        id = R.id.navigation_bar
+
         setContent {
             DefaultNavigationBarContent()
         }

mobile/android/fenix/app/src/main/res/values/ids.xml

@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
-    <item name="toolbar_navbar_container" type="id"/>
+    <item name="navigation_bar" type="id"/>
     <item name="composable_toolbar" type="id"/>
 </resources>

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/AutofillSelectBarBehaviorTest.kt

@@ -60,7 +60,7 @@ class AutofillSelectBarBehaviorTest {
 
     @Test
     fun `GIVEN a toolbar shown at top and the navbar at the bottom WHEN the login bar is shown THEN anchor it to the navbar`() {
-        dependency.id = R.id.toolbar_navbar_container
+        dependency.id = R.id.navigation_bar
         val behavior = AutofillSelectBarBehavior<ViewGroup>(testContext, ToolbarPosition.TOP)
 
         behavior.layoutDependsOn(parent, loginsBar, dependency)
@@ -127,7 +127,7 @@ class AutofillSelectBarBehaviorTest {
     @Test
     fun `GIVEN the login bar is anchored to the navbar WHEN the navbar is not shown anymore THEN place the login bar at the bottom`() {
         val navbar = View(testContext)
-            .apply { id = R.id.toolbar_navbar_container }
+            .apply { id = R.id.navigation_bar }
             .also { parent.addView(it) }
         val behavior = AutofillSelectBarBehavior<ViewGroup>(testContext, ToolbarPosition.BOTTOM)