[fenix] For https://github.com/mozilla-mobile/fenix/issues/21226 only show the "Customize Home" menu on home screen.

pull/600/head
Arturo Mejia 3 years ago committed by mergify[bot]
parent ea5d0ee63d
commit 5d55e07dd3

@ -221,10 +221,6 @@ class DefaultBrowserToolbarMenuController(
val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment() val directions = BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment()
navController.nav(R.id.browserFragment, directions) 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 -> { is ToolbarMenu.Item.SyncAccount -> {
val directions = when (item.accountState) { val directions = when (item.accountState) {
AccountState.AUTHENTICATED -> AccountState.AUTHENTICATED ->
@ -388,7 +384,6 @@ class DefaultBrowserToolbarMenuController(
is ToolbarMenu.Item.Stop -> Event.BrowserMenuItemTapped.Item.STOP is ToolbarMenu.Item.Stop -> Event.BrowserMenuItemTapped.Item.STOP
is ToolbarMenu.Item.Share -> Event.BrowserMenuItemTapped.Item.SHARE is ToolbarMenu.Item.Share -> Event.BrowserMenuItemTapped.Item.SHARE
is ToolbarMenu.Item.Settings -> Event.BrowserMenuItemTapped.Item.SETTINGS is ToolbarMenu.Item.Settings -> Event.BrowserMenuItemTapped.Item.SETTINGS
is ToolbarMenu.Item.CustomizeHome -> return
is ToolbarMenu.Item.RequestDesktop -> is ToolbarMenu.Item.RequestDesktop ->
if (item.isChecked) { if (item.isChecked) {
Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_ON Event.BrowserMenuItemTapped.Item.DESKTOP_VIEW_ON

@ -34,7 +34,6 @@ import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature
import mozilla.components.lib.state.ext.flowScoped import mozilla.components.lib.state.ext.flowScoped
import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.accounts.FenixAccountManager import org.mozilla.fenix.components.accounts.FenixAccountManager
import org.mozilla.fenix.experiments.ExperimentBranch import org.mozilla.fenix.experiments.ExperimentBranch
@ -309,14 +308,6 @@ open class DefaultToolbarMenu(
onItemTapped.invoke(ToolbarMenu.Item.Settings) 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( val bookmarksItem = BrowserMenuImageTextCheckboxButton(
imageResource = R.drawable.ic_bookmarks_menu, imageResource = R.drawable.ic_bookmarks_menu,
iconTintColorResource = primaryTextColor(), iconTintColorResource = primaryTextColor(),
@ -381,7 +372,6 @@ open class DefaultToolbarMenu(
addToTopSitesItem, addToTopSitesItem,
saveToCollectionItem, saveToCollectionItem,
BrowserMenuDivider(), BrowserMenuDivider(),
if (FeatureFlags.customizeHome) customizeHomeItem else null,
settingsItem, settingsItem,
if (shouldDeleteDataOnQuit) deleteDataOnQuit else null, if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
if (shouldUseBottomToolbar) BrowserMenuDivider() else null, if (shouldUseBottomToolbar) BrowserMenuDivider() else null,

@ -34,7 +34,6 @@ interface ToolbarMenu {
object History : Item() object History : Item()
object Downloads : Item() object Downloads : Item()
object NewTab : Item() object NewTab : Item()
object CustomizeHome : Item()
} }
val menuBuilder: BrowserMenuBuilder val menuBuilder: BrowserMenuBuilder

@ -337,18 +337,6 @@ class DefaultBrowserToolbarMenuControllerTest {
verify { navController.navigate(directions, null) } 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 @Test
fun `WHEN bookmark menu item is pressed THEN navigate to bookmarks page`() = runBlockingTest { fun `WHEN bookmark menu item is pressed THEN navigate to bookmarks page`() = runBlockingTest {
val item = ToolbarMenu.Item.Bookmarks val item = ToolbarMenu.Item.Bookmarks

Loading…
Cancel
Save