refactor(theme): cleanup deprecated params

Author: WhiredPlanck

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

@@ -59,12 +59,9 @@ style:
   reset_ascii_mode: false #显示键盘时重置为中文状态
   round_corner: *round1 #按键圆角半径
   shadow_radius: 0.0 #按键阴影半径
-  speech_opencc_config: none #语音输入简繁转换
   symbol_font: symbol.ttf #符号字体
   symbol_text_size: 10 #符号字号
   text_font: latin.ttf #编码字体
-  #text_height: 32 #编码区高度
-  text_size: 14 #编码区字号
   vertical_correction: -5
   vertical_gap: *sgap #键盘行距
   enter_label_mode: 0  #是否使用App提供的ActionLabel内容作为Enter键的文本（由于多数App没有适配ActionLable，实际影响不大）。0不使用，1只使用actionlabel，2优先使用，3当其他方式没有获得label时才读取actionlabel

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

@@ -15,7 +15,6 @@ style:
   candidate_padding: 5 #候選項內邊距
   candidate_spacing: 0.5 #候選間距
   candidate_text_size: 22 #候選字號
-  candidate_use_cursor: true #高亮候選項
   candidate_view_height: 28 #候選區高度
   comment_font: comment.ttf #編碼提示字型
   comment_height: 12 #編碼提示區高度
@@ -48,17 +47,12 @@ style:
   reset_ascii_mode: false #顯示鍵盤時重置爲中文狀態
   round_corner: 8 #按鍵圓角半徑
   shadow_radius: 0.0 #按鍵陰影半徑
-  speech_opencc_config: s2t.json #語音輸入簡繁轉換
   symbol_font: symbol.ttf #符號字型
   symbol_text_size: 10 #符號字號
   text_font: latin.ttf #編碼字型
-  #text_height: 22 #編碼區高度
-  text_size: 16 #編碼區字號
   vertical_correction: -10
   vertical_gap: 1 #鍵盤行距
-  long_text_font: comment.ttf #剪贴板等可能包含大段文本使用的字体
   #background_folder: #背景图保存在background目录下的哪个子目录
-  key_long_text_border: 1
   enter_label_mode: 0  #是否使用App提供的ActionLabel内容作为Enter键的文本（由于多数App没有适配ActionLable，实际影响不大）。0不使用，1只使用actionlabel，2优先使用，3当其他方式没有获得label时才读取actionlabel
   enter_labels:  # 定义Enter键的文本
     go: 前往

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

@@ -111,7 +111,6 @@ object FontManager {
             FontKey.PREVIEW_FONT -> style.previewFont
             FontKey.SYMBOL_FONT -> style.symbolFont
             FontKey.TEXT_FONT -> style.textFont
-            FontKey.LONG_TEXT_FONT -> style.longTextFont
             FontKey.TOOLBAR_FONT -> theme.toolBar.buttonFont
             else -> null
         }

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

@@ -19,7 +19,6 @@ class GeneralStyleMapper(
         candidatePadding = getInt("candidate_padding"),
         candidateSpacing = getFloat("candidate_spacing"),
         candidateTextSize = getFloat("candidate_text_size"),
-        candidateUseCursor = getBoolean("candidate_use_cursor"),
         candidateViewHeight = getInt("candidate_view_height"),
         commentFont = getStringList("comment_font"),
         commentHeight = getInt("comment_height"),
@@ -62,16 +61,12 @@ class GeneralStyleMapper(
         resetASCIIMode = getBoolean("reset_ascii_mode"),
         roundCorner = getFloat("round_corner"),
         shadowRadius = getFloat("shadow_radius"),
-        speechOpenccConfig = getString("speech_opencc_config"),
         symbolFont = getStringList("symbol_font"),
         symbolTextSize = getFloat("symbol_text_size"),
         textFont = getStringList("text_font"),
-        textSize = getFloat("text_size"),
         verticalCorrection = getInt("vertical_correction"),
         verticalGap = getInt("vertical_gap"),
-        longTextFont = getStringList("long_text_font"),
         backgroundFolder = getString("background_folder"),
-        keyLongTextBorder = getInt("key_long_text_border"),
         enterLabelMode = getInt("enter_label_mode"),
         enterLabel =
         when (val map = node.get<YamlMap>("enter_labels")) {

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

@@ -18,7 +18,6 @@ data class GeneralStyle(
     val candidatePadding: Int = 0,
     val candidateSpacing: Float = 0f,
     val candidateTextSize: Float = 15f,
-    val candidateUseCursor: Boolean = false,
     val candidateViewHeight: Int = 28,
     val commentFont: List<String> = emptyList(),
     val commentHeight: Int = 12,
@@ -61,16 +60,12 @@ data class GeneralStyle(
     val resetASCIIMode: Boolean = false,
     val roundCorner: Float = 0f,
     val shadowRadius: Float = 0f,
-    val speechOpenccConfig: String = "tw2s.json",
     val symbolFont: List<String> = emptyList(),
     val symbolTextSize: Float = 0f,
     val textFont: List<String> = emptyList(),
-    val textSize: Float = 0f,
     val verticalCorrection: Int = 0,
     val verticalGap: Int = 0,
-    val longTextFont: List<String> = emptyList(),
     val backgroundFolder: String = "backgrounds",
-    val keyLongTextBorder: Int = 0,
     val enterLabelMode: Int = 0,
     val enterLabel: EnterLabel = EnterLabel(),
 ) : Parcelable {

app/src/test/java/com/osfans/trime/data/theme/GeneralStyleTest.kt

@@ -6,8 +6,6 @@ package com.osfans.trime.data.theme
 
 import com.osfans.trime.BuildConfig
 import com.osfans.trime.core.Rime
-import com.osfans.trime.core.RimeConfig
-import com.osfans.trime.data.theme.mapper.GeneralStyleMapper
 import com.osfans.trime.data.theme.model.GeneralStyle
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
@@ -26,15 +24,11 @@ class GeneralStyleTest :
             )
 
             When("loaded") {
-                val generalStyle =
-                    RimeConfig.openUserConfig("trime").use {
-                        GeneralStyleMapper("style", it).map()
-                    }
+                val generalStyle = Theme.decodeByConfigId("trime").generalStyle
 
                 Then("it should not be null") {
                     generalStyle shouldNotBe null
                     generalStyle.autoCaps shouldBe "false"
-                    generalStyle.backgroundDimAmount shouldBe 0.5
 
                     generalStyle.candidateFont shouldBe listOf("han.ttf")
                 }
@@ -53,23 +47,16 @@ class GeneralStyleTest :
             )
 
             When("loaded") {
-                val generalStyle =
-                    RimeConfig.openUserConfig("incorrect").use {
-                        GeneralStyleMapper("style", it).map()
-                    }
+                val generalStyle = Theme.decodeByConfigId("incorrect").generalStyle
 
                 Then("with default value without exception") {
                     generalStyle.autoCaps shouldBe ""
-                    generalStyle.backgroundDimAmount shouldBe 0
                     generalStyle.candidateBorder shouldBe 0
                     generalStyle.candidateFont shouldBe emptyList()
-                    generalStyle.candidateUseCursor shouldBe false
                     generalStyle.commentPosition shouldBe GeneralStyle.CommentPosition.UNKNOWN
 
                     generalStyle.enterLabel shouldNotBe null
                     generalStyle.enterLabel.go shouldBe "go"
-
-                    generalStyle.layout shouldNotBe null
                 }
             }