Closes #1914 - Removes incomplete actions from Custom Tab Menu
parent
df6230182c
commit
7f5f96b41b
|
@ -89,7 +89,6 @@ class ToolbarUIView(
|
||||||
|
|
||||||
val menuToolbar = if (isCustom) {
|
val menuToolbar = if (isCustom) {
|
||||||
CustomTabToolbarMenu(this,
|
CustomTabToolbarMenu(this,
|
||||||
requestDesktopStateProvider = { session?.desktopMode ?: false },
|
|
||||||
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
|
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -9,7 +9,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder
|
||||||
import mozilla.components.browser.menu.item.BrowserMenuDivider
|
import mozilla.components.browser.menu.item.BrowserMenuDivider
|
||||||
import mozilla.components.browser.menu.item.BrowserMenuImageText
|
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.SimpleBrowserMenuItem
|
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
|
||||||
import org.mozilla.fenix.DefaultThemeManager
|
import org.mozilla.fenix.DefaultThemeManager
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
@ -18,7 +17,6 @@ import org.mozilla.fenix.ext.components
|
||||||
|
|
||||||
class CustomTabToolbarMenu(
|
class CustomTabToolbarMenu(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
private val requestDesktopStateProvider: () -> Boolean = { false },
|
|
||||||
private val onItemTapped: (ToolbarMenu.Item) -> Unit = {}
|
private val onItemTapped: (ToolbarMenu.Item) -> Unit = {}
|
||||||
) : ToolbarMenu {
|
) : ToolbarMenu {
|
||||||
override val menuBuilder by lazy { BrowserMenuBuilder(menuItems) }
|
override val menuBuilder by lazy { BrowserMenuBuilder(menuItems) }
|
||||||
|
@ -117,19 +115,6 @@ class CustomTabToolbarMenu(
|
||||||
onItemTapped.invoke(ToolbarMenu.Item.OpenInFenix)
|
onItemTapped.invoke(ToolbarMenu.Item.OpenInFenix)
|
||||||
},
|
},
|
||||||
|
|
||||||
BrowserMenuImageText(
|
|
||||||
context.getString(R.string.browser_menu_find_in_page),
|
|
||||||
R.drawable.mozac_ic_search,
|
|
||||||
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
|
|
||||||
) {
|
|
||||||
onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
|
|
||||||
},
|
|
||||||
|
|
||||||
BrowserMenuSwitch(context.getString(R.string.browser_menu_desktop_site),
|
|
||||||
requestDesktopStateProvider, { checked ->
|
|
||||||
onItemTapped.invoke(ToolbarMenu.Item.RequestDesktop(checked))
|
|
||||||
}),
|
|
||||||
|
|
||||||
BrowserMenuImageText(
|
BrowserMenuImageText(
|
||||||
context.getString(R.string.browser_menu_share),
|
context.getString(R.string.browser_menu_share),
|
||||||
R.drawable.mozac_ic_share,
|
R.drawable.mozac_ic_share,
|
||||||
|
|
|
@ -22,11 +22,9 @@ class CustomTabsIntegration(
|
||||||
onItemTapped: (ToolbarMenu.Item) -> Unit = {}
|
onItemTapped: (ToolbarMenu.Item) -> Unit = {}
|
||||||
) : LifecycleAwareFeature, BackHandler {
|
) : LifecycleAwareFeature, BackHandler {
|
||||||
|
|
||||||
private val session = sessionManager.findSessionById(sessionId)
|
|
||||||
|
|
||||||
private val customTabToolbarMenu by lazy {
|
private val customTabToolbarMenu by lazy {
|
||||||
CustomTabToolbarMenu(context,
|
CustomTabToolbarMenu(
|
||||||
requestDesktopStateProvider = { session?.desktopMode ?: false },
|
context,
|
||||||
onItemTapped = onItemTapped
|
onItemTapped = onItemTapped
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue