blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #2938 - Remove save to collection from PB browsing menu

master
Emily Kager 2019-05-29 14:58:41 -07:00 committed by Sawyer Blatz
parent 4347d22d9b
commit c589e4d4c3
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -11,7 +11,9 @@ import mozilla.components.browser.menu.item.BrowserMenuImageText
import mozilla.components.browser.menu.item.BrowserMenuItemToolbar import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
import mozilla.components.browser.menu.item.BrowserMenuSwitch import mozilla.components.browser.menu.item.BrowserMenuSwitch
import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ext.asActivity
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
class DefaultToolbarMenu( class DefaultToolbarMenu(
@ -92,7 +94,7 @@ class DefaultToolbarMenu(
} }
private val menuItems by lazy { private val menuItems by lazy {
listOf( val items = mutableListOf(
BrowserMenuImageText( BrowserMenuImageText(
context.getString(R.string.browser_menu_help), context.getString(R.string.browser_menu_help),
R.drawable.ic_help, R.drawable.ic_help,
@ -160,19 +162,29 @@ class DefaultToolbarMenu(
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) { ) {
onItemTapped.invoke(ToolbarMenu.Item.ReportIssue) onItemTapped.invoke(ToolbarMenu.Item.ReportIssue)
}, }
)
BrowserMenuImageText( if ((context.asActivity() as? HomeActivity)?.browsingModeManager?.isPrivate == false) {
context.getString(R.string.browser_menu_save_to_collection), items.add(
R.drawable.ic_tab_collection, BrowserMenuImageText(
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) context.getString(R.string.browser_menu_save_to_collection),
) { R.drawable.ic_tab_collection,
onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection) DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
}, ) {
onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection)
}
)
}
BrowserMenuDivider(), items.add(
BrowserMenuDivider()
)
items.add(
menuToolbar menuToolbar
) )
items
} }
} }