refactor(message-reader): use CSS providers instead of building css directly on DisplayHtml

The key changes include:
- Moving `HtmlSettings.kt` and `HtmlSettingsProvider.kt` to :core:common.
- Introducing `CssClassNameProvider`, `GlobalCssStyleProvider`, `PlainTextMessagePreElementCssStyleProvider`, and `SignatureCssStyleProvider` to dynamically generate CSS for message display.
- Updating `DisplayHtml`, `HtmlProcessor`, and their factories to use these new providers.
- Refactoring dependency injection to provide the new CSS services.
- Using CSS variables for blockquote border colors in `EmailTextToHtml`.

Author: rafaeltonholo

app-common/src/main/kotlin/net/thunderbird/android/feature/mail/message/reader/api/css/DefaultCssClassNameProvider.kt

@@ -13,9 +13,9 @@ class DefaultCssClassNameProvider(
     override val mainContentClassName: String = "${defaultNamespaceClassName}__main-content"
     override val plainTextMessagePreClassName: String =
         if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {
-            EmailTextToHtml.K9MAIL_CSS_CLASS
-        } else {
             "${defaultNamespaceClassName}__plain-text-message-pre"
+        } else {
+            EmailTextToHtml.K9MAIL_CSS_CLASS
         }
     override val signatureClassName: String =
         if (featureFlagProvider.provide(MessageReaderFeatureFlags.UseNewMessageReaderCssStyles).isEnabled()) {

app-k9mail/src/test/kotlin/app/k9mail/DependencyInjectionTest.kt

@@ -15,15 +15,18 @@ import com.fsck.k9.job.MailSyncWorker
 import com.fsck.k9.job.SyncDebugWorker
 import com.fsck.k9.mailstore.AttachmentResolver
 import com.fsck.k9.message.html.DisplayHtml
-import com.fsck.k9.message.html.HtmlSettings
+import com.fsck.k9.message.html.DisplayHtmlFactory
 import com.fsck.k9.ui.changelog.ChangeLogMode
 import com.fsck.k9.ui.changelog.ChangelogViewModel
+import com.fsck.k9.ui.helper.DisplayHtmlUiFactory
 import com.fsck.k9.view.K9WebViewClient
 import com.fsck.k9.view.MessageWebView
 import net.openid.appauth.AppAuthConfiguration
+import net.thunderbird.core.common.mail.html.HtmlSettings
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.feature.account.AccountId
 import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract
+import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import org.junit.Test
 import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.test.verify.definition
@@ -53,7 +56,13 @@ class DependencyInjectionTest {
             injections = injectedParameters(
                 definition<AccountRemoverWorker>(WorkerParameters::class),
                 definition<ChangelogViewModel>(ChangeLogMode::class),
-                definition<DisplayHtml>(HtmlSettings::class),
+                definition<DisplayHtml>(
+                    HtmlSettings::class,
+                    CssClassNameProvider::class,
+                    List::class,
+                ),
+                definition<DisplayHtmlFactory>(List::class),
+                definition<DisplayHtmlUiFactory>(List::class),
                 definition<K9WebViewClient>(AttachmentResolver::class, MessageWebView.OnPageFinishedListener::class),
                 definition<MailSyncWorker>(WorkerParameters::class),
                 definition<SyncDebugWorker>(WorkerParameters::class),

app-thunderbird/src/test/kotlin/net/thunderbird/android/DependencyInjectionTest.kt

@@ -15,15 +15,18 @@ import com.fsck.k9.job.MailSyncWorker
 import com.fsck.k9.job.SyncDebugWorker
 import com.fsck.k9.mailstore.AttachmentResolver
 import com.fsck.k9.message.html.DisplayHtml
-import com.fsck.k9.message.html.HtmlSettings
+import com.fsck.k9.message.html.DisplayHtmlFactory
 import com.fsck.k9.ui.changelog.ChangeLogMode
 import com.fsck.k9.ui.changelog.ChangelogViewModel
+import com.fsck.k9.ui.helper.DisplayHtmlUiFactory
 import com.fsck.k9.view.K9WebViewClient
 import com.fsck.k9.view.MessageWebView
 import net.openid.appauth.AppAuthConfiguration
+import net.thunderbird.core.common.mail.html.HtmlSettings
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.feature.account.AccountId
 import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract
+import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import org.junit.Test
 import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.test.verify.definition
@@ -53,7 +56,13 @@ class DependencyInjectionTest {
             injections = injectedParameters(
                 definition<AccountRemoverWorker>(WorkerParameters::class),
                 definition<ChangelogViewModel>(ChangeLogMode::class),
-                definition<DisplayHtml>(HtmlSettings::class),
+                definition<DisplayHtml>(
+                    HtmlSettings::class,
+                    CssClassNameProvider::class,
+                    List::class,
+                ),
+                definition<DisplayHtmlFactory>(List::class),
+                definition<DisplayHtmlUiFactory>(List::class),
                 definition<K9WebViewClient>(AttachmentResolver::class, MessageWebView.OnPageFinishedListener::class),
                 definition<MailSyncWorker>(WorkerParameters::class),
                 definition<SyncDebugWorker>(WorkerParameters::class),

cli/html-cleaner-cli/build.gradle.kts

@@ -9,6 +9,8 @@ application {
 }
 
 dependencies {
+    implementation(projects.core.featureflag)
+    implementation(projects.feature.mail.message.reader.api)
     implementation(projects.library.htmlCleaner)
 
     implementation(libs.clikt)

cli/html-cleaner-cli/src/main/kotlin/app/k9mail/cli/html/cleaner/Main.kt

@@ -6,10 +6,14 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.default
 import com.github.ajalt.clikt.parameters.arguments.optional
+import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.inputStream
 import java.io.File
+import net.thunderbird.core.featureflag.FeatureFlagResult
+import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import okio.buffer
 import okio.sink
 import okio.source
@@ -19,6 +23,10 @@ class HtmlCleaner : CliktCommand() {
     val input by argument(help = "HTML input file (needs to be UTF-8 encoded)")
         .inputStream()
 
+    val app by argument(help = "The app the email will be target to")
+        .enum<App>(ignoreCase = true)
+        .default(App.THUNDERBIRD)
+
     val output by argument(help = "Output file")
         .file(mustExist = false, canBeDir = false)
         .optional()
@@ -38,7 +46,21 @@ class HtmlCleaner : CliktCommand() {
 
     private fun cleanHtml(html: String): String {
         val htmlProcessor = HtmlProcessor(
-            object : HtmlHeadProvider {
+            featureFlagProvider = { FeatureFlagResult.Enabled },
+            cssClassNameProvider = object : CssClassNameProvider {
+                override val defaultNamespaceClassName: String
+                    get() = if (app == App.THUNDERBIRD) {
+                        "net_thunderbird_android"
+                    } else {
+                        "com_fsck_k9"
+                    }
+                override val rootClassName: String = "${defaultNamespaceClassName}__message-viewer"
+                override val mainContentClassName: String = "${defaultNamespaceClassName}__main-content"
+                override val plainTextMessagePreClassName: String =
+                    "${defaultNamespaceClassName}__plain-text-message-pre"
+                override val signatureClassName: String = "${defaultNamespaceClassName}__signature"
+            },
+            htmlHeadProvider = object : HtmlHeadProvider {
                 override val headHtml = """<meta name="viewport" content="width=device-width"/>"""
             },
         )
@@ -57,4 +79,6 @@ class HtmlCleaner : CliktCommand() {
     }
 }
 
+enum class App { THUNDERBIRD, K9MAIL }
+
 fun main(args: Array<String>) = HtmlCleaner().main(args)

core/common/src/commonMain/kotlin/net/thunderbird/core/common/inject/KoinMultibindingCollection.kt

@@ -29,6 +29,25 @@ inline fun <reified T> Module.singleListOf(vararg items: Definition<T>, qualifie
     }
 }
 
+/**
+ * Defines a factory for a list of elements of type [T].
+ *
+ * This function creates a factory definition for a list of elements. Each time this list is
+ * requested, a new list is created, and each element in the list is resolved anew from the
+ * provided [items] definitions.
+ *
+ * @param T The type of elements in the list.
+ * @param items Vararg of [Definition]s that will be resolved and added to the list.
+ * @param qualifier Optional [Qualifier] to distinguish this list from others of the same type.
+ *                  If null, a default qualifier based on the type [T] will be used.
+ */
+@KoinDslMarker
+inline fun <reified T> Module.factoryListOf(vararg items: Definition<T>, qualifier: Qualifier? = null) {
+    factory(qualifier ?: defaultListQualifier<T>()) {
+        items.map { definition -> definition(this, parametersOf()) }
+    }
+}
+
 /**
  * Resolves a [List] of instances of type [T].
  * This is a helper function for Koin's multibinding feature.

…com/fsck/k9/message/html/HtmlSettings.kt …rd/core/common/mail/html/HtmlSettings.ktlegacy/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt renamed to core/common/src/commonMain/kotlin/net/thunderbird/core/common/mail/html/HtmlSettings.kt legacy/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt renamed to core/common/src/commonMain/kotlin/net/thunderbird/core/common/mail/html/HtmlSettings.kt

@@ -1,4 +1,4 @@
-package com.fsck.k9.message.html
+package net.thunderbird.core.common.mail.html
 
 data class HtmlSettings(
     val useDarkMode: Boolean,

core/common/src/commonMain/kotlin/net/thunderbird/core/common/mail/html/HtmlSettingsProvider.kt

@@ -0,0 +1,5 @@
+package net.thunderbird.core.common.mail.html
+
+fun interface HtmlSettingsProvider {
+    fun create(): HtmlSettings
+}

feature/mail/message/composer/build.gradle.kts

@@ -8,6 +8,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.common)
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.ui.theme.api)
     implementation(projects.feature.notification.api)

feature/mail/message/composer/src/main/kotlin/net/thunderbird/feature/mail/message/composer/html/MessageComposerHtmlSettingsProvider.kt

@@ -0,0 +1,16 @@
+package net.thunderbird.feature.mail.message.composer.html
+
+import net.thunderbird.core.common.mail.html.HtmlSettings
+import net.thunderbird.core.common.mail.html.HtmlSettingsProvider
+import net.thunderbird.core.ui.theme.api.Theme
+import net.thunderbird.core.ui.theme.api.ThemeManager
+
+interface MessageComposerHtmlSettingsProvider : HtmlSettingsProvider
+
+internal fun MessageComposerHtmlSettingsProvider(themeManager: ThemeManager): MessageComposerHtmlSettingsProvider =
+    object : MessageComposerHtmlSettingsProvider {
+        override fun create(): HtmlSettings = HtmlSettings(
+            useDarkMode = themeManager.messageComposeTheme == Theme.DARK,
+            useFixedWidthFont = false,
+        )
+    }