ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #18898 - implement quit button in page menu (#18942)

Browse Source
This commit is contained in:
Sören Hentzschel 2021-04-12 19:02:14 +02:00 committed by GitHub
parent c5e78f69ed
commit 51df37cde5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ open class DefaultToolbarMenu(
private var isCurrentUrlBookmarked = false private var isCurrentUrlBookmarked = false
private var isBookmarkedJob: Job? = null private var isBookmarkedJob: Job? = null
private val shouldDeleteDataOnQuit = context.settings().shouldDeleteBrowsingDataOnQuit
private val shouldUseBottomToolbar = context.settings().shouldUseBottomToolbar private val shouldUseBottomToolbar = context.settings().shouldUseBottomToolbar
private val selectedSession: TabSessionState? private val selectedSession: TabSessionState?
@ -528,6 +529,14 @@ open class DefaultToolbarMenu(
handleBookmarkItemTapped() handleBookmarkItemTapped()
} }
val deleteDataOnQuit = BrowserMenuImageText(
label = context.getString(R.string.delete_browsing_data_on_quit_action),
imageResource = R.drawable.ic_exit,
iconTintColorResource = primaryTextColor
) {
onItemTapped.invoke(ToolbarMenu.Item.Quit)
}
@VisibleForTesting(otherwise = PRIVATE) @VisibleForTesting(otherwise = PRIVATE)
val newCoreMenuItems by lazy { val newCoreMenuItems by lazy {
val menuItems = val menuItems =
@ -553,6 +562,7 @@ open class DefaultToolbarMenu(
saveToCollectionItem, saveToCollectionItem,
BrowserMenuDivider(), BrowserMenuDivider(),
settingsItem, settingsItem,
if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
if (shouldUseBottomToolbar) BrowserMenuDivider() else null, if (shouldUseBottomToolbar) BrowserMenuDivider() else null,
if (shouldUseBottomToolbar) menuToolbar else null if (shouldUseBottomToolbar) menuToolbar else null
) )