feat(account-setting): add feature flag for avatar customization

wmontwe · wmontwe · commit 10094f724c7c · 2025-10-22T15:01:44.000+02:00
diff --git a/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags
 
 class K9FeatureFlagFactory : FeatureFlagFactory {
     override fun createFeatureCatalog(): List<FeatureFlag> {
@@ -18,6 +19,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -5,11 +5,11 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags
 
 /**
  * Feature flags for K-9 Mail (release)
  */
-
 class K9FeatureFlagFactory : FeatureFlagFactory {
     override fun createFeatureCatalog(): List<FeatureFlag> {
         return listOf(
@@ -22,6 +22,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.AccountSettingsFeatureFlags
 
 /**
  * Feature flags for Thunderbird Beta
@@ -21,6 +22,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.AccountSettingsFeatureFlags
 
 /**
  * Feature flags for Thunderbird Daily
@@ -21,6 +22,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = true),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags
 
 /**
  * Feature flags for Thunderbird Debug
@@ -21,6 +22,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = true),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = true),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag
 import net.thunderbird.core.featureflag.FeatureFlagFactory
 import net.thunderbird.core.featureflag.FeatureFlagKey
 import net.thunderbird.core.featureflag.toFeatureFlagKey
+import net.thunderbird.feature.account.settings.AccountSettingsFeatureFlags
 
 /**
  * Feature flags for Thunderbird (release)
@@ -21,6 +22,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),
             FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
+            FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
         )
     }
 }
diff --git a/feature/account/settings/api/build.gradle.kts b/feature/account/settings/api/build.gradle.kts
@@ -9,4 +9,5 @@ android {
 
 dependencies {
     implementation(projects.core.ui.compose.navigation)
+    implementation(projects.core.featureflag)
 }
diff --git a/feature/account/settings/api/src/main/kotlin/net/thunderbird/feature/account/settings/api/AccountSettingsFeatureFlags.kt b/feature/account/settings/api/src/main/kotlin/net/thunderbird/feature/account/settings/api/AccountSettingsFeatureFlags.kt
@@ -0,0 +1,11 @@
+package net.thunderbird.feature.account.settings.api
+
+import net.thunderbird.core.featureflag.FeatureFlagKey
+
+object AccountSettingsFeatureFlags {
+
+    /**
+     * Feature flag to enable avatar customization in account settings.
+     */
+    val EnableAvatarCustomization = FeatureFlagKey("enable_avatar_customization")
+}
diff --git a/feature/account/settings/impl/build.gradle.kts b/feature/account/settings/impl/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation(projects.feature.account.avatar.api)
     implementation(projects.feature.account.avatar.impl)
 
+    implementation(projects.core.featureflag)
     implementation(projects.core.outcome)
 
     implementation(projects.core.ui.setting.api)
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
@@ -33,6 +33,7 @@ val featureAccountSettingsModule = module {
             repository = get(),
             resourceProvider = get(),
             monogramCreator = get(),
+            featureFlagProvider = 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
@@ -2,9 +2,12 @@ package net.thunderbird.feature.account.settings.impl.domain.usecase
 
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import net.thunderbird.core.featureflag.FeatureFlagProvider
 import net.thunderbird.core.outcome.Outcome
+import net.thunderbird.core.ui.setting.Setting
 import net.thunderbird.core.ui.setting.SettingDecoration
 import net.thunderbird.core.ui.setting.SettingValue
 import net.thunderbird.core.ui.setting.SettingValue.CompactSelectSingleOption.CompactOption
@@ -14,6 +17,7 @@ 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
+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags
 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
@@ -25,6 +29,7 @@ internal class GetGeneralSettings(
     private val repository: AccountProfileRepository,
     private val resourceProvider: ResourceProvider.GeneralResourceProvider,
     private val monogramCreator: AvatarMonogramCreator,
+    private val featureFlagProvider: FeatureFlagProvider,
 ) : UseCase.GetGeneralSettings {
     override fun invoke(accountId: AccountId): Flow<AccountSettingsOutcome> {
         return repository.getById(accountId).map { profile ->
@@ -41,38 +46,39 @@ internal class GetGeneralSettings(
     }
 
     private fun generateSettings(accountId: AccountId, profile: AccountProfile): Settings {
-        val profileIndicatorOptions = generateProfileIndicatorOptions(profile.id, profile.avatar, profile.name)
-
-        return persistentListOf(
-            SettingDecoration.Custom(
-                id = GeneralPreference.PROFILE.generateId(accountId),
-                customUi = resourceProvider.profileUi(
-                    name = profile.name,
-                    color = profile.color,
-                ),
+        val settings = mutableListOf<Setting>()
+        settings += SettingDecoration.Custom(
+            id = GeneralPreference.PROFILE.generateId(accountId),
+            customUi = resourceProvider.profileUi(
+                name = profile.name,
+                color = profile.color,
             ),
-            SettingValue.CompactSelectSingleOption(
+        )
+        if (featureFlagProvider.provide(AccountSettingsFeatureFlags.EnableAvatarCustomization).isEnabled()) {
+            val profileIndicatorOptions = generateProfileIndicatorOptions(profile.id, profile.avatar, profile.name)
+            settings += SettingValue.CompactSelectSingleOption(
                 id = GeneralPreference.PROFILE_INDICATOR.generateId(accountId),
                 title = resourceProvider.profileIndicatorTitle,
                 value = selectProfileIndicatorOption(profile, profileIndicatorOptions),
                 options = profileIndicatorOptions,
-            ),
-            SettingValue.Text(
-                id = GeneralPreference.NAME.generateId(accountId),
-                title = resourceProvider.nameTitle,
-                description = resourceProvider.nameDescription,
-                icon = resourceProvider.nameIcon,
-                value = profile.name,
-            ),
-            SettingValue.Color(
-                id = GeneralPreference.COLOR.generateId(accountId),
-                title = resourceProvider.colorTitle,
-                description = resourceProvider.colorDescription,
-                icon = resourceProvider.colorIcon,
-                value = profile.color,
-                colors = resourceProvider.colors,
-            ),
+            )
+        }
+        settings += SettingValue.Text(
+            id = GeneralPreference.NAME.generateId(accountId),
+            title = resourceProvider.nameTitle,
+            description = resourceProvider.nameDescription,
+            icon = resourceProvider.nameIcon,
+            value = profile.name,
+        )
+        settings += SettingValue.Color(
+            id = GeneralPreference.COLOR.generateId(accountId),
+            title = resourceProvider.colorTitle,
+            description = resourceProvider.colorDescription,
+            icon = resourceProvider.colorIcon,
+            value = profile.color,
+            colors = resourceProvider.colors,
         )
+        return settings.toImmutableList()
     }
 
     private fun selectProfileIndicatorOption(
diff --git a/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralSettingsTest.kt b/feature/account/settings/impl/src/test/kotlin/net/thunderbird/feature/account/settings/impl/domain/usecase/GetGeneralSettingsTest.kt
@@ -6,6 +6,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import kotlin.test.Test
 import kotlinx.coroutines.test.runTest
+import net.thunderbird.core.featureflag.FeatureFlagResult
 import net.thunderbird.core.outcome.Outcome
 import net.thunderbird.core.ui.setting.SettingDecoration
 import net.thunderbird.core.ui.setting.SettingValue
@@ -18,10 +19,10 @@ import net.thunderbird.feature.account.settings.impl.domain.AccountSettingsDomai
 import net.thunderbird.feature.account.settings.impl.domain.entity.GeneralPreference
 import net.thunderbird.feature.account.settings.impl.domain.entity.generateId
 
-internal class GetGeneralPreferencesTest {
+internal class GetGeneralSettingsTest {
 
     @Test
-    fun `should emit preferences when account profile present`() = runTest {
+    fun `should emit settings when account profile present`() = runTest {
         // Arrange
         val accountId = AccountIdFactory.create()
         val accountProfile = AccountProfile(
@@ -106,14 +107,53 @@ internal class GetGeneralPreferencesTest {
         }
     }
 
+    @Test
+    fun `should omit profile indicator when flag disabled`() = runTest {
+        // Arrange
+        val accountId = AccountIdFactory.create()
+        val accountProfile = AccountProfile(
+            id = accountId,
+            name = "Test Account",
+            color = 0xFF0000,
+            avatar = AccountAvatar.Icon(name = "star"),
+        )
+        val resourceProvider = FakeGeneralResourceProvider()
+        val testSubject = createTestSubject(accountProfile, resourceProvider, enableAvatarCustomization = false)
+
+        // Act & Assert
+        testSubject(accountId).test {
+            val outcome = awaitItem()
+            assertThat(outcome).isInstanceOf(Outcome.Success::class)
+
+            val success = outcome as Outcome.Success
+            val settings = success.data
+
+            assertThat(settings.size).isEqualTo(3)
+            // Ensure second item is Name (no indicator)
+            assertThat(settings[1]).isEqualTo(
+                SettingValue.Text(
+                    id = GeneralPreference.NAME.generateId(accountId),
+                    title = resourceProvider.nameTitle,
+                    description = resourceProvider.nameDescription,
+                    icon = resourceProvider.nameIcon,
+                    value = accountProfile.name,
+                ),
+            )
+        }
+    }
+
     private fun createTestSubject(
         accountProfile: AccountProfile? = null,
         resourceProvider: ResourceProvider.GeneralResourceProvider = FakeGeneralResourceProvider(),
+        enableAvatarCustomization: Boolean = true,
     ): UseCase.GetGeneralSettings {
         return GetGeneralSettings(
             repository = FakeAccountProfileRepository(accountProfile),
             resourceProvider = resourceProvider,
             monogramCreator = FakeMonogramCreator(),
+            featureFlagProvider = {
+                if (enableAvatarCustomization) FeatureFlagResult.Enabled else FeatureFlagResult.Disabled
+            },
         )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import net.thunderbird.core.featureflag.FeatureFlag`
`5`	`5`	`import net.thunderbird.core.featureflag.FeatureFlagFactory`
`6`	`6`	`import net.thunderbird.core.featureflag.FeatureFlagKey`
`7`	`7`	`import net.thunderbird.core.featureflag.toFeatureFlagKey`
	`8`	`+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags`
`8`	`9`
`9`	`10`	`class K9FeatureFlagFactory : FeatureFlagFactory {`
`10`	`11`	`override fun createFeatureCatalog(): List<FeatureFlag> {`
`@@ -18,6 +19,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {`
`18`	`19`	`FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),`
`19`	`20`	`FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),`
`20`	`21`	`FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),`
	`22`	`+ FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),`
`21`	`23`	`)`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ import net.thunderbird.core.featureflag.FeatureFlag`
`5`	`5`	`import net.thunderbird.core.featureflag.FeatureFlagFactory`
`6`	`6`	`import net.thunderbird.core.featureflag.FeatureFlagKey`
`7`	`7`	`import net.thunderbird.core.featureflag.toFeatureFlagKey`
	`8`	`+import net.thunderbird.feature.account.settings.api.AccountSettingsFeatureFlags`
`8`	`9`
`9`	`10`	`/**`
`10`	`11`	`* Feature flags for K-9 Mail (release)`
`11`	`12`	`*/`
`12`		`-`
`13`	`13`	`class K9FeatureFlagFactory : FeatureFlagFactory {`
`14`	`14`	`override fun createFeatureCatalog(): List<FeatureFlag> {`
`15`	`15`	`return listOf(`
`@@ -22,6 +22,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {`
`22`	`22`	`FeatureFlag(FeatureFlagKey.DisplayInAppNotifications, enabled = false),`
`23`	`23`	`FeatureFlag(FeatureFlagKey.UseNotificationSenderForSystemNotifications, enabled = false),`
`24`	`24`	`FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),`
	`25`	`+ FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),`
`25`	`26`	`)`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ android {`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`implementation(projects.core.ui.compose.navigation)`
	`12`	`+ implementation(projects.core.featureflag)`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ val featureAccountSettingsModule = module {`
`33`	`33`	`repository = get(),`
`34`	`34`	`resourceProvider = get(),`
`35`	`35`	`monogramCreator = get(),`
	`36`	`+ featureFlagProvider = get(),`
`36`	`37`	`)`
`37`	`38`	`}`
`38`	`39`