feat: add GeneralStyle to Theme

osfans · Apr 17, 2024 · ae982ab · ae982ab
1 parent dcc213d
commit ae982ab
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/app/src/main/java/com/osfans/trime/data/theme/Theme.kt b/app/src/main/java/com/osfans/trime/data/theme/Theme.kt
@@ -19,6 +19,8 @@ package com.osfans.trime.data.theme
 
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
+import com.osfans.trime.data.theme.mapper.GeneralStyleMapper
+import com.osfans.trime.data.theme.model.GeneralStyle
 import com.osfans.trime.util.config.Config
 import com.osfans.trime.util.config.ConfigItem
 import com.osfans.trime.util.config.ConfigList
@@ -29,6 +31,7 @@ import kotlin.system.measureTimeMillis
 /** 主题和样式配置  */
 class Theme(name: String) {
     val style: Style
+    val generalStyle: GeneralStyle
     val liquid: Liquid
     val keyboards: Keyboards
 
@@ -74,6 +77,7 @@ class Theme(name: String) {
         style = Style(config)
         liquid = Liquid(config)
         keyboards = Keyboards(config)
+        generalStyle = mapToGeneralStyle(config)
         fallbackColors = config.getMap("fallback_colors")
         presetKeys = config.getMap("preset_keys")
         presetColorSchemes = config.getMap("preset_color_schemes")
@@ -82,6 +86,19 @@ class Theme(name: String) {
         prefs.selectedTheme = name
     }
 
+    private fun mapToGeneralStyle(config: Config): GeneralStyle {
+        val generalStyleMap = config.getMap("style")
+        val mapper = GeneralStyleMapper(generalStyleMap)
+        val generalStyle = mapper.map()
+
+        Timber.w(
+            "GeneralStyleMapper (%d) Warnings: %s",
+            mapper.errors.size,
+            mapper.errors.joinToString(","),
+        )
+        return generalStyle
+    }
+
     class Style(private val config: Config) {
         fun getString(key: String): String = config.getString("style/$key")