From c145757c68eaa5b11b79401775bd42f85f28c633 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 27 Mar 2024 20:29:29 +0000
Subject: [PATCH] =?utf8?q?Bug=201885563=20-=20[Menu=20Redesign]=20Rename?=
 =?utf8?q?=20=E2=80=9CInstall=E2=80=9D=20PWA=20menu=20item=20to=20?=
 =?utf8?q?=E2=80=9CAdd=20to=20Home=20screen=E2=80=9D=20r=3Dandroid-reviewe?=
 =?utf8?q?rs,Roger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Differential Revision: https://phabricator.services.mozilla.com/D205794
---
 .../fenix/components/toolbar/DefaultToolbarMenu.kt | 31 +++++-----------------
 .../fenix/app/src/main/res/values/strings.xml      |  2 +-
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 8428377562e4..325014925f1b 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -162,13 +162,7 @@ open class DefaultToolbarMenu(
     // Predicates that need to be repeatedly called as the session changes
     @VisibleForTesting(otherwise = PRIVATE)
     fun canAddToHomescreen(): Boolean =
-        selectedSession != null && isPinningSupported &&
-            !context.components.useCases.webAppUseCases.isInstallable()
-
-    @VisibleForTesting(otherwise = PRIVATE)
-    fun canInstall(): Boolean =
-        selectedSession != null && isPinningSupported &&
-            context.components.useCases.webAppUseCases.isInstallable()
+        selectedSession != null && isPinningSupported
 
     /**
      * Should the "Open in regular tab" menu item be visible?
@@ -204,22 +198,6 @@ open class DefaultToolbarMenu(
     } ?: false
     // End of predicates //
 
-    private val installToHomescreen = BrowserMenuHighlightableItem(
-        label = context.getString(R.string.browser_menu_install_on_homescreen),
-        startImageResource = R.drawable.mozac_ic_add_to_homescreen_24,
-        iconTintColorResource = primaryTextColor(),
-        highlight = BrowserMenuHighlight.LowPriority(
-            label = context.getString(R.string.browser_menu_install_on_homescreen),
-            notificationTint = getColor(context, R.color.fx_mobile_icon_color_information),
-        ),
-        isCollapsingMenuLimit = true,
-        isHighlighted = {
-            !context.settings().installPwaOpened
-        },
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.InstallPwaToHomeScreen)
-    }
-
     @VisibleForTesting
     internal val newTabItem = BrowserMenuImageText(
         context.getString(R.string.library_new_tab),
@@ -314,7 +292,11 @@ open class DefaultToolbarMenu(
         iconTintColorResource = primaryTextColor(),
         isCollapsingMenuLimit = true,
     ) {
-        onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
+        if (context.components.useCases.webAppUseCases.isInstallable()) {
+            onItemTapped.invoke(ToolbarMenu.Item.InstallPwaToHomeScreen)
+        } else {
+            onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
+        }
     }
 
     private val addRemoveTopSitesItem = TwoStateBrowserMenuImageText(
@@ -430,7 +412,6 @@ open class DefaultToolbarMenu(
                 reportSiteIssuePlaceholder,
                 BrowserMenuDivider(),
                 addToHomeScreenItem.apply { visible = ::canAddToHomescreen },
-                installToHomescreen.apply { visible = ::canInstall },
                 if (shouldShowTopSites) addRemoveTopSitesItem else null,
                 saveToCollectionItem,
                 if (FxNimbus.features.print.value().browserPrintEnabled) printPageItem else null,
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
index 1a34eba9ddfb..e1f4a1da0f56 100644
--- a/mobile/android/fenix/app/src/main/res/values/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -199,7 +199,7 @@
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
     <string name="browser_menu_add_to_homescreen">Add to Home screen</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
-    <string name="browser_menu_install_on_homescreen">Install</string>
+    <string name="browser_menu_install_on_homescreen" moz:removedIn="126" tools:ignore="UnusedResources">Install</string>
     <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button -->
     <string name="resync_button_content_description">Resync</string>
     <!-- Browser menu button that opens the find in page menu -->
-- 
2.11.4.GIT