blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10467 - blue dot doesn't disappear on menu dismiss

master
Mihai Branescu 2020-06-25 00:01:12 +03:00 committed by Emily Kager
parent 0b781ae3b7
commit 3c2c7f705c
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserInteractor.kt
View File

@ -32,10 +32,6 @@ open class BrowserInteractor(
browserToolbarController.handleToolbarItemInteraction(item)
}
override fun onBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>) {
browserToolbarController.handleBrowserMenuDismissed(lowPrioHighlightItems)
}
override fun onScrolled(offset: Int) {
browserToolbarController.handleScroll(offset)
}

11
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -53,7 +53,6 @@ interface BrowserToolbarController {
fun handleToolbarClick()
fun handleTabCounterClick()
fun handleTabCounterItemInteraction(item: TabCounterMenuItem)
fun handleBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>)
fun handleReaderModePressed(enabled: Boolean)
}
@ -158,16 +157,6 @@ class DefaultBrowserToolbarController(
}
}
override fun handleBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>) {
val settings = activity.settings()
lowPrioHighlightItems.forEach {
when (it) {
ToolbarMenu.Item.AddToHomeScreen -> settings.installPwaOpened = true
ToolbarMenu.Item.OpenInApp -> settings.openInAppOpened = true
}
}
}
override fun handleScroll(offset: Int) {
engineView.setVerticalClipping(offset)
}

2
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
View File

@ -50,7 +50,6 @@ interface BrowserToolbarViewInteractor {
fun onBrowserToolbarMenuItemTapped(item: ToolbarMenu.Item)
fun onTabCounterClicked()
fun onTabCounterMenuItemTapped(item: TabCounterMenuItem)
fun onBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>)
fun onScrolled(offset: Int)
fun onReaderModePressed(enabled: Boolean)
}
@ -229,7 +228,6 @@ class BrowserToolbarView(
bookmarksStorage = bookmarkStorage
)
view.display.setMenuDismissAction {
interactor.onBrowserMenuDismissed(menuToolbar.getLowPrioHighlightItems())
view.invalidateActions()
}
}

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

@ -137,17 +137,6 @@ class DefaultToolbarMenu(
BrowserMenuItemToolbar(listOf(bookmark, share, forward, refresh))
}
internal fun getLowPrioHighlightItems(): List<ToolbarMenu.Item> {
val lowPrioHighlightItems: MutableList<ToolbarMenu.Item> = mutableListOf()
if (canInstall() && installToHomescreen.isHighlighted()) {
lowPrioHighlightItems.add(ToolbarMenu.Item.InstallToHomeScreen)
}
if (shouldShowOpenInApp() && openInApp.isHighlighted()) {
lowPrioHighlightItems.add(ToolbarMenu.Item.OpenInApp)
}
return lowPrioHighlightItems
}
// Predicates that need to be repeatedly called as the session changes
private fun canAddToHomescreen(): Boolean =
session != null && context.components.useCases.webAppUseCases.isPinningSupported() &&