fix: switch hide_comment not works

Author: tumuyan

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

@@ -39,6 +39,7 @@ public class CandidateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
   private PositionType textPosition, commentPosition;
   private static int COMMENT_UNKNOW = 0, COMMENT_TOP = 1, COMMENT_DOWN = 2, COMMENT_RIGHT = 3;
   private static int comment_position;
+  private static boolean hide_comment;
 
   public CandidateAdapter(Context context) {
     myContext = context;
@@ -76,11 +77,15 @@ public void configStyle(int keyMarginX, int keyMarginTop) {
     textColor = config.getLiquidColor("long_text_color");
     if (textColor == null) textColor = config.getLiquidColor("key_text_color");
 
-    comment_position = config.getInt("comment_position");
-    if (comment_position == COMMENT_UNKNOW) {
-      comment_position = config.getBoolean("comment_on_top") ? COMMENT_TOP : COMMENT_RIGHT;
+    hide_comment = Rime.getOption("_hide_comment");
+    if (hide_comment) {
+      comment_position = COMMENT_RIGHT;
+    } else {
+      comment_position = config.getInt("comment_position");
+      if (comment_position == COMMENT_UNKNOW) {
+        comment_position = config.getBoolean("comment_on_top") ? COMMENT_TOP : COMMENT_RIGHT;
+      }
     }
-
     textSize = config.getFloat("candidate_text_size");
 
     background =
@@ -132,8 +137,8 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int in
       if (textFont != null) itemViewHold.textView1.setTypeface(textFont);
 
       String text = candidates[index].text;
-      String comment = candidates[index].comment;
-      if (comment == null) comment = "";
+      String comment = "";
+      if (!hide_comment && candidates[index].comment != null) comment = candidates[index].comment;
 
       if (text.length() > 300) itemViewHold.textView1.setText(text.substring(0, 300));
       else itemViewHold.textView1.setText(text);

app/src/main/java/com/osfans/trime/ime/text/Candidate.java

@@ -306,12 +306,12 @@ private void updateCandidateWidth() {
           break;
         }
       }
-
+      String comment = null, text = candidates[n].text;
       float candidateWidth =
-          graphicUtils.measureText(candidatePaint, candidates[n].text, candidateFont)
-              + 2 * candidatePadding;
+          graphicUtils.measureText(candidatePaint, text, candidateFont) + 2 * candidatePadding;
+
       if (shouldShowComment) {
-        String comment = candidates[n].comment;
+        comment = candidates[n].comment;
         if (!TextUtils.isEmpty(comment)) {
           float commentWidth = graphicUtils.measureText(commentPaint, comment, commentFont);
           candidateWidth =
@@ -333,9 +333,7 @@ private void updateCandidateWidth() {
 
       computedCandidates.add(
           new ComputedCandidate.Word(
-              candidates[n].text,
-              candidates[n].comment,
-              new Rect(x, 0, (int) (x + candidateWidth), getMeasuredHeight())));
+              text, comment, new Rect(x, 0, (int) (x + candidateWidth), getMeasuredHeight())));
       x += candidateWidth + candidateSpacing;
     }
     if (Rime.hasLeft()) {