feat: show variable length keys in liquid keyboard

Author: tumuyan

app/src/main/java/com/osfans/trime/core/Rime.java

@@ -76,6 +76,13 @@ public int getEnd() {
   public static class RimeCandidate {
     public String text;
     public String comment;
+
+    public RimeCandidate(String text, String comment) {
+      this.text = text;
+      this.comment = comment;
+    }
+
+    public RimeCandidate() {}
   }
 
   /** Rime候選區，包含多個{@link RimeCandidate 候選項} */

app/src/main/java/com/osfans/trime/ime/enums/SymbolKeyboardType.kt

@@ -34,7 +34,7 @@ enum class SymbolKeyboardType {
     SHORT,
 
     //  按键长度不固定，与展开候选的样式相同；与
-    VAR,
+    VAR_LENGTH,
 
     //  长度较长，与草稿箱、剪贴板的样式相同，使用小号字体多行展示
     LONG,

app/src/main/java/com/osfans/trime/ime/symbol/CandidateAdapter.java

@@ -15,20 +15,18 @@
 import com.google.android.flexbox.FlexboxLayoutManager;
 import com.osfans.trime.R;
 import com.osfans.trime.core.Rime;
-import com.osfans.trime.data.AppPrefs;
 import com.osfans.trime.data.Config;
-import com.osfans.trime.ime.core.Trime;
 import com.osfans.trime.ime.enums.PositionType;
 import com.osfans.trime.ime.text.TextInputManager;
+import java.util.List;
 
+// 显示长度不固定，字体大小正常的内容。用于类型 CANDIDATE, VAR_LENGTH
 public class CandidateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
   private final Context myContext;
   private final TextInputManager textInputManager;
 
   // 候选词
   private Rime.RimeCandidate[] candidates;
-  private Trime trime;
-  private AppPrefs prefs;
 
   private int keyMarginX, keyMarginTop;
   private Integer textColor, textColor2, commentColor;
@@ -42,22 +40,26 @@ public class CandidateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
   public CandidateAdapter(Context context) {
     myContext = context;
-    trime = Trime.getService();
-    prefs = AppPrefs.defaultInstance();
     candidates = new Rime.RimeCandidate[0];
     textInputManager = TextInputManager.Companion.getInstance();
     comment_position = 0;
   }
 
   public int updateCandidates() {
-
     candidates = Rime.getCandidatesWithoutSwitch();
     if (candidates == null) {
       candidates = new Rime.RimeCandidate[0];
     }
     return candidates.length;
   }
 
+  public void setCandidates(List<SimpleKeyBean> list) {
+    candidates = new Rime.RimeCandidate[list.size()];
+    for (int i = 0; i < list.size(); i++) {
+      candidates[i] = new Rime.RimeCandidate(list.get(i).getText(), "");
+    }
+  }
+
   @Override
   public int getItemCount() {
     return candidates.length;

app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java

@@ -97,8 +97,14 @@ public SymbolKeyboardType select(int i) {
         break;
       case CANDIDATE:
         TabManager.get().select(i);
+        initCandidateAdapter();
         initCandidate();
         break;
+      case VAR_LENGTH:
+        TabManager.get().select(i);
+        initCandidateAdapter();
+        initVarLengthKeys(i);
+        break;
       case HISTORY:
       case TABS:
         TabManager.get().select(i);
@@ -336,7 +342,7 @@ public void initDraftData() {
         });
   }
 
-  public void initCandidate() {
+  public void initCandidateAdapter() {
     keyboardView.removeAllViews();
     simpleAdapter = null;
     mClipboardAdapter = null;
@@ -354,13 +360,13 @@ public void initCandidate() {
     flexboxLayoutManager.setJustifyContent(JustifyContent.FLEX_START); // 交叉轴的起点对齐。
     keyboardView.setLayoutManager(flexboxLayoutManager);
 
-    draft_max_size = Config.get(context).getDraftLimit();
-
-    draftBeanList = DraftDao.get().getAllSimpleBean(draft_max_size);
     candidateAdapter.configStyle(margin_x, margin_top);
 
     keyboardView.setAdapter(candidateAdapter);
     keyboardView.setSelected(true);
+  }
+
+  public void initCandidate() {
     candidateAdapter.updateCandidates();
 
     candidateAdapter.setOnItemClickListener(
@@ -372,6 +378,20 @@ public void initCandidate() {
         });
   }
 
+  public void initVarLengthKeys(int i) {
+    simpleKeyBeans.clear();
+    simpleKeyBeans.addAll(TabManager.get().select(i));
+    candidateAdapter.setCandidates(simpleKeyBeans);
+    candidateAdapter.setOnItemClickListener(
+        (view, position) -> {
+          InputConnection ic = Trime.getService().getCurrentInputConnection();
+          if (ic != null) {
+            SimpleKeyBean bean = simpleKeyBeans.get(position);
+            ic.commitText(bean.getText(), 1);
+          }
+        });
+  }
+
   public void updateCandidates() {
     candidateAdapter.updateCandidates();
     candidateAdapter.notifyDataSetChanged();