From 51df37cde59d990daa1778a60ae9677e16d3e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Hentzschel?= Date: Mon, 12 Apr 2021 19:02:14 +0200 Subject: [PATCH] For #18898 - implement quit button in page menu (#18942) --- .../fenix/components/toolbar/DefaultToolbarMenu.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 0575a763a..aabadf73b 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -71,6 +71,7 @@ open class DefaultToolbarMenu( private var isCurrentUrlBookmarked = false private var isBookmarkedJob: Job? = null + private val shouldDeleteDataOnQuit = context.settings().shouldDeleteBrowsingDataOnQuit private val shouldUseBottomToolbar = context.settings().shouldUseBottomToolbar private val selectedSession: TabSessionState? @@ -528,6 +529,14 @@ open class DefaultToolbarMenu( 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) val newCoreMenuItems by lazy { val menuItems = @@ -553,6 +562,7 @@ open class DefaultToolbarMenu( saveToCollectionItem, BrowserMenuDivider(), settingsItem, + if (shouldDeleteDataOnQuit) deleteDataOnQuit else null, if (shouldUseBottomToolbar) BrowserMenuDivider() else null, if (shouldUseBottomToolbar) menuToolbar else null )