This commit is contained in:
parent
3e37426375
commit
547a843c5c
|
@ -83,13 +83,13 @@ open class DefaultToolbarMenu(
|
|||
} else {
|
||||
oldCoreMenuItems
|
||||
},
|
||||
endOfMenuAlwaysVisible = !shouldUseBottomToolbar,
|
||||
endOfMenuAlwaysVisible = shouldUseBottomToolbar,
|
||||
store = store,
|
||||
webExtIconTintColorResource = primaryTextColor,
|
||||
onAddonsManagerTapped = {
|
||||
onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
|
||||
},
|
||||
appendExtensionSubMenuAtStart = !shouldUseBottomToolbar
|
||||
appendExtensionSubMenuAtStart = shouldUseBottomToolbar
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -374,6 +374,7 @@ open class DefaultToolbarMenu(
|
|||
menuItems.reversed()
|
||||
}
|
||||
}
|
||||
|
||||
val newTabItem = BrowserMenuImageText(
|
||||
context.getString(R.string.library_new_tab),
|
||||
R.drawable.ic_new,
|
||||
|
@ -402,21 +403,21 @@ open class DefaultToolbarMenu(
|
|||
id = WebExtensionPlaceholderMenuItem.MAIN_EXTENSIONS_MENU_ID
|
||||
)
|
||||
|
||||
val accountManager = context.components.backgroundServices.accountManager
|
||||
val account = accountManager.authenticatedAccount()
|
||||
val syncItemTitle = if (account != null && accountManager.accountProfile()?.email != null) {
|
||||
context.getString(R.string.sync_signed_as, accountManager.accountProfile()?.email)
|
||||
} else {
|
||||
context.getString(R.string.sync_menu_sign_in)
|
||||
}
|
||||
val accountManager = context.components.backgroundServices.accountManager
|
||||
val account = accountManager.authenticatedAccount()
|
||||
val syncItemTitle = if (account != null && accountManager.accountProfile()?.email != null) {
|
||||
context.getString(R.string.sync_signed_as, accountManager.accountProfile()?.email)
|
||||
} else {
|
||||
context.getString(R.string.sync_menu_sign_in)
|
||||
}
|
||||
|
||||
val syncedTabs = BrowserMenuImageText(
|
||||
syncItemTitle,
|
||||
R.drawable.ic_synced_tabs,
|
||||
primaryTextColor()
|
||||
) {
|
||||
onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
|
||||
}
|
||||
val syncedTabs = BrowserMenuImageText(
|
||||
syncItemTitle,
|
||||
R.drawable.ic_synced_tabs,
|
||||
primaryTextColor()
|
||||
) {
|
||||
onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
|
||||
}
|
||||
|
||||
val findInPageItem = BrowserMenuImageText(
|
||||
label = context.getString(R.string.browser_menu_find_in_page),
|
||||
|
|
Loading…
Reference in New Issue
Block a user