From 654d4c2a377a8506e029a37bd7af9bf00f6e74fc Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Wed, 29 May 2019 14:58:41 -0700 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/2938 - Remove save to collection from PB browsing menu --- .../components/toolbar/DefaultToolbarMenu.kt | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) 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 5cadfd7ebd..18b2d0b07a 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 @@ -11,7 +11,9 @@ import mozilla.components.browser.menu.item.BrowserMenuImageText import mozilla.components.browser.menu.item.BrowserMenuItemToolbar import mozilla.components.browser.menu.item.BrowserMenuSwitch import org.mozilla.fenix.DefaultThemeManager +import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R +import org.mozilla.fenix.ext.asActivity import org.mozilla.fenix.ext.components class DefaultToolbarMenu( @@ -92,7 +94,7 @@ class DefaultToolbarMenu( } private val menuItems by lazy { - listOf( + val items = mutableListOf( BrowserMenuImageText( context.getString(R.string.browser_menu_help), R.drawable.ic_help, @@ -160,19 +162,29 @@ class DefaultToolbarMenu( DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) ) { onItemTapped.invoke(ToolbarMenu.Item.ReportIssue) - }, + } + ) - BrowserMenuImageText( - context.getString(R.string.browser_menu_save_to_collection), - R.drawable.ic_tab_collection, - DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) - ) { - onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection) - }, + if ((context.asActivity() as? HomeActivity)?.browsingModeManager?.isPrivate == false) { + items.add( + BrowserMenuImageText( + context.getString(R.string.browser_menu_save_to_collection), + R.drawable.ic_tab_collection, + DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) + ) { + onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection) + } + ) + } - BrowserMenuDivider(), + items.add( + BrowserMenuDivider() + ) + items.add( menuToolbar ) + + items } }