refactor: enhance processing of nullable theme parameters

- Use native (de)serializer for `style/enter_label`, `style/layout` and `preset_keys`
- Remove parameters: `background_dim_amount`, `color_scheme`, `keyboards`, `locale` and `latin_lacale` in `style`
- Set default values for data classes

Author: WhiredPlanck

app/src/main/assets/shared/tongwenfeng.trime.yaml

@@ -28,15 +28,12 @@ round_corner:
 #界面风格、功能开关
 style:
   auto_caps: false #自動句首大寫:true|false|ascii
-  background_dim_amount: 0.5
-  root_background: keyboard_back_color # 整个键盘区+候选栏的背景图/色
   candidate_font: han.ttf  #候选字体
   candidate_padding: 5  #候选项内边距
   candidate_spacing: 0.5  #候选间距
   candidate_text_size: 18  #候选字号
   candidate_use_cursor: true #高亮候选项
   candidate_view_height: 28 #候选区高度
-  color_scheme: default #配色方案
   comment_font: comment.ttf #编码提示字体
   comment_height: 14 #编码提示区高度
   comment_on_top: true #编码提示在上方或右侧
@@ -63,12 +60,9 @@ style:
   key_long_text_size: 16 #长标签字号
   key_text_size: 24 #键字号
   key_width: 10.0 #键宽，占屏幕宽的百分比
-  keyboards: [.default, letter, default, number, symbols, edit, move, bqrw1, bqrw2, bqrw3, bqrw4, bqrw5, bqrw6, bqqt1, bqqt2, bqqt3, bqqt4, bqqz1, bqqz2, bqqz3, bqqz4, bqqz5, bqqz6, bqpt1, bqpt2, bqhd1, bqhd2, bqhc1, bqhc2, bqhc3, bqlx1, bqlx2, bqlx3, bqlx4, bqlx5, bqlx6, bqkj1, bqkj2, bqkj3, bqkj4, bqkj5, bqfh1, bqfh2, bqfh3, bqfh4, kao_fond, kao_sad, kao_mad, kao_astonished, kao_impotent, kao_happy, numberb] #键盘配置
   label_text_size: 22 #标签字号
   label_font: label.ttf #编标签字体
   latin_font: latin.ttf #西文本体
-  latin_locale: en_US #西文语言
-  locale: zh_CN #缺省语言 zh_TW,zh_CN,zh_HK,""
   keyboard_height: 250 #锁定键盘高度，避免切换时键盘高度变化而造成闪烁
   keyboard_height_land: 200 #锁定横屏下键盘高度，避免切换时键盘高度变化而造成闪烁
   preview_font: latin.ttf #按键提示字体

app/src/main/assets/shared/trime.yaml

@@ -11,14 +11,12 @@ author: osfans #作者資訊
 
 style:
   auto_caps: false #自動句首大寫:true|false|ascii
-  background_dim_amount: 0.5
   candidate_font: han.ttf #候選字型
   candidate_padding: 5 #候選項內邊距
   candidate_spacing: 0.5 #候選間距
   candidate_text_size: 22 #候選字號
   candidate_use_cursor: true #高亮候選項
   candidate_view_height: 28 #候選區高度
-  color_scheme: default #配色方案
   comment_font: comment.ttf #編碼提示字型
   comment_height: 12 #編碼提示區高度
   comment_on_top: true #編碼提示在上方或右側
@@ -51,12 +49,9 @@ style:
   key_long_text_size: 14 #長標籤字號
   key_text_size: 22 #鍵字號
   key_width: 10.0 #鍵寬，佔螢幕寬的百分比
-  keyboards: [.default, letter, number, symbols, mini] #鍵盤配置：自動鍵盤、字母、數字、符號、精简（供插入实体键盘使用）
   label_text_size: 22 #標籤字號
   label_font: label.ttf #編標籤字型
   latin_font: latin.ttf #西文字型
-  latin_locale: en_US #西文語言
-  locale: zh_TW #預設語言 zh_TW,zh_CN,zh_HK,""
   keyboard_height: 250 #锁定键盘高度，避免切换时键盘高度变化而造成闪烁
   keyboard_height_land: 200 #锁定横屏下键盘高度，避免切换时键盘高度变化而造成闪烁
   preview_font: latin.ttf #按鍵提示字型

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

@@ -12,7 +12,6 @@ import com.osfans.trime.core.Rime
 import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.data.theme.mapper.GeneralStyleMapper
 import com.osfans.trime.data.theme.mapper.LiquidKeyboardMapper
-import com.osfans.trime.data.theme.mapper.PresetKeyMapper
 import com.osfans.trime.data.theme.mapper.TextKeyboardMapper
 import com.osfans.trime.data.theme.model.ColorScheme
 import com.osfans.trime.data.theme.model.GeneralStyle
