From e21f4ba3665628eeca85b73f36c4e48c045e41dc Mon Sep 17 00:00:00 2001
From: Marino Meneghel <marino.meneghel@protonmail.com>
Date: Mon, 10 Nov 2025 16:26:58 +0100
Subject: [PATCH] Add options section to 'account switcher' screen

ET-5291
---
 .../v2/AccountsSwitcherBottomSheetScreen.kt   | 65 ++++++++++++++-----
 .../src/main/res/values/strings.xml           |  1 +
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/shared/core/account-manager/presentation/src/main/kotlin/me/proton/android/core/accountmanager/presentation/switcher/v2/AccountsSwitcherBottomSheetScreen.kt b/shared/core/account-manager/presentation/src/main/kotlin/me/proton/android/core/accountmanager/presentation/switcher/v2/AccountsSwitcherBottomSheetScreen.kt
index e076bbc5c6..00e445dc49 100644
--- a/shared/core/account-manager/presentation/src/main/kotlin/me/proton/android/core/accountmanager/presentation/switcher/v2/AccountsSwitcherBottomSheetScreen.kt
+++ b/shared/core/account-manager/presentation/src/main/kotlin/me/proton/android/core/accountmanager/presentation/switcher/v2/AccountsSwitcherBottomSheetScreen.kt
@@ -36,6 +36,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
@@ -113,13 +114,19 @@ fun AccountsSwitcherBottomSheetScreen(
                         onEvent = onEvent
                     )
 
+                    Spacer(Modifier.size(ProtonDimens.Spacing.Large))
+
                     OtherAccountsSection(
                         signedInAccounts = state.signedInAccounts.filterNot { it is AccountListItem.Ready.Primary },
                         signedOutAccounts = state.disabledAccounts,
                         onEvent = onEvent
                     )
 
-                    ManageAccountsOnDeviceButton(modifier = modifier, onEvent = onEvent)
+                    Spacer(Modifier.size(ProtonDimens.Spacing.Large))
+
+                    Options(
+                        onEvent = onEvent
+                    )
 
                     Spacer(
                         modifier = Modifier.height(
@@ -144,8 +151,7 @@ private fun CurrentAccountSection(
 ) {
     Column(
         modifier = modifier
-            .padding(horizontal = ProtonDimens.Spacing.Standard)
-            .padding(bottom = ProtonDimens.Spacing.Large),
+            .padding(horizontal = ProtonDimens.Spacing.Standard),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -232,8 +238,8 @@ private fun OtherAccountsSection(
 ) {
     if (signedInAccounts.isNotEmpty() || signedOutAccounts.isNotEmpty()) {
         Text(
-            color = LocalColors.current.textHint,
-            style = LocalTypography.current.titleSmall,
+            color = LocalColors.current.textNorm,
+            style = LocalTypography.current.titleMedium,
             textAlign = TextAlign.Start,
             text = stringResource(R.string.manage_accounts_switch_to),
             modifier = Modifier
@@ -267,7 +273,6 @@ private fun OtherAccountsSection(
                     onEvent = onEvent
                 )
             }
-            AddAnotherAccountButton(modifier = modifier, onEvent = onEvent)
         }
     }
 }
@@ -301,25 +306,53 @@ private fun SignedOutAccountRow(
 }
 
 @Composable
-private fun ManageAccountsOnDeviceButton(modifier: Modifier, onEvent: (AccountSwitchEvent) -> Unit) {
+private fun Options(modifier: Modifier = Modifier, onEvent: (AccountSwitchEvent) -> Unit) {
+    Text(
+        color = LocalColors.current.textNorm,
+        style = LocalTypography.current.titleMedium,
+        textAlign = TextAlign.Start,
+        text = stringResource(R.string.manage_accounts_options),
+        modifier = Modifier
+            .padding(
+                bottom = ProtonDimens.Spacing.Medium,
+                top = ProtonDimens.Spacing.Standard,
+                start = ProtonDimens.Spacing.Medium
+            )
+            .fillMaxWidth()
+    )
     Card(
         shape = RoundedCornerShape(AccountDimens.AccountCardRadius),
         modifier = modifier
-            .padding(ProtonDimens.Spacing.Medium)
+            .padding(horizontal = ProtonDimens.Spacing.Medium)
             .fillMaxWidth(),
-        elevation = CardDefaults.cardElevation(),
-        colors = CardDefaults.cardColors().copy(containerColor = ProtonTheme.colors.backgroundInvertedSecondary)
-    ) {
-        ButtonWithIconAndText(
-            text = R.string.manage_accounts_on_device,
-            icon = R.drawable.ic_proton_sliders,
-            onClick = { onEvent(AccountSwitchEvent.OnManageAccounts) }
+        colors = CardDefaults.cardColors().copy(
+            containerColor = ProtonTheme.colors.backgroundInvertedSecondary
         )
+    ) {
+        Column(modifier = modifier) {
+            AddAnotherAccountButton(onEvent = onEvent)
+
+            HorizontalDivider(thickness = 1.dp, color = ProtonTheme.colors.separatorNorm)
+
+            ManageAccountsOnDeviceButton(onEvent = onEvent)
+
+            HorizontalDivider(thickness = 1.dp, color = ProtonTheme.colors.separatorNorm)
+        }
     }
 }
 
 @Composable
-private fun AddAnotherAccountButton(modifier: Modifier, onEvent: (AccountSwitchEvent) -> Unit) {
+private fun ManageAccountsOnDeviceButton(modifier: Modifier = Modifier, onEvent: (AccountSwitchEvent) -> Unit) {
+    ButtonWithIconAndText(
+        modifier = modifier,
+        text = R.string.manage_accounts_on_device,
+        icon = R.drawable.ic_proton_sliders,
+        onClick = { onEvent(AccountSwitchEvent.OnManageAccounts) }
+    )
+}
+
+@Composable
+private fun AddAnotherAccountButton(modifier: Modifier = Modifier, onEvent: (AccountSwitchEvent) -> Unit) {
     ButtonWithIconAndText(
         modifier = modifier,
         text = R.string.add_another_account,
diff --git a/shared/core/account-manager/presentation/src/main/res/values/strings.xml b/shared/core/account-manager/presentation/src/main/res/values/strings.xml
index 8f8372a9ae..f94e97ddef 100644
--- a/shared/core/account-manager/presentation/src/main/res/values/strings.xml
+++ b/shared/core/account-manager/presentation/src/main/res/values/strings.xml
@@ -32,4 +32,5 @@
     <string name="manage_accounts_on_device">Manage accounts on this device</string>
     <string name="add_another_account">Add another account</string>
     <string name="account_switcher_no_initials">NA</string>
+    <string name="manage_accounts_options">Options</string>
 </resources>