Bug 1877526 - Add Share and Reload icons on toolbar in the right order

mozilla-mobile · Mar 19, 2024 · 23c3f6d · 23c3f6d
1 parent 925a172
commit 23c3f6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ents/concept/toolbar/src/test/java/mozilla/components/concept/toolbar/ActionButtonTest.kt b/...ents/concept/toolbar/src/test/java/mozilla/components/concept/toolbar/ActionButtonTest.kt
@@ -45,7 +45,15 @@ class ActionButtonTest {
     @Test
     fun `constructor with drawables`() {
         val visibilityListener = { false }
-        val button = Toolbar.ActionButton(mock(), "image", visibilityListener, { false }, 0, null) { }
+        val button = Toolbar.ActionButton(
+            mock(),
+            "image",
+            visibilityListener,
+            { false },
+            { -1 },
+            0,
+            null,
+        ) { }
         assertNotNull(button.imageDrawable)
         assertEquals("image", button.contentDescription)
         assertEquals(visibilityListener, button.visible)

diff --git a/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -303,6 +303,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                     R.drawable.mozac_ic_share_android_24,
                 )!!,
                 contentDescription = getString(R.string.browser_menu_share),
+                weight = { 4 },
                 iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
                 listener = { browserToolbarInteractor.onShareActionClicked() },
             )
@@ -394,6 +395,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 )!!,
                 secondaryContentDescription = context.getString(R.string.browser_menu_stop),
                 disableInSecondaryState = false,
+                weight = { 5 },
                 longClickListener = {
                     browserToolbarInteractor.onBrowserToolbarMenuItemTapped(
                         ToolbarMenu.Item.Reload(bypassCache = true),