feat(account-setting): wire avatar to indicator selection

wmontwe · wmontwe · commit c5ae4f18d64f · 2025-10-30T13:36:50.000+01:00
diff --git a/core/ui/setting/api/src/commonMain/kotlin/net/thunderbird/core/ui/setting/SettingValue.kt b/core/ui/setting/api/src/commonMain/kotlin/net/thunderbird/core/ui/setting/SettingValue.kt
@@ -69,23 +69,24 @@ sealed interface SettingValue<T> : Setting {
      * @param value The currently selected option.
      * @param options The list of available options to choose from.
      */
-    data class CompactSelectSingleOption(
+    data class CompactSelectSingleOption<T>(
         override val id: String,
         val title: () -> String,
         val description: () -> String? = { null },
-        override val value: CompactOption,
-        val options: ImmutableList<CompactOption>,
-    ) : SettingValue<CompactOption> {
+        override val value: CompactOption<T>,
+        val options: ImmutableList<CompactOption<T>>,
+    ) : SettingValue<CompactOption<T>> {
         override val requiresEditView: Boolean = false
 
         init {
             require(options.size >= 2) { "There must be at least two options." }
             require(options.size <= 4) { "There can be at most four options." }
         }
 
-        data class CompactOption(
+        data class CompactOption<T>(
             val id: String,
             val title: () -> String,
+            val value: T,
         )
     }
 
diff --git a/core/ui/setting/impl-dialog/src/debug/kotlin/net/thunderbird/core/ui/setting/dialog/ui/fake/FakeSettingData.kt b/core/ui/setting/impl-dialog/src/debug/kotlin/net/thunderbird/core/ui/setting/dialog/ui/fake/FakeSettingData.kt
@@ -30,9 +30,9 @@ internal object FakeSettingData {
     )
 
     private val compactOptions = persistentListOf(
-        CompactOption("1") { "Choice 1" },
-        CompactOption("2") { "Choice 2" },
-        CompactOption("3") { "Choice 3" },
+        CompactOption(id = "1", title = { "Option 1" }, value = "1"),
+        CompactOption(id = "2", title = { "Option 2" }, value = "2"),
+        CompactOption(id = "3", title = { "Option 3" }, value = "3"),
     )
 
     val compactSelectSingleOption = SettingValue.CompactSelectSingleOption(
@@ -44,12 +44,12 @@ internal object FakeSettingData {
     )
 
     private val options = persistentListOf(
-        Option("1") { "Compact Choice 1" },
-        Option("2") { "Compact Choice 2" },
-        Option("3") { "Compact Choice 3" },
-        Option("1") { "Compact Choice 4" },
-        Option("2") { "Compact Choice 5" },
-        Option("3") { "Compact Choice 6" },
+        Option("1") { "Option 1" },
+        Option("2") { "Option 2" },
+        Option("3") { "Option 3" },
+        Option("4") { "Option 4" },
+        Option("5") { "Option 5" },
+        Option("6") { "Option 6" },
     )
 
     val selectSingleOption = SettingValue.SelectSingleOption(
diff --git a/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/dialog/SettingDialog.kt b/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/dialog/SettingDialog.kt
@@ -52,6 +52,6 @@ internal fun SettingDialog(
         }
 
         // No dialog needed
-        is SettingValue.CompactSelectSingleOption, is SettingValue.Switch -> Unit
+        is SettingValue.CompactSelectSingleOption<*>, is SettingValue.Switch -> Unit
     }
 }
diff --git a/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/list/SettingItem.kt b/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/list/SettingItem.kt
@@ -63,7 +63,7 @@ private fun RenderSettingValue(
             )
         }
 
-        is SettingValue.CompactSelectSingleOption -> {
+        is SettingValue.CompactSelectSingleOption<*> -> {
             CompactSelectSingleOptionItem(
                 setting = setting,
                 onSettingValueChange = onSettingValueChange,
diff --git a/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/list/value/CompactSelectSingleOptionItem.kt b/core/ui/setting/impl-dialog/src/main/kotlin/net/thunderbird/core/ui/setting/dialog/ui/components/list/value/CompactSelectSingleOptionItem.kt
@@ -12,8 +12,8 @@ import app.k9mail.core.ui.compose.theme2.MainTheme
 import net.thunderbird.core.ui.setting.SettingValue
 
 @Composable
-internal fun CompactSelectSingleOptionItem(
-    setting: SettingValue.CompactSelectSingleOption,
+internal fun <T> CompactSelectSingleOptionItem(
+    setting: SettingValue.CompactSelectSingleOption<T>,
     onSettingValueChange: (SettingValue<*>) -> Unit,
     modifier: Modifier = Modifier,
 ) {
diff --git a/feature/account/settings/impl/build.gradle.kts b/feature/account/settings/impl/build.gradle.kts
@@ -14,8 +14,10 @@ android {
 }
 
 dependencies {
+    api(projects.feature.account.api)
     api(projects.feature.account.settings.api)
     implementation(projects.feature.account.core)
+    implementation(projects.feature.account.avatar.api)
     implementation(projects.feature.account.avatar.impl)
 
     implementation(projects.core.outcome)
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/AccountSettingsModule.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/AccountSettingsModule.kt
@@ -32,6 +32,7 @@ val featureAccountSettingsModule = module {
         GetGeneralSettings(
             repository = get(),
             resourceProvider = get(),
+            monogramCreator = get(),
         )
     }
 
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralSettings.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralSettings.kt
@@ -10,6 +10,7 @@ import net.thunderbird.core.ui.setting.SettingValue
 import net.thunderbird.core.ui.setting.SettingValue.CompactSelectSingleOption.CompactOption
 import net.thunderbird.core.ui.setting.Settings
 import net.thunderbird.feature.account.AccountId
+import net.thunderbird.feature.account.avatar.AvatarMonogramCreator
 import net.thunderbird.feature.account.profile.AccountAvatar
 import net.thunderbird.feature.account.profile.AccountProfile
 import net.thunderbird.feature.account.profile.AccountProfileRepository
@@ -23,6 +24,7 @@ import net.thunderbird.feature.account.settings.impl.domain.entity.generateId
 internal class GetGeneralSettings(
     private val repository: AccountProfileRepository,
     private val resourceProvider: ResourceProvider.GeneralResourceProvider,
+    private val monogramCreator: AvatarMonogramCreator,
 ) : UseCase.GetGeneralSettings {
     override fun invoke(accountId: AccountId): Flow<AccountSettingsOutcome> {
         return repository.getById(accountId).map { profile ->
@@ -39,7 +41,7 @@ internal class GetGeneralSettings(
     }
 
     private fun generateSettings(accountId: AccountId, profile: AccountProfile): Settings {
-        val profileIndicatorOptions = generateProfileIndicatorOptions(profile.id)
+        val profileIndicatorOptions = generateProfileIndicatorOptions(profile.id, profile.avatar, profile.name)
 
         return persistentListOf(
             SettingDecoration.Custom(
@@ -73,33 +75,51 @@ internal class GetGeneralSettings(
         )
     }
 
-    private fun selectProfileIndicatorOption(profile: AccountProfile, options: List<CompactOption>): CompactOption {
+    private fun selectProfileIndicatorOption(
+        profile: AccountProfile,
+        options: List<CompactOption<AccountAvatar>>,
+    ): CompactOption<AccountAvatar> {
         return when (profile.avatar) {
             is AccountAvatar.Monogram -> options.first {
                 it.id == generateMonogramId(profile.id.asRaw())
             }
+
             is AccountAvatar.Image -> options.first {
                 it.id == generateImageId(profile.id.asRaw())
             }
+
             is AccountAvatar.Icon -> options.first {
                 it.id == generateIconId(profile.id.asRaw())
             }
         }
     }
 
-    private fun generateProfileIndicatorOptions(accountId: AccountId): ImmutableList<CompactOption> {
+    private fun generateProfileIndicatorOptions(
+        accountId: AccountId,
+        avatar: AccountAvatar,
+        name: String,
+    ): ImmutableList<CompactOption<AccountAvatar>> {
         return persistentListOf(
             CompactOption(
                 id = generateMonogramId(accountId.asRaw()),
                 title = resourceProvider.profileIndicatorMonogram,
+                value = avatar as? AccountAvatar.Monogram ?: AccountAvatar.Monogram(
+                    value = monogramCreator.create(name, null),
+                ),
             ),
             CompactOption(
                 id = generateImageId(accountId.asRaw()),
                 title = resourceProvider.profileIndicatorImage,
+                value = avatar as? AccountAvatar.Image ?: AccountAvatar.Image(
+                    uri = "avatar_placeholder_uri",
+                ),
             ),
             CompactOption(
                 id = generateIconId(accountId.asRaw()),
                 title = resourceProvider.profileIndicatorIcon,
+                value = avatar as? AccountAvatar.Icon ?: AccountAvatar.Icon(
+                    name = "user",
+                ),
             ),
         )
     }
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/UpdateGeneralSettings.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/UpdateGeneralSettings.kt
@@ -3,6 +3,7 @@ package net.thunderbird.feature.account.settings.impl.domain.usecase
 import kotlinx.coroutines.flow.firstOrNull
 import net.thunderbird.core.outcome.Outcome
 import net.thunderbird.core.ui.setting.SettingValue
+import net.thunderbird.core.ui.setting.SettingValue.CompactSelectSingleOption.CompactOption
 import net.thunderbird.feature.account.AccountId
 import net.thunderbird.feature.account.profile.AccountAvatar
 import net.thunderbird.feature.account.profile.AccountProfile
@@ -21,7 +22,16 @@ internal class UpdateGeneralSettings(
     ): Outcome<Unit, SettingsError> {
         return when (setting.id) {
             GeneralPreference.PROFILE_INDICATOR.generateId(accountId) -> {
-                val avatar = setting.value as AccountAvatar
+                val option = setting.value as CompactOption<*>
+                val avatar = option.value as? AccountAvatar
+
+                if (avatar == null) {
+                    return Outcome.failure(
+                        SettingsError.NotFound(
+                            message = "Invalid avatar option selected for accountId: $accountId",
+                        ),
+                    )
+                }
                 updateAccountProfile(accountId) {
                     copy(avatar = avatar)
                 }
diff --git a/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/FakeMonogramCreator.kt b/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/FakeMonogramCreator.kt
@@ -0,0 +1,9 @@
+package net.thunderbird.feature.account.settings.impl.domain.usecase
+
+import net.thunderbird.feature.account.avatar.AvatarMonogramCreator
+
+internal class FakeMonogramCreator : AvatarMonogramCreator {
+    override fun create(name: String?, email: String?): String {
+        return name?.take(2)?.uppercase() ?: "XX"
+    }
+}
diff --git a/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralPreferencesTest.kt b/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralPreferencesTest.kt
@@ -5,7 +5,6 @@ import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import kotlin.test.Test
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.test.runTest
 import net.thunderbird.core.outcome.Outcome
 import net.thunderbird.core.ui.setting.SettingDecoration
@@ -16,6 +15,8 @@ import net.thunderbird.feature.account.profile.AccountProfile
 import net.thunderbird.feature.account.settings.impl.domain.AccountSettingsDomainContract.ResourceProvider
 import net.thunderbird.feature.account.settings.impl.domain.AccountSettingsDomainContract.SettingsError
 import net.thunderbird.feature.account.settings.impl.domain.AccountSettingsDomainContract.UseCase
+import net.thunderbird.feature.account.settings.impl.domain.entity.GeneralPreference
+import net.thunderbird.feature.account.settings.impl.domain.entity.generateId
 
 internal class GetGeneralPreferencesTest {
 
@@ -38,32 +39,52 @@ internal class GetGeneralPreferencesTest {
             assertThat(outcome).isInstanceOf(Outcome.Success::class)
 
             val success = outcome as Outcome.Success
-            assertThat(success.data).isEqualTo(
-                persistentListOf(
-                    SettingDecoration.Custom(
-                        id = "${accountId.asRaw()}-general-profile",
-                        customUi = resourceProvider.profileUi(
-                            name = accountProfile.name,
-                            color = accountProfile.color,
-                        ),
-                    ),
-                    SettingValue.Text(
-                        id = "${accountId.asRaw()}-general-name",
-                        title = resourceProvider.nameTitle,
-                        description = resourceProvider.nameDescription,
-                        icon = resourceProvider.nameIcon,
-                        value = accountProfile.name,
-                    ),
-                    SettingValue.Color(
-                        id = "${accountId.asRaw()}-general-color",
-                        title = resourceProvider.colorTitle,
-                        description = resourceProvider.colorDescription,
-                        icon = resourceProvider.colorIcon,
-                        value = accountProfile.color,
-                        colors = resourceProvider.colors,
+            val settings = success.data
+
+            assertThat(settings[0]).isEqualTo(
+                SettingDecoration.Custom(
+                    id = "${accountId.asRaw()}-general-profile",
+                    customUi = resourceProvider.profileUi(
+                        name = accountProfile.name,
+                        color = accountProfile.color,
                     ),
                 ),
             )
+
+            val profileIndicator = settings[1] as SettingValue.CompactSelectSingleOption<*>
+            assertThat(profileIndicator.id).isEqualTo(GeneralPreference.PROFILE_INDICATOR.generateId(accountId))
+            assertThat(profileIndicator.options.size).isEqualTo(3)
+
+            assertThat(settings[2]).isEqualTo(
+                SettingValue.Text(
+                    id = "${accountId.asRaw()}-general-name",
+                    title = resourceProvider.nameTitle,
+                    description = resourceProvider.nameDescription,
+                    icon = resourceProvider.nameIcon,
+                    value = accountProfile.name,
+                ),
+            )
+
+            assertThat(settings[2]).isEqualTo(
+                SettingValue.Text(
+                    id = "${accountId.asRaw()}-general-name",
+                    title = resourceProvider.nameTitle,
+                    description = resourceProvider.nameDescription,
+                    icon = resourceProvider.nameIcon,
+                    value = accountProfile.name,
+                ),
+            )
+
+            assertThat(settings[3]).isEqualTo(
+                SettingValue.Color(
+                    id = "${accountId.asRaw()}-general-color",
+                    title = resourceProvider.colorTitle,
+                    description = resourceProvider.colorDescription,
+                    icon = resourceProvider.colorIcon,
+                    value = accountProfile.color,
+                    colors = resourceProvider.colors,
+                ),
+            )
         }
     }
 
@@ -92,6 +113,7 @@ internal class GetGeneralPreferencesTest {
         return GetGeneralSettings(
             repository = FakeAccountProfileRepository(accountProfile),
             resourceProvider = resourceProvider,
+            monogramCreator = FakeMonogramCreator(),
         )
     }
 }
diff --git a/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/UpdateGeneralSettingsTest.kt b/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/UpdateGeneralSettingsTest.kt

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ internal fun SettingDialog(`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// No dialog needed`
`55`		`- is SettingValue.CompactSelectSingleOption, is SettingValue.Switch -> Unit`
	`55`	`+ is SettingValue.CompactSelectSingleOption<*>, is SettingValue.Switch -> Unit`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private fun RenderSettingValue(`
`63`	`63`	`)`
`64`	`64`	`}`
`65`	`65`
`66`		`- is SettingValue.CompactSelectSingleOption -> {`
	`66`	`+ is SettingValue.CompactSelectSingleOption<*> -> {`
`67`	`67`	`CompactSelectSingleOptionItem(`
`68`	`68`	`setting = setting,`
`69`	`69`	`onSettingValueChange = onSettingValueChange,`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,10 @@ android {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`dependencies {`
	`17`	`+ api(projects.feature.account.api)`
`17`	`18`	`api(projects.feature.account.settings.api)`
`18`	`19`	`implementation(projects.feature.account.core)`
	`20`	`+ implementation(projects.feature.account.avatar.api)`
`19`	`21`	`implementation(projects.feature.account.avatar.impl)`
`20`	`22`
`21`	`23`	`implementation(projects.core.outcome)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ val featureAccountSettingsModule = module {`
`32`	`32`	`GetGeneralSettings(`
`33`	`33`	`repository = get(),`
`34`	`34`	`resourceProvider = get(),`
	`35`	`+ monogramCreator = get(),`
`35`	`36`	`)`
`36`	`37`	`}`
`37`	`38`