fix: modifications to theme configs didn't take effect

- refactor: use ThemeStub as placeholder to list theme, and initialize real theme when selecting

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/theme/Theme.kt

@@ -4,6 +4,7 @@
 
 package com.osfans.trime.data.theme
 
+import com.osfans.trime.core.Rime
 import com.osfans.trime.data.theme.mapper.GeneralStyleMapper
 import com.osfans.trime.data.theme.model.ColorScheme
 import com.osfans.trime.data.theme.model.GeneralStyle
@@ -15,7 +16,14 @@ import timber.log.Timber
 class Theme(
     val configId: String,
 ) {
-    private val config = Config.create(configId)
+    private val config: Config
+
+    init {
+        if (!Rime.deployRimeConfigFile(configId, CONFIG_VERSION_KEY)) {
+            throw IllegalArgumentException("Failed to deploy theme config file '$configId'")
+        }
+        config = Config.create(configId)
+    }
 
     val name = config.getString("name")
     val generalStyle = mapToGeneralStyle()
@@ -62,4 +70,8 @@ class Theme(
         )
         return generalStyle
     }
+
+    companion object {
+        private const val CONFIG_VERSION_KEY = "config_version"
+    }
 }

app/src/main/java/com/osfans/trime/data/theme/ThemeFilesManager.kt

@@ -5,29 +5,36 @@
 
 package com.osfans.trime.data.theme
 
-import com.osfans.trime.core.Rime
-import com.osfans.trime.data.base.DataManager
+import com.charleskorn.kaml.AnchorsAndAliases
+import com.charleskorn.kaml.Yaml
+import com.charleskorn.kaml.YamlConfiguration
 import timber.log.Timber
 import java.io.File
 
 object ThemeFilesManager {
-    private const val CONFIG_VERSION_KEY = "config_version"
+    private val yaml =
+        Yaml(
+            configuration =
+                YamlConfiguration(
+                    strictMode = false,
+                    anchorsAndAliases = AnchorsAndAliases.Permitted(200u),
+                ),
+        )
 
-    fun listThemes(dir: File): MutableList<Theme> {
+    fun listThemes(dir: File): MutableList<ThemeStub> {
         val files = dir.listFiles { _, name -> name.endsWith("trime.yaml") } ?: return mutableListOf()
         return files
             .sortedByDescending { it.lastModified() }
             .mapNotNull decode@{
-                val deployed = DataManager.userDataDir.resolve("build/${it.name}")
-                if (!deployed.exists()) {
-                    if (!Rime.deployRimeConfigFile(it.name, CONFIG_VERSION_KEY)) {
-                        Timber.w("Failed to deploy theme file ${it.absolutePath}")
-                        return@decode null
-                    }
-                }
                 val theme =
                     runCatching {
-                        Theme(it.nameWithoutExtension)
+                        yaml
+                            .decodeFromString(
+                                ThemeStub.serializer(),
+                                it.inputStream().bufferedReader().readText(),
+                            ).apply {
+                                configId = it.nameWithoutExtension
+                            }
                     }.getOrElse { e ->
                         Timber.w("Failed to decode theme file ${it.absolutePath}: ${e.message}")
                         return@decode null

app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt

@@ -15,7 +15,7 @@ object ThemeManager {
         fun onThemeChange(theme: Theme)
     }
 
-    fun getAllThemes(): List<Theme> {
+    fun getAllThemes(): List<ThemeStub> {
         val sharedThemes = ThemeFilesManager.listThemes(DataManager.sharedDataDir)
         val userThemes = ThemeFilesManager.listThemes(DataManager.userDataDir)
         return sharedThemes + userThemes

app/src/main/java/com/osfans/trime/data/theme/ThemeStub.kt

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2015 - 2025 Rime community
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.osfans.trime.data.theme
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+
+@Serializable
+data class ThemeStub(
+    @Transient
+    var configId: String = "",
+    val name: String,
+)

app/src/main/java/com/osfans/trime/ui/main/settings/ThemePickerDialog.kt

@@ -8,6 +8,7 @@ import android.app.AlertDialog
 import android.content.Context
 import androidx.lifecycle.LifecycleCoroutineScope
 import com.osfans.trime.R
+import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.data.theme.ThemeManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -39,8 +40,8 @@ object ThemePickerDialog {
                         scope.launch {
                             afterConfirm?.invoke()
                             if (which == selectedIndex) return@launch
-                            val newTheme = allThemes[which]
-                            ThemeManager.selectTheme(newTheme)
+                            val newStub = allThemes[which]
+                            ThemeManager.selectTheme(Theme(newStub.configId))
                             dialog.dismiss()
                         }
                     }