chore(message-reader): add use_new_message_reader_css_styles feature flag

rafaeltonholo · rafaeltonholo · commit e32bc2e3e266 · 2025-11-19T10:36:46.000-04:00
diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
@@ -142,6 +142,7 @@ dependencies {
     implementation(projects.core.ui.legacy.theme2.k9mail)
     implementation(projects.feature.launcher)
     implementation(projects.feature.mail.message.list)
+    implementation(projects.feature.mail.message.reader.api)
 
     implementation(projects.legacy.core)
     implementation(projects.legacy.ui.legacy)
diff --git a/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 class K9FeatureFlagFactory : FeatureFlagFactory {
     override fun createFeatureCatalog(): List<FeatureFlag> {
@@ -20,6 +21,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
         )
     }
 }
diff --git a/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 /**
  * Feature flags for K-9 Mail (release)
@@ -23,6 +24,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = false),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
@@ -222,6 +222,7 @@ dependencies {
 
     implementation(projects.feature.account.settings.impl)
     implementation(projects.feature.mail.message.list)
+    implementation(projects.feature.mail.message.reader.api)
 
     implementation(projects.feature.widget.messageList)
     implementation(projects.feature.widget.messageListGlance)
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
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 /**
  * Feature flags for Thunderbird Beta
@@ -23,6 +24,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = false),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, 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
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 /**
  * Feature flags for Thunderbird Daily
@@ -23,6 +24,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
         )
     }
 }
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
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 /**
  * Feature flags for Thunderbird Debug
@@ -23,6 +24,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),
         )
     }
 }
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
@@ -7,6 +7,7 @@ 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
+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags
 
 /**
  * Feature flags for Thunderbird (release)
@@ -23,6 +24,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),
             FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = false),
             FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),
+            FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = false),
         )
     }
 }
diff --git a/feature/mail/message/reader/api/build.gradle.kts b/feature/mail/message/reader/api/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 kotlin {
     sourceSets {
         commonMain.dependencies {
+            implementation(projects.core.common)
+            implementation(projects.core.featureflag)
         }
     }
 }
diff --git a/feature/mail/message/reader/api/src/commonMain/kotlin/net/thunderbird/feature/mail/message/reader/api/.gitkeep b/feature/mail/message/reader/api/src/commonMain/kotlin/net/thunderbird/feature/mail/message/reader/api/.gitkeep
diff --git a/feature/mail/message/reader/api/src/commonMain/kotlin/net/thunderbird/feature/mail/message/reader/api/MessageReaderFeatureFlags.kt b/feature/mail/message/reader/api/src/commonMain/kotlin/net/thunderbird/feature/mail/message/reader/api/MessageReaderFeatureFlags.kt
@@ -0,0 +1,7 @@
+package net.thunderbird.feature.mail.message.reader.api
+
+import net.thunderbird.core.featureflag.FeatureFlagKey
+
+object MessageReaderFeatureFlags {
+    val UseNewMessageReaderCssStyles = FeatureFlagKey("use_new_message_reader_css_styles")
+}

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import net.thunderbird.core.featureflag.FeatureFlagFactory`
`7`	`7`	`import net.thunderbird.core.featureflag.FeatureFlagKey`
`8`	`8`	`import net.thunderbird.core.featureflag.toFeatureFlagKey`
`9`	`9`	`import net.thunderbird.feature.account.settings.AccountSettingsFeatureFlags`
	`10`	`+import net.thunderbird.feature.mail.message.reader.api.MessageReaderFeatureFlags`
`10`	`11`
`11`	`12`	`class K9FeatureFlagFactory : FeatureFlagFactory {`
`12`	`13`	`override fun createFeatureCatalog(): List<FeatureFlag> {`
`@@ -20,6 +21,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {`
`20`	`21`	`FeatureFlag(MessageListFeatureFlags.UseComposeForMessageListItems, enabled = false),`
`21`	`22`	`FeatureFlag(MessageViewFeatureFlags.ActionExportEml, enabled = true),`
`22`	`23`	`FeatureFlag(AccountSettingsFeatureFlags.EnableAvatarCustomization, enabled = false),`
	`24`	`+ FeatureFlag(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles, enabled = true),`
`23`	`25`	`)`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ plugins {`
`5`	`5`	`kotlin {`
`6`	`6`	`sourceSets {`
`7`	`7`	`commonMain.dependencies {`
	`8`	`+ implementation(projects.core.common)`
	`9`	`+ implementation(projects.core.featureflag)`
`8`	`10`	`}`
`9`	`11`	`}`
`10`	`12`	`}`