fix(ime): symbol: invisible key text in LiquidKeyboard

forgot to set the key text color, lol
osfans · Oct 22, 2022 · 054da09 · 054da09
1 parent 6f6305a
commit 054da09
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/FlexibleAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/FlexibleAdapter.kt
@@ -61,15 +61,20 @@ class FlexibleAdapter(
         with(viewHolder) {
             val bean = mBeans[position]
             simpleKeyText.apply {
-                this.text = bean.text
-                this.typeface = theme.getFont("long_text_font")
+                text = bean.text
+                typeface = theme.getFont("long_text_font")
+                when (val textColor = theme.getLiquidColor("long_text_color")) {
+                    null -> setTextColor(theme.getLiquidColor("key_text_color"))
+                    else -> setTextColor(textColor)
+                }
 
                 val longTextSize = theme.getFloat("key_long_text_size")
                 val labelTextSize = theme.getFloat("label_text_size")
-                if (longTextSize > 0)
-                    this.textSize = longTextSize
-                else if (labelTextSize > 0)
-                    this.textSize = labelTextSize
+                textSize = when {
+                    longTextSize > 0 -> longTextSize
+                    labelTextSize > 0 -> labelTextSize
+                    else -> textSize
+                }
             }
             simpleKeyPin.visibility = if (bean.pinned) View.VISIBLE else View.INVISIBLE
 

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.java
@@ -61,6 +61,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
     final SimpleKeyBean bean = mBeans.get(position);
 
     holder.simpleKeyText.setText(bean.getLabel());
+    holder.simpleKeyText.setTextColor(theme.getLiquidColor("key_text_color"));
     holder.simpleKeyText.setTypeface(theme.getFont("key_font"));
     holder.simpleKeyText.setGravity(Gravity.CENTER);
     holder.simpleKeyText.setEllipsize(TextUtils.TruncateAt.MARQUEE);