From 5d55e07dd3b6cafc15b92984c57df1034cf9d7b2 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Fri, 10 Sep 2021 12:03:54 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/21226 only show the "Customize
 Home" menu on home screen.

---
 .../toolbar/BrowserToolbarMenuController.kt          |  5 -----
 .../fenix/components/toolbar/DefaultToolbarMenu.kt   | 10 ----------
 .../mozilla/fenix/components/toolbar/ToolbarMenu.kt  |  1 -
 .../DefaultBrowserToolbarMenuControllerTest.kt       | 12 ------------
 4 files changed, 28 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
index 3abc0642a2..aec201d844 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
@@ -221,10 +221,6 @@ class DefaultBrowserToolbarMenuController(
                 val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment()
                 navController.nav(R.id.browserFragment, directions)
             }
-            is ToolbarMenu.Item.CustomizeHome -> browserAnimator.captureEngineViewAndDrawStatically {
-                val directions = BrowserFragmentDirections.actionBrowserFragmentToCustomFragment()
-                navController.nav(R.id.browserFragment, directions)
-            }
             is ToolbarMenu.Item.SyncAccount -> {
                 val directions = when (item.accountState) {
                     AccountState.AUTHENTICATED ->
@@ -388,7 +384,6 @@ class DefaultBrowserToolbarMenuController(
             is ToolbarMenu.Item.Stop -> Event.BrowserMenuItemTapped.Item.STOP
             is ToolbarMenu.Item.Share -> Event.BrowserMenuItemTapped.Item.SHARE
             is ToolbarMenu.Item.Settings -> Event.BrowserMenuItemTapped.Item.SETTINGS
-            is ToolbarMenu.Item.CustomizeHome -> return
             is ToolbarMenu.Item.RequestDesktop ->
                 if (item.isChecked) {
                     Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_ON
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index cc7a90e27f..01e6c28b33 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -34,7 +34,6 @@ import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.accounts.FenixAccountManager
 import org.mozilla.fenix.experiments.ExperimentBranch
@@ -309,14 +308,6 @@ open class DefaultToolbarMenu(
         onItemTapped.invoke(ToolbarMenu.Item.Settings)
     }
 
-    val customizeHomeItem = BrowserMenuImageText(
-        label = context.getString(R.string.browser_menu_customize_home),
-        imageResource = R.drawable.ic_customize,
-        iconTintColorResource = primaryTextColor()
-    ) {
-        onItemTapped.invoke(ToolbarMenu.Item.CustomizeHome)
-    }
-
     val bookmarksItem = BrowserMenuImageTextCheckboxButton(
         imageResource = R.drawable.ic_bookmarks_menu,
         iconTintColorResource = primaryTextColor(),
@@ -381,7 +372,6 @@ open class DefaultToolbarMenu(
                 addToTopSitesItem,
                 saveToCollectionItem,
                 BrowserMenuDivider(),
-                if (FeatureFlags.customizeHome) customizeHomeItem else null,
                 settingsItem,
                 if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
                 if (shouldUseBottomToolbar) BrowserMenuDivider() else null,
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
index 898744839b..8477905b99 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
@@ -34,7 +34,6 @@ interface ToolbarMenu {
         object History : Item()
         object Downloads : Item()
         object NewTab : Item()
-        object CustomizeHome : Item()
     }
 
     val menuBuilder: BrowserMenuBuilder
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
index 4b5a70364c..de3e419c8f 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
@@ -337,18 +337,6 @@ class DefaultBrowserToolbarMenuControllerTest {
         verify { navController.navigate(directions, null) }
     }
 
-    @Test
-    fun `WHEN CustomizeHome menu item is pressed THEN menu item is handled`() = runBlockingTest {
-        val item = ToolbarMenu.Item.CustomizeHome
-
-        val controller = createController(scope = this, store = browserStore)
-        controller.handleToolbarItemInteraction(item)
-
-        val directions = BrowserFragmentDirections.actionBrowserFragmentToCustomFragment()
-
-        verify { navController.navigate(directions, null) }
-    }
-
     @Test
     fun `WHEN bookmark menu item is pressed THEN navigate to bookmarks page`() = runBlockingTest {
         val item = ToolbarMenu.Item.Bookmarks