feat: enhance key preview with popup keyboard support

ref: https://github.com/fcitx5-android/fcitx5-android/tree/master/app/src/main/java/org/fcitx/fcitx5/android/input/popup

Author: ENOA-ANSUL-EDEN

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

@@ -50,10 +50,12 @@ style:
   latin_font: latin.ttf #西文本体
   keyboard_height: 250 #锁定键盘高度，避免切换时键盘高度变化而造成闪烁
   keyboard_height_land: 200 #锁定横屏下键盘高度，避免切换时键盘高度变化而造成闪烁
-  preview_font: latin.ttf #按键提示字体
-  preview_height: 56 #按键提示高度
-  preview_offset: -32 #按键提示纵向偏移
-  preview_text_size: 40 #按键提示字号
+  popup_font: latin.ttf #按键提示字体
+  popup_width: 38 #按键提示宽度
+  popup_height: 48 #按键提示高度
+  popup_bottom_margin: 68 #按键提示底边距
+  popup_key_height: 48 #按键提示内键高度
+  popup_text_size: 23 #按键提示字号
   proximity_correction: true #按键纠错
   reset_ascii_mode: false #显示键盘时重置为中文状态
   round_corner: *round1 #按键圆角半径
@@ -1048,7 +1050,7 @@ tool_bar:
   edit_button: &edit_button
     foreground:
       style: "ic@cursor_text"
-    action: Keyboard_numberb
+    action: Keyboard_edit
 
   ascii_mode_button: &ascii_mode_button
     foreground:
@@ -1097,7 +1099,7 @@ preset_keyboards:
       - {click: l, long_click: '(){Left}', swipe_down: "=", key_back_color: bh2, key_text_color: th2}
       - {width: 5, key_back_color: bh2, key_text_color: th2}
 
-      - {click: Shift_L, double_click: Shift_L3, composing: delimiter, width: 15, hilited_key_back_color: benter, key_back_color: bbs, key_text_color: tbs}
+      - {click: Shift_L, label_symbol: " ", long_click: Shift_L, double_click: Shift_L3, composing: delimiter, width: 15, hilited_key_back_color: benter, key_back_color: bbs, key_text_color: tbs}
       - {click: z, long_click: '`', swipe_down: '[]{Left}', key_back_color: bh3, key_text_color: th3}
       - {click: x, long_click: cut, swipe_down: '{}{Left}', key_back_color: bh3, key_text_color: th3}
       - {click: c, long_click: copy, swipe_down: ' ', key_back_color: bh3, key_text_color: th3}
@@ -1113,7 +1115,7 @@ preset_keyboards:
       - {click: space, long_click: Mode_switch, swipe_left: "Left", swipe_right: "Right", swipe_up: Schema_switchcn, width: 30, key_back_color: bkg, key_text_color: tkg}
       - {click: '.', label: '。', long_click: liquid_keyboard_clipboard, key_back_color: bh4, key_text_color: th4}
       - {click: '/', long_click: liquid_keyboard_switch , key_text_size: "18", key_back_color: bh4, key_text_color: th4}
-      - {click: Return, composing: Return1, swipe_up: Escape, width: 15, key_back_color: benter, key_text_color: tenter}
+      - {click: Return, label_symbol: "wiki", popup: ["TrimeWiki", "Settings"], composing: Return1, swipe_up: Escape, width: 15, key_back_color: benter, key_text_color: tenter}
 
   letter:
     author: "暖暖"
@@ -1200,7 +1202,7 @@ preset_keyboards:
       - {click: '=', long_click: '≠', key_back_color: bgn, key_text_color: tgn}
       - {click: Return, long_click: Menu, key_back_color: benter, key_text_color: tenter}
 
-  numberb:
+  edit:
     ascii_mode: 1
     author: flypy.com
     name: "编辑键盘"
@@ -4021,7 +4023,7 @@ preset_keys:
   Keyboard_default: { label: 返回, functional: false, send: Eisu_toggle, select: .default }
   Keyboard_switch: { label: 键盘, functional: true, send: Eisu_toggle, select: .next }
   Keyboard_number: { label: 123, functional: false, send: Eisu_toggle, select: number }
-  Keyboard_numberb: { label: 123, functional: false, send: Eisu_toggle, select: numberb }
+  Keyboard_edit: { label: edit, functional: false, send: Eisu_toggle, select: edit }
   Keyboard_symbols: { label: 更多, functional: false, send: Eisu_toggle, select: symbols }
   Keyboard_move: { label: ❖, functional: true, send: Eisu_toggle, select: move }
   Keyboard_next: { label: 后退, functional: false, send: Eisu_toggle, select: .next }
