Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1890243 - Refactor initializaiton of the leading action r=android-reviewers,twhite

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D206876
This commit is contained in:
mike a. 2024-04-09 01:19:16 +00:00
parent 127e5f7b57
commit f268233fbd
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -107,32 +107,12 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
)
}
val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
if (!IncompleteRedesignToolbarFeature(context.settings()).isEnabled) {
val leadingAction = if (isPrivate && context.settings().feltPrivateBrowsingEnabled) {
BrowserToolbar.Button(
imageDrawable = AppCompatResources.getDrawable(
context,
R.drawable.mozac_ic_data_clearance_24,
)!!,
contentDescription = context.getString(R.string.browser_toolbar_erase),
iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
listener = browserToolbarInteractor::onEraseButtonClicked,
)
} else {
BrowserToolbar.Button(
imageDrawable = AppCompatResources.getDrawable(
context,
R.drawable.mozac_ic_home_24,
)!!,
contentDescription = context.getString(R.string.browser_toolbar_home),
iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
listener = browserToolbarInteractor::onHomeButtonClicked,
)
}
browserToolbarView.view.addNavigationAction(leadingAction)
val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
initLeadingAction(
context = context,
isPrivate = isPrivate,
)
}
updateToolbarActions(isTablet = resources.getBoolean(R.bool.tablet))
@ -431,6 +411,36 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
)
}
// Adds a home button to BrowserToolbar or, if FeltPrivateBrowsing is enabled, a clear data button instead.
private fun initLeadingAction(
context: Context,
isPrivate: Boolean,
) {
val leadingAction = if (isPrivate && context.settings().feltPrivateBrowsingEnabled) {
BrowserToolbar.Button(
imageDrawable = AppCompatResources.getDrawable(
context,
R.drawable.mozac_ic_data_clearance_24,
)!!,
contentDescription = context.getString(R.string.browser_toolbar_erase),
iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
listener = browserToolbarInteractor::onEraseButtonClicked,
)
} else {
BrowserToolbar.Button(
imageDrawable = AppCompatResources.getDrawable(
context,
R.drawable.mozac_ic_home_24,
)!!,
contentDescription = context.getString(R.string.browser_toolbar_home),
iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
listener = browserToolbarInteractor::onHomeButtonClicked,
)
}
browserToolbarView.view.addNavigationAction(leadingAction)
}
override fun onUpdateToolbarForConfigurationChange(toolbar: BrowserToolbarView) {
super.onUpdateToolbarForConfigurationChange(toolbar)