refactors: remove deprecated setting fields in theme

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

@@ -45,12 +45,6 @@ style:
   horizontal: true #水平模式
   horizontal_gap: *hgap #键水平间距
   layout:
-    position: fixed #候选窗口位置：left|right|left_up|right_up|fixed|bottom_left|bottom_right|top_left|top_right(left、right需要Android5.0以上)
-    min_length: 4 #候选窗口最小词长
-    max_length: 14 #超过字数则换行
-    sticky_lines: 1 #固顶行数
-    sticky_lines_land: 0 #横屏模式下的固顶行数
-    max_entries: 5 #候选窗口最大词条数
     border: 0 #候选窗口边框宽度
     max_width: 360 #最大宽度，超过则自动换行
     max_height: 300 #最大高度
@@ -60,18 +54,10 @@ style:
     margin_y: 5 #竖直边距
     line_spacing: 0 #候选词的行间距(px)
     line_spacing_multiplier: 1.2 #候选词的行间距(倍数)
-    real_margin: 3 #屏幕左右边缘和悬浮窗之间的距离 TODO: 在 4.0 时给 real_margin 与 spacing 换一个更适合的名字
     spacing: 1 #屏幕上下边缘或预编辑上下边缘和悬浮窗之间的距离
     round_corner: *round2 #候选窗口圆角
     alpha: 0xff #透明度(0-255)
-    elevation: 0 #阴影(>=Android5.0)
     background: background.png #颜色或者backgrounds目录下的图片文档名
-    movable: false #是否可移动窗口，或仅移动一次 true|false|once
-    all_phrases: false #显示所有长词
-  window: #悬浮窗口组件
-#    - {start: "", move: 'ㄓ ', end: ""}
-    - {start: "", composition: "%s", end: "", letter_spacing: 0.12} #letter_spacing需要Android5.0
-    - {start: "\n", label: "%s.", candidate: "%s", comment: "%s", end: "", sep: "☁️️"}
   key_font: symbol.ttf #键盘字体
   key_height: *jpgd4 #键高
   key_long_text_size: 16 #长标签字号

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

@@ -33,34 +33,19 @@ style:
   keyboard_padding_land: 40 #横屏模式下，屏幕左右两侧与键盘的距离（避免横屏按键过度拉伸变形）
   keyboard_padding_land_bottom: 0 #横屏模式下，屏幕下侧与键盘的距离
   layout: #懸浮窗口設置
-    position: fixed #位置：left|right|left_up|right_up|fixed|bottom_left|bottom_right|top_left|top_right(left、right需要>=Android5.0)
-    min_length: 5 #最小詞長
-    max_length: 10 #超過字數則換行
-    sticky_lines: 0 #固頂行數
-    sticky_lines_land: 0 #横屏模式下的固顶行数
-    max_entries: 1 #最大詞條數
-    min_check: 3 #只要前n个候选词有长度大于等于min_length的词，就会把长度符合以及之前的词全部加到悬浮窗内。
-    all_phrases: false #所有滿足條件的詞語都顯示在窗口
     border: 2 #邊框寬度
     max_width: 230 #最大寬度，超過則自動換行
     max_height: 400 #最大高度
     min_width: 40 #最小寬度
     min_height: 0 #最小高度
     margin_x: 5 #水平邊距 NOTE: margin_{x, y, bottom} 实际为 padding
     margin_y: 5 #豎直邊距
-    margin_bottom: 0 #底部边距 （用于适配特定背景图）
     line_spacing: 0 #候选詞的行間距(px)
     line_spacing_multiplier: 1.2 #候选詞的行間距(倍數)
-    real_margin: 3 #屏幕左右边缘和悬浮窗之间的距离 TODO: 在 4.0 时给 real_margin 与 spacing 换一个更适合的名字
     spacing: 1 #屏幕上下边缘或预编辑上下边缘和悬浮窗之间的距离
     round_corner: 8 #窗口圓角
     alpha: 0xdd #透明度(0-255)
     elevation: 5 #陰影(>=Android5.0)
-    movable: once #是否可移動窗口，或僅移動一次 true|false|once
-  window: #懸浮窗口組件
-    - {start: "", move: 'ㄓ ', end: ""}
-    - {start: "", composition: "%s", end: "", letter_spacing: 0} #letter_spacing需要>=Android5.0。TODO: 不爲0時，會導致不換行的問題
-    - {start: "\n", label: "%s.", candidate: "%s", comment: " %s", end: "", sep: " "}
   key_font: symbol.ttf #鍵盤字型
   key_height: 44 #鍵高
   key_long_text_size: 14 #長標籤字號

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

@@ -11,22 +11,6 @@ class LayoutStyleMapper(
     style: Map<String, ConfigItem?>?,
 ) : Mapper(style) {
     fun map(): Layout {
-        val position = getString("position")
-
-        val minLength = getInt("min_length")
-
-        val maxLength = getInt("max_length")
-
-        val stickyLines = getInt("sticky_lines")
-
-        val stickyLinesLand = getInt("sticky_lines_land")
-
-        val maxEntries = getInt("max_entries")
-
-        val minCheck = getInt("min_check")
-
-        val allPhrases = getBoolean("all_phrases")
-
         val border = getInt("border")
 
         val maxWidth = getInt("max_width")
@@ -41,47 +25,29 @@ class LayoutStyleMapper(
 
         val marginY = getInt("margin_y")
 
-        val marginBottom = getInt("margin_bottom")
-
         val lineSpacing = getInt("line_spacing")
 
         val lineSpacingMultiplier = getFloat("line_spacing_multiplier")
 
-        val realMargin = getInt("real_margin")
-
         val spacing = getInt("spacing")
 
         val roundCorner = getFloat("round_corner")
 
         val alpha = getInt("alpha", 204)
-        val elevation = getInt("elevation")
-        val movable = getString("movable")
 
         return Layout(
-            position,
-            minLength,
-            maxLength,
-            stickyLines,
-            stickyLinesLand,
-            maxEntries,
-            minCheck,
-            allPhrases,
             border,
             maxWidth,
             maxHeight,
             minWidth,
             minHeight,
             marginX,
             marginY,
-            marginBottom,
             lineSpacing,
             lineSpacingMultiplier,
-            realMargin,
             spacing,
             roundCorner,
             alpha,
-            elevation,
-            movable,
         )
     }
 }

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

@@ -5,28 +5,16 @@
 package com.osfans.trime.data.theme.model
 
 data class Layout(
-    val position: String,
-    val minLength: Int,
-    val maxLength: Int,
-    val stickyLines: Int,
-    val stickyLinesLand: Int,
-    val maxEntries: Int,
-    val minCheck: Int,
-    val allPhrases: Boolean,
     val border: Int,
     val maxWidth: Int,
     val maxHeight: Int,
     val minWidth: Int,
     val minHeight: Int,
     val marginX: Int,
     val marginY: Int,
-    val marginBottom: Int,
     val lineSpacing: Int,
     val lineSpacingMultiplier: Float,
-    val realMargin: Int,
     val spacing: Int,
     val roundCorner: Float,
     val alpha: Int,
-    val elevation: Int,
-    val movable: String,
 )