|
|
@ -68,6 +68,10 @@ class DefaultToolbarMenu(
|
|
|
|
menuItems,
|
|
|
|
menuItems,
|
|
|
|
endOfMenuAlwaysVisible = !shouldReverseItems,
|
|
|
|
endOfMenuAlwaysVisible = !shouldReverseItems,
|
|
|
|
store = store,
|
|
|
|
store = store,
|
|
|
|
|
|
|
|
webExtIconTintColorResource = primaryTextColor(),
|
|
|
|
|
|
|
|
onAddonsManagerTapped = {
|
|
|
|
|
|
|
|
onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
|
|
|
|
|
|
|
|
},
|
|
|
|
appendExtensionActionAtStart = !shouldReverseItems
|
|
|
|
appendExtensionActionAtStart = !shouldReverseItems
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -186,7 +190,6 @@ class DefaultToolbarMenu(
|
|
|
|
val menuItems = listOfNotNull(
|
|
|
|
val menuItems = listOfNotNull(
|
|
|
|
historyItem,
|
|
|
|
historyItem,
|
|
|
|
bookmarksItem,
|
|
|
|
bookmarksItem,
|
|
|
|
addons,
|
|
|
|
|
|
|
|
settings,
|
|
|
|
settings,
|
|
|
|
if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
|
|
|
|
if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
|
|
|
|
BrowserMenuDivider(),
|
|
|
|
BrowserMenuDivider(),
|
|
|
@ -211,14 +214,6 @@ class DefaultToolbarMenu(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private val addons = BrowserMenuImageText(
|
|
|
|
|
|
|
|
label = context.getString(R.string.browser_menu_add_ons),
|
|
|
|
|
|
|
|
imageResource = R.drawable.mozac_ic_extensions,
|
|
|
|
|
|
|
|
iconTintColorResource = primaryTextColor()
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private val settings = BrowserMenuHighlightableItem(
|
|
|
|
private val settings = BrowserMenuHighlightableItem(
|
|
|
|
label = context.getString(R.string.browser_menu_settings),
|
|
|
|
label = context.getString(R.string.browser_menu_settings),
|
|
|
|
startImageResource = R.drawable.ic_settings,
|
|
|
|
startImageResource = R.drawable.ic_settings,
|
|
|
|