Bug 1983260 - Support user avatar in menu a=RyanVM

Original Revision: https://phabricator.services.mozilla.com/D261274

Differential Revision: https://phabricator.services.mozilla.com/D262471

Author: Rhodwell Malicdem

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt

@@ -63,10 +63,7 @@ import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.ui.displayName
 import mozilla.components.feature.addons.ui.summary
 import mozilla.components.service.fxa.manager.AccountState
-import mozilla.components.service.fxa.manager.AccountState.Authenticated
-import mozilla.components.service.fxa.manager.AccountState.Authenticating
 import mozilla.components.service.fxa.manager.AccountState.AuthenticationProblem
-import mozilla.components.service.fxa.manager.AccountState.NotAuthenticated
 import mozilla.components.service.fxa.store.Account
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.menu.MenuAccessPoint
@@ -76,6 +73,7 @@ import org.mozilla.fenix.components.menu.MenuDialogTestTag.EXTENSIONS
 import org.mozilla.fenix.components.menu.MenuDialogTestTag.EXTENSIONS_OPTION_CHEVRON
 import org.mozilla.fenix.components.menu.MenuDialogTestTag.MORE_OPTION_CHEVRON
 import org.mozilla.fenix.components.menu.compose.header.MenuNavHeader
+import org.mozilla.fenix.components.menu.compose.header.MozillaAccountMenuItem
 import org.mozilla.fenix.components.menu.store.WebExtensionMenuItem
 import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.theme.Theme
@@ -273,8 +271,8 @@ fun MainMenu(
             MozillaAccountMenuItem(
                 account = account,
                 accountState = accountState,
-                onClick = onMozillaAccountButtonClick,
                 isPrivate = isPrivate,
+                onClick = onMozillaAccountButtonClick,
             )
 
             MenuItem(
@@ -722,64 +720,6 @@ private fun HomepageMenuGroup(
     }
 }
 
-@Composable
-internal fun MozillaAccountMenuItem(
-    account: Account?,
-    accountState: AccountState,
-    onClick: () -> Unit,
-    isPrivate: Boolean,
-) {
-    val label: String
-    val description: String?
-
-    when (accountState) {
-        NotAuthenticated -> {
-            label = stringResource(id = R.string.browser_menu_sign_in)
-            description = stringResource(id = R.string.browser_menu_sign_in_caption_3)
-        }
-
-        AuthenticationProblem -> {
-            label = account?.displayName ?: account?.email
-                    ?: stringResource(id = R.string.browser_menu_sign_back_in_to_sync)
-            description = stringResource(id = R.string.browser_menu_syncing_paused_caption)
-        }
-
-        Authenticated -> {
-            label = account?.displayName ?: account?.email
-                ?: stringResource(id = R.string.browser_menu_account_settings)
-            description = stringResource(id = R.string.browser_menu_signed_in_caption)
-        }
-
-        is Authenticating -> {
-            label = ""
-            description = null
-        }
-    }
-
-    MenuItem(
-        label = label,
-        beforeIconPainter = if (accountState is AuthenticationProblem && isPrivate) {
-            painterResource(id = R.drawable.mozac_ic_avatar_warning_circle_fill_critical_private_24)
-        } else if (accountState is AuthenticationProblem) {
-            painterResource(id = R.drawable.mozac_ic_avatar_warning_circle_fill_critical_24)
-        } else {
-            painterResource(id = R.drawable.mozac_ic_avatar_circle_24)
-        },
-        description = description,
-        state = if (accountState is AuthenticationProblem) {
-            MenuItemState.CRITICAL
-        } else {
-            MenuItemState.ENABLED
-        },
-        descriptionState = if (accountState is AuthenticationProblem) {
-            MenuItemState.WARNING
-        } else {
-            MenuItemState.ENABLED
-        },
-        onClick = onClick,
-    )
-}
-
 @Suppress("LongParameterList")
 @Composable
 internal fun Addons(

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/MenuHeader.kt

@@ -47,10 +47,11 @@ internal fun MenuHeader(
             .verticalScroll(rememberScrollState()),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        MozillaAccountMenuButton(
+        MozillaAccountMenuItem(
             account = account,
             accountState = accountState,
             onClick = onMozillaAccountButtonClick,
+            isPrivate = false,
             modifier = Modifier.weight(1f),
         )