Matthew Finkel pushed to branch tor-browser-90.0.0b6-11.0-1 at The Tor Project / Applications / fenix
Commits: f4b8b92d by Matthew Finkel at 2021-07-08T17:43:36+00:00 squash! Modify UI/UX
Bug 40172: Find the Quit button
- - - - -
2 changed files:
- app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
Changes:
===================================== app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -73,7 +73,6 @@ 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 accountManager = FenixAccountManager(context)
@@ -578,7 +577,7 @@ open class DefaultToolbarMenu( //saveToCollectionItem, BrowserMenuDivider(), settingsItem, - if (shouldDeleteDataOnQuit) deleteDataOnQuit else null, + deleteDataOnQuit, if (shouldUseBottomToolbar) BrowserMenuDivider() else null, if (shouldUseBottomToolbar) menuToolbar else null )
===================================== app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt ===================================== @@ -229,7 +229,7 @@ class HomeMenu( @Suppress("ComplexMethod") private fun newCoreMenuItems(): List<BrowserMenuItem> { // val experiments = context.components.analytics.experiments - val settings = context.components.settings + // val settings = context.components.settings
val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), @@ -316,7 +316,7 @@ class HomeMenu( whatsNewItem, helpItem, settingsItem, - if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null + quitItem ).also { items -> items.getHighlight()?.let { onHighlightPresent(it) } }
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/f4b8b92d6c2199...