commit 3aff965e839b7872bf48a9803b80669ca49276ac
parent 9371844ef6bdd93cdcaf70be32256c46ed47c837
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Fri, 17 Oct 2025 04:19:48 +0000
Bug 1993655 - Part 3: Remove unused MenuHeader r=android-reviewers,007
Differential Revision: https://phabricator.services.mozilla.com/D268422
Diffstat:
2 files changed, 2 insertions(+), 129 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/MenuHeader.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/MenuHeader.kt
@@ -1,127 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.components.menu.compose.header
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import mozilla.components.service.fxa.manager.AccountState
-import mozilla.components.service.fxa.manager.AccountState.NotAuthenticated
-import mozilla.components.service.fxa.store.Account
-import org.mozilla.fenix.R
-import org.mozilla.fenix.theme.FirefoxTheme
-import org.mozilla.fenix.theme.Theme
-import mozilla.components.ui.icons.R as iconsR
-
-@Composable
-internal fun MenuHeader(
- account: Account?,
- accountState: AccountState,
- onMozillaAccountButtonClick: () -> Unit,
- onHelpButtonClick: () -> Unit,
- onSettingsButtonClick: () -> Unit,
-) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(start = 12.dp, end = 6.dp)
- .verticalScroll(rememberScrollState()),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- MozillaAccountMenuItem(
- account = account,
- accountState = accountState,
- onClick = onMozillaAccountButtonClick,
- isPrivate = false,
- modifier = Modifier.weight(1f),
- )
-
- Spacer(modifier = Modifier.width(8.dp))
-
- HorizontalDivider(modifier = Modifier.size(width = 2.dp, height = 32.dp))
-
- Spacer(modifier = Modifier.width(4.dp))
-
- IconButton(
- onClick = onHelpButtonClick,
- ) {
- Icon(
- painter = painterResource(id = iconsR.drawable.mozac_ic_help_circle_24),
- contentDescription = stringResource(
- id = R.string.browser_main_menu_content_description_help_button,
- ),
- tint = FirefoxTheme.colors.iconPrimary,
- )
- }
-
- IconButton(
- onClick = onSettingsButtonClick,
- ) {
- Icon(
- painter = painterResource(id = iconsR.drawable.mozac_ic_settings_24),
- contentDescription = stringResource(
- id = R.string.browser_main_menu_content_description_settings_button,
- ),
- tint = FirefoxTheme.colors.iconPrimary,
- )
- }
- }
-}
-
-@PreviewLightDark
-@Composable
-private fun MenuHeaderPreview() {
- FirefoxTheme {
- Column(
- modifier = Modifier
- .background(color = FirefoxTheme.colors.layer3),
- ) {
- MenuHeader(
- account = null,
- accountState = NotAuthenticated,
- onMozillaAccountButtonClick = {},
- onHelpButtonClick = {},
- onSettingsButtonClick = {},
- )
- }
- }
-}
-
-@Preview
-@Composable
-private fun MenuHeaderPrivatePreview() {
- FirefoxTheme(theme = Theme.Private) {
- Column(
- modifier = Modifier
- .background(color = FirefoxTheme.colors.layer3),
- ) {
- MenuHeader(
- account = null,
- accountState = NotAuthenticated,
- onMozillaAccountButtonClick = {},
- onHelpButtonClick = {},
- onSettingsButtonClick = {},
- )
- }
- }
-}
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -271,9 +271,9 @@
<!-- Content description (not visible, for screen readers etc.) for main menu navigation header. -->
<string name="browser_main_menu_content_description_navigation_header">Navigation</string>
<!-- Content description (not visible, for screen readers etc.) for main menu help button. -->
- <string name="browser_main_menu_content_description_help_button">Help</string>
+ <string name="browser_main_menu_content_description_help_button" tools:ignore="UnusedResources" moz:removedIn="146">Help</string>
<!-- Content description (not visible, for screen readers etc.) for main menu settings button. -->
- <string name="browser_main_menu_content_description_settings_button">Settings</string>
+ <string name="browser_main_menu_content_description_settings_button" tools:ignore="UnusedResources" moz:removedIn="146">Settings</string>
<!-- Content description (not visible, for screen readers etc.) for bottom sheet handlebar extensions menu. -->
<string name="browser_extensions_menu_handlebar_content_description">Close extensions menu sheet</string>
<!-- Content description (not visible, for screen readers etc.) for bottom sheet handlebar save menu. -->