@@ -4058,6 +4060,7 @@ preset_keys:
   TrimeApp: {label: 同文, send: function, command: run, option: "com.osfans.trime"} #運行程序: run 包名
   TrimeCmp: {label: 同文組件, send: function, command: run, option: "com.osfans.trime/.Pref"} #運行程序指定組件: run 包名/組件名
   Homepage: {label: 同文主頁, send: function, command: run, option: "https://github.com/osfans/trime"} #查看網頁: run 網址
+  TrimeWiki: {label: Wiki, send: function, command: run, option: "https://github.com/osfans/trime/wiki/trime.yaml-詳解"}
   Wiki: {label: 維基, send: function, command: run, option: "https://zh.wikipedia.org/wiki/%s"} #搜索網頁: %s或者%1$s爲當前字符
   Google: {label: 谷歌, send: function, command: run, option: "https://www.google.com/search?q=%s"} #搜索網頁: %s或者%1$s爲當前字符
   MoeDict: {label: 萌典, send: function, command: run, option: "https://www.moedict.tw/%3$s"} #搜索網頁: %3$s爲光標前字符

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

@@ -86,8 +86,10 @@ object ColorManager {
             "off_key_text_color" to "key_text_color",
             "on_key_back_color" to "hilited_key_back_color",
             "on_key_text_color" to "hilited_key_text_color",
-            "preview_back_color" to "key_back_color",
-            "preview_text_color" to "key_text_color",
+            "popup_back_color" to "key_back_color",
+            "popup_text_color" to "key_text_color",
+            "hilited_popup_back_color" to "hilited_key_back_color",
+            "hilited_popup_text_color" to "hilited_key_text_color",
             "shadow_color" to "border_color",
             "root_background" to "back_color",
             "candidate_background" to "back_color",

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

@@ -23,7 +23,7 @@ object FontManager {
         COMMENT_FONT,
         KEY_FONT,
         LABEL_FONT,
-        PREVIEW_FONT,
+        POPUP_FONT,
         SYMBOL_FONT,
         TEXT_FONT,
         LONG_TEXT_FONT,
@@ -108,7 +108,7 @@ object FontManager {
             FontKey.COMMENT_FONT -> style.commentFont
             FontKey.KEY_FONT -> style.keyFont
             FontKey.LABEL_FONT -> style.labelFont
-            FontKey.PREVIEW_FONT -> style.previewFont
+            FontKey.POPUP_FONT -> style.popupFont
             FontKey.SYMBOL_FONT -> style.symbolFont
             FontKey.TEXT_FONT -> style.textFont
             FontKey.TOOLBAR_FONT -> theme.toolBar.buttonFont

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

@@ -52,10 +52,12 @@ class GeneralStyleMapper(
         latinFont = getStringList("latin_font"),
         keyboardHeight = getInt("keyboard_height"),
         keyboardHeightLand = getInt("keyboard_height_land"),
-        previewFont = getStringList("preview_font"),
-        previewHeight = getInt("preview_height"),
-        previewOffset = getInt("preview_offset"),
-        previewTextSize = getFloat("preview_text_size"),
+        popupBottomMargin = getInt("popup_bottom_margin"),
+        popupWidth = getInt("popup_width"),
+        popupHeight = getInt("popup_height"),
+        popupKeyHeight = getInt("popup_key_height"),
+        popupFont = getStringList("popup_font"),
+        popupTextSize = getFloat("popup_text_size"),
         proximityCorrection = getBoolean("proximity_correction"),
         resetASCIIMode = getBoolean("reset_ascii_mode"),
         roundCorner = getFloat("round_corner"),

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

@@ -13,6 +13,7 @@ import com.osfans.trime.util.getBool
 import com.osfans.trime.util.getFloat
 import com.osfans.trime.util.getInt
 import com.osfans.trime.util.getString
+import com.osfans.trime.util.getStringList
 import timber.log.Timber
 
 class TextKeyboardMapper(
@@ -48,6 +49,7 @@ class TextKeyboardMapper(
                         hlKeyTextColor = it.getString("hilited_key_text_color"),
                         hlKeyBackColor = it.getString("hilited_key_back_color"),
                         hlKeySymbolColor = it.getString("hilited_key_symbol_color"),
+                        popup = it.getStringList("popup") ?: emptyList(),
                         behaviors =
                         buildMap {
                             KeyBehavior.entries.forEach { entry ->

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

@@ -51,10 +51,12 @@ data class GeneralStyle(
     val latinFont: List<String> = emptyList(),
     val keyboardHeight: Int = 0,
     val keyboardHeightLand: Int = 0,
-    val previewFont: List<String> = emptyList(),
-    val previewHeight: Int = 0,
-    val previewOffset: Int = 0,
-    val previewTextSize: Float = 0f,
+    val popupBottomMargin: Int = 0,
+    val popupWidth: Int = 0,
+    val popupHeight: Int = 0,
+    val popupKeyHeight: Int = 0,
+    val popupFont: List<String> = emptyList(),
+    val popupTextSize: Float = 0f,
     val proximityCorrection: Boolean = false,
     val resetASCIIMode: Boolean = false,
     val roundCorner: Float = 0f,

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

@@ -71,6 +71,7 @@ data class TextKeyboard(
         val hlKeyTextColor: String,
         val hlKeyBackColor: String,
         val hlKeySymbolColor: String,
+        val popup: List<String> = emptyList(),
         val behaviors: Map<KeyBehavior, String>,
     ) : Parcelable
 }

app/src/main/java/com/osfans/trime/ime/core/InputView.kt

@@ -31,7 +31,7 @@ import com.osfans.trime.ime.dependency.InputComponent
 import com.osfans.trime.ime.dependency.create
 import com.osfans.trime.ime.keyboard.KeyboardPrefs.isLandscapeMode
 import com.osfans.trime.ime.keyboard.KeyboardWindow
-import com.osfans.trime.ime.preview.KeyPreviewChoreographer
+import com.osfans.trime.ime.popup.PopupComponent
 import com.osfans.trime.ime.symbol.LiquidWindow
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -99,7 +99,7 @@ class InputView(
     private val liquidWindow: LiquidWindow = inputComponent.liquidWindow
     private val compactCandidate: CompactCandidateModule = inputComponent.candidate.compactCandidateModule
     private val suggestionCandidate: SuggestionCandidateModule = inputComponent.candidate.suggestionCandidateModule
-    private val preview: KeyPreviewChoreographer = inputComponent.preview
+    private val popup: PopupComponent = inputComponent.popup
 
     private fun addBroadcastReceivers() {
         broadcaster.addReceiver(quickBar)
@@ -221,7 +221,7 @@ class InputView(
         )
 
         add(
-            preview.root,
+            popup.root,
             lParams(matchParent, matchParent) {
                 centerInParent()
             },
@@ -345,7 +345,7 @@ class InputView(
         // cancel the notification job and clear all broadcast receivers,
         // implies that InputView should not be attached again after detached.
         updateWindowViewHeightJob.cancel()
-        preview.root.removeAllViews()
+        popup.root.removeAllViews()
         broadcaster.clear()
         super.onDetachedFromWindow()
     }

app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt

@@ -16,7 +16,7 @@ import com.osfans.trime.ime.core.InputView
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.keyboard.CommonKeyboardActionListener
 import com.osfans.trime.ime.keyboard.KeyboardWindow
-import com.osfans.trime.ime.preview.KeyPreviewChoreographer
+import com.osfans.trime.ime.popup.PopupComponent
 import com.osfans.trime.ime.symbol.LiquidWindow
 import com.osfans.trime.ime.window.BoardWindowManager
 import me.tatarka.inject.annotations.Component
@@ -36,7 +36,7 @@ abstract class InputComponent(
     abstract val quickBar: QuickBar
     abstract val preedit: PreeditModule
     abstract val windowManager: BoardWindowManager
-    abstract val preview: KeyPreviewChoreographer
+    abstract val popup: PopupComponent
     abstract val keyboardWindow: KeyboardWindow
     abstract val commonKeyboardActionListener: CommonKeyboardActionListener
     abstract val liquidWindow: LiquidWindow

app/src/main/java/com/osfans/trime/ime/keyboard/Key.kt

@@ -46,6 +46,7 @@ class Key(
     private val label = selfConfig?.label ?: ""
     private val labelSymbol = selfConfig?.labelSymbol ?: ""
     val hint: String = selfConfig?.hint ?: ""
+    val popup = selfConfig?.popup ?: emptyList()
 
     val keyTextSize: Float = selfConfig?.keyTextSize ?: 0f
     val symbolTextSize: Float = selfConfig?.symbolTextSize ?: 0f