editable symbol key border

ccyybn · ccyybn · commit ad315569cad8 · 2024-05-04T02:28:51.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt
@@ -32,6 +32,8 @@ class ThemePrefs(sharedPreferences: SharedPreferences) :
 
     val keyBorder = switch(R.string.key_border, "key_border", false)
 
+    val keySymbolBorder = switch(R.string.key_symbol_border, "key_symbol_border", false)
+
     val keyRippleEffect = switch(R.string.key_ripple_effect, "key_ripple_effect", false)
 
     val keyHorizontalMargin: ManagedPreference.PInt
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt
@@ -11,6 +11,7 @@ import org.fcitx.fcitx5.android.core.FcitxKeyMapping
 import org.fcitx.fcitx5.android.core.KeySym
 import org.fcitx.fcitx5.android.data.prefs.AppPrefs
 import org.fcitx.fcitx5.android.data.theme.Theme
+import org.fcitx.fcitx5.android.data.theme.ThemeManager
 import org.fcitx.fcitx5.android.input.AutoScaleTextView
 import org.fcitx.fcitx5.android.input.keyboard.CustomGestureView
 import org.fcitx.fcitx5.android.input.keyboard.CustomGestureView.OnGestureListener
@@ -28,6 +29,7 @@ import org.fcitx.fcitx5.android.input.keyboard.KeyView
 import org.fcitx.fcitx5.android.input.keyboard.TextKeyView
 import org.fcitx.fcitx5.android.input.popup.PopupAction
 import org.fcitx.fcitx5.android.input.popup.PopupActionListener
+import splitties.views.backgroundColor
 import splitties.views.dsl.constraintlayout.below
 import splitties.views.dsl.constraintlayout.bottomOfParent
 import splitties.views.dsl.constraintlayout.bottomToTopOf
@@ -43,7 +45,15 @@ import splitties.views.dsl.core.Ui
 import splitties.views.dsl.core.add
 import splitties.views.dsl.core.matchParent
 
-class PickerPageUi(override val ctx: Context, val theme: Theme, private val density: Density) : Ui {
+class PickerPageUi(
+    override val ctx: Context,
+    val theme: Theme,
+    private val density: Density,
+    recentlyUsedFileName: String = ""
+) : Ui {
+    private val keyBorder by ThemeManager.prefs.keyBorder
+    private val symbolBorder =
+        ThemeManager.prefs.keySymbolBorder.getValue() && recentlyUsedFileName == PickerWindow.Key.Symbol.name
 
     enum class Density(
         val pageSize: Int,
@@ -63,26 +73,25 @@ class PickerPageUi(override val ctx: Context, val theme: Theme, private val dens
     }
 
     companion object {
-        val BackspaceAppearance = Appearance.Image(
-            src = R.drawable.ic_baseline_backspace_24,
-            variant = Variant.Alternative,
-            border = Border.Off,
-            viewId = R.id.button_backspace
-        )
-
         val BackspaceAction = SymAction(KeySym(FcitxKeyMapping.FcitxKey_BackSpace))
-
         private var popupOnKeyPress by AppPrefs.getInstance().keyboard.popupOnKeyPress
     }
 
     var keyActionListener: KeyActionListener? = null
     var popupActionListener: PopupActionListener? = null
 
+    private val backspaceAppearance = Appearance.Image(
+        src = R.drawable.ic_baseline_backspace_24,
+        variant = Variant.Alternative,
+        border = if (symbolBorder) Border.On else Border.Off,
+        viewId = R.id.button_backspace
+    )
+
     private val keyAppearance = Appearance.Text(
         displayText = "",
         textSize = density.textSize,
         variant = Variant.Normal,
-        border = Border.Off
+        border = if (symbolBorder) Border.On else Border.Off
     )
 
     private val keyViews = Array(density.pageSize) {
@@ -96,7 +105,7 @@ class PickerPageUi(override val ctx: Context, val theme: Theme, private val dens
         }
     }
 
-    private val backspaceKey = ImageKeyView(ctx, theme, BackspaceAppearance).apply {
+    private val backspaceKey = ImageKeyView(ctx, theme, backspaceAppearance).apply {
         setOnClickListener { onBackspaceClick() }
         repeatEnabled = true
         onRepeatListener = { onBackspaceClick() }
@@ -107,6 +116,10 @@ class PickerPageUi(override val ctx: Context, val theme: Theme, private val dens
     }
 
     override val root = constraintLayout {
+        if (!keyBorder && symbolBorder) {
+            backgroundColor = theme.barColor
+        }
+
         val columnCount = density.columnCount
         val rowCount = density.rowCount
         val keyWidth = 1f / columnCount
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt
@@ -17,7 +17,7 @@ class PickerPagesAdapter(
     private val popupActionListener: PopupActionListener,
     data: List<Pair<PickerData.Category, Array<String>>>,
     val density: PickerPageUi.Density,
-    recentlyUsedFileName: String
+    private val recentlyUsedFileName: String
 ) : RecyclerView.Adapter<PickerPagesAdapter.ViewHolder>() {
 
     class ViewHolder(val ui: PickerPageUi) : RecyclerView.ViewHolder(ui.root)
@@ -110,7 +110,7 @@ class PickerPagesAdapter(
     override fun getItemCount() = pages.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(PickerPageUi(parent.context, theme, density))
+        return ViewHolder(PickerPageUi(parent.context, theme, density, recentlyUsedFileName))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -104,6 +104,7 @@
     <string name="theme">Theme</string>
     <string name="key_ripple_effect">Enable key ripple effect</string>
     <string name="key_border">Enable key border</string>
+    <string name="key_symbol_border">Enable symbol key border</string>
     <string name="brightness">Brightness</string>
     <string name="key_radius">Key radius</string>
     <string name="key_text_editing_style">Text editing key style</string>