@@ -43,8 +42,9 @@ data class Theme(
             if (!Rime.deployRimeConfigFile(configId, CONFIG_VERSION_KEY)) {
                 Timber.w("Failed to deploy theme config file '$configId.yaml'")
             }
+            val yaml = ThemeFilesManager.yaml
             val file = File(DataManager.resolveDeployedResourcePath(configId))
-            val root = ThemeFilesManager.yaml.parseToYamlNode(file.readText()).yamlMap
+            val root = yaml.parseToYamlNode(file.readText()).yamlMap
             return Theme(
                 configId = configId,
                 name = root.getString("name"),
@@ -55,9 +55,10 @@ data class Theme(
                         else -> LiquidKeyboardMapper(node).map()
                     },
                 presetKeys =
-                    root.get<YamlMap>("preset_keys")?.entries?.entries?.associate {
-                        it.key.content to PresetKeyMapper(it.value.yamlMap).map()
-                    } ?: emptyMap(),
+                    when (val map = root.get<YamlMap>("preset_keys")) {
+                        null -> emptyMap()
+                        else -> yaml.decodeFromYamlNode(map)
+                    },
                 presetKeyboards =
                     root.get<YamlMap>("preset_keyboards")?.entries?.entries?.associate {
                         it.key.content to TextKeyboardMapper(it.value.yamlMap).map()
@@ -72,9 +73,10 @@ data class Theme(
                         )
                     } ?: emptyList(),
                 fallbackColors =
-                    root.get<YamlMap>("fallback_colors")?.entries?.entries?.associate {
-                        it.key.content to it.value.yamlScalar.content
-                    } ?: emptyMap(),
+                    when (val map = root.get<YamlMap>("fallback_colors")) {
+                        null -> emptyMap()
+                        else -> yaml.decodeFromYamlNode(map)
+                    },
             )
         }
     }

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

@@ -8,6 +8,7 @@ package com.osfans.trime.data.theme
 import com.charleskorn.kaml.AnchorsAndAliases
 import com.charleskorn.kaml.Yaml
 import com.charleskorn.kaml.YamlConfiguration
+import com.charleskorn.kaml.YamlNamingStrategy
 import com.charleskorn.kaml.yamlMap
 import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.util.getString
@@ -22,6 +23,8 @@ object ThemeFilesManager {
             configuration =
                 YamlConfiguration(
                     strictMode = false,
+                    yamlNamingStrategy = YamlNamingStrategy.SnakeCase,
+                    decodeEnumCaseInsensitive = true,
                     anchorsAndAliases = AnchorsAndAliases.Permitted(null),
                     codePointLimit = CODE_POINT_LIMIT, // 10 MB
                 ),

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

@@ -5,15 +5,15 @@
 package com.osfans.trime.data.theme.mapper
 
 import com.charleskorn.kaml.YamlMap
+import com.osfans.trime.data.theme.ThemeFilesManager
 import com.osfans.trime.data.theme.model.GeneralStyle
 
 class GeneralStyleMapper(
     node: YamlMap,
 ) : Mapper<GeneralStyle>(node) {
     override fun map() =
         GeneralStyle(
-            autoCaps = getString("auto_caps"),
-            backgroundDimAmount = getFloat("background_dim_amount"),
+            autoCaps = getBoolean("auto_caps"),
             candidateBorder = getInt("candidate_border"),
             candidateBorderRound = getFloat("candidate_border_round"),
             candidateFont = getStringList("candidate_font"),
@@ -22,7 +22,6 @@ class GeneralStyleMapper(
             candidateTextSize = getFloat("candidate_text_size"),
             candidateUseCursor = getBoolean("candidate_use_cursor"),
             candidateViewHeight = getInt("candidate_view_height"),
-            colorScheme = getString("color_scheme"),
             commentFont = getStringList("comment_font"),
             commentHeight = getInt("comment_height"),
             commentOnTop = getBoolean("comment_on_top"),
@@ -37,7 +36,11 @@ class GeneralStyleMapper(
             keyboardPaddingBottom = getInt("keyboard_padding_bottom"),
             keyboardPaddingLand = getInt("keyboard_padding_land"),
             keyboardPaddingLandBottom = getInt("keyboard_padding_land_bottom"),
-            layout = LayoutStyleMapper(node.get<YamlMap>("layout")!!).map(),
+            layout =
+                when (val map = node.get<YamlMap>("layout")) {
+                    null -> GeneralStyle.Layout()
+                    else -> ThemeFilesManager.yaml.decodeFromYamlNode(map)
+                },
             keyFont = getStringList("key_font"),
             keyBorder = getInt("key_border"),
             keyHeight = getInt("key_height"),
@@ -52,12 +55,9 @@ class GeneralStyleMapper(
             keyPressOffsetX = getInt("key_press_offset_x"),
             keyPressOffsetY = getInt("key_press_offset_y"),
             keyWidth = getFloat("key_width"),
-            keyboards = getStringList("keyboards"),
             labelTextSize = getFloat("label_text_size"),
             labelFont = getStringList("label_font"),
             latinFont = getStringList("latin_font"),
-            latinLocale = getString("latin_locale"),
-            locale = getString("locale"),
             keyboardHeight = getInt("keyboard_height"),
             keyboardHeightLand = getInt("keyboard_height_land"),
             previewFont = getStringList("preview_font"),
@@ -82,7 +82,7 @@ class GeneralStyleMapper(
             enterLabel =
                 when (val map = node.get<YamlMap>("enter_labels")) {
                     null -> GeneralStyle.EnterLabel()
-                    else -> EnterLabelStyleMapper(map).map()
+                    else -> ThemeFilesManager.yaml.decodeFromYamlNode(map)
                 },
         )
 }