refactor(symbol): fix typos

Bambooin · Sep 21, 2021 · ecbb36e · ecbb36e
1 parent 611cbb3
commit ecbb36e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java b/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java
@@ -180,7 +180,7 @@ public void initFixData(int i) {
     keyboardView.setSelected(true);
 
     // 列表适配器的点击监听事件
-    simpleAdapter.setOnItemClickLitener(
+    simpleAdapter.setOnItemClickListener(
         (view, position) -> {
           InputConnection ic = Trime.getService().getCurrentInputConnection();
           if (ic != null) {

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
@@ -32,14 +32,14 @@ public SimpleAdapter(Context context, List<SimpleKeyBean> itemlist) {
     list = itemlist;
   }
 
-  public void configStyle(int keyWidth, int keyHegith, int keyMarginX, int keyMarginTop) {
+  public void configStyle(int keyWidth, int keyHeight, int keyMarginX, int keyMarginTop) {
     // 由于按键宽度、横向间距会影响键盘左右两侧到屏幕边缘的距离，而前者需要提前计算，故adapter直接接收参数，不重新读取设置
-    this.keyHeight = keyHegith;
+    this.keyHeight = keyHeight;
     this.keyWidth = keyWidth;
     this.keyMarginX = keyMarginX;
     this.keyMarginTop = keyMarginTop;
 
-    Timber.d("configStyle keyHeight=%s", keyHegith);
+    Timber.d("configStyle keyHeight = %s", keyHeight);
 
     //  边框尺寸、圆角、字号直接读取主题通用参数。
     Config config = Config.get(myContext);
@@ -120,11 +120,11 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int in
         }
       }
 
-      if (mOnItemClickLitener != null) {
+      if (mOnItemClickListener != null) {
         itemViewHold.listItemLayout.setOnClickListener(
             view -> {
               int position = itemViewHold.getLayoutPosition(); // 在增加数据或者减少数据时候，position和index就不一样了
-              mOnItemClickLitener.onItemClick(itemViewHold.listItemLayout, position);
+              mOnItemClickListener.onItemClick(itemViewHold.listItemLayout, position);
             });
       }
 
@@ -145,13 +145,13 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int in
   }
 
   /*=====================添加OnItemClickListener回调================================*/
-  public interface OnItemClickLitener {
+  public interface OnItemClickListener {
     void onItemClick(View view, int position);
   }
 
-  private OnItemClickLitener mOnItemClickLitener;
+  private OnItemClickListener mOnItemClickListener;
 
-  public void setOnItemClickLitener(OnItemClickLitener mOnItemClickLitener) {
-    this.mOnItemClickLitener = mOnItemClickLitener;
+  public void setOnItemClickListener(OnItemClickListener mOnItemClickListener) {
+    this.mOnItemClickListener = mOnItemClickListener;
   }
 }
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyBean.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyBean.java
@@ -33,6 +33,6 @@ public String getLabel() {
   @NonNull
   @Override
   public String toString() {
-    return "SimpleKeyBean{" + "text='" + text + '\'' + ", label='" + label + '\'' + '}';
+    return "SimpleKeyBean {" + "text='" + text + '\'' + ", label='" + label + '\'' + '}';
   }
 }
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyDao.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyDao.java
@@ -1,5 +1,7 @@
 package com.osfans.trime.ime.symbol;
 
+import androidx.annotation.NonNull;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -11,7 +13,8 @@
 
 public class SimpleKeyDao {
 
-  public static List<SimpleKeyBean> SimpleKeyboard(String string) {
+  @NonNull
+  public static List<SimpleKeyBean> SimpleKeyboard(@NonNull String string) {
     String[] strings = string.split("\n+");
     List<SimpleKeyBean> list = new ArrayList<>();
     for (String str : strings) {
@@ -22,7 +25,8 @@ public static List<SimpleKeyBean> SimpleKeyboard(String string) {
     return list;
   }
 
-  public static List<SimpleKeyBean> Single(String string) {
+  @NonNull
+  public static List<SimpleKeyBean> Single(@NonNull String string) {
     List<SimpleKeyBean> list = new ArrayList<>();
 
     char h = 0;
@@ -37,6 +41,7 @@ else if (c >= '\udc00' && c <= '\udfff')
     return list;
   }
 
+  @NonNull
   public static List<SimpleKeyBean> getSymbolKeyHistory(String path) {
     List<SimpleKeyBean> list = new ArrayList<>();
 
@@ -66,7 +71,7 @@ public static List<SimpleKeyBean> getSymbolKeyHistory(String path) {
     return list;
   }
 
-  public static void saveSymbolKeyHistory(String path, List<SimpleKeyBean> list) {
+  public static void saveSymbolKeyHistory(String path, @NonNull List<SimpleKeyBean> list) {
     ObjectOutputStream fos = null;
     List<String> text_list = new ArrayList<>();
     List<SimpleKeyBean> cache = new ArrayList<>();

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/TabManager.java b/app/src/main/java/com/osfans/trime/ime/symbol/TabManager.java
@@ -1,5 +1,6 @@
 package com.osfans.trime.ime.symbol;
 
+import androidx.annotation.NonNull;
 import com.osfans.trime.ime.enums.KeyCommandType;
 import com.osfans.trime.ime.enums.SymbolKeyboardType;
 import java.util.ArrayList;
@@ -35,7 +36,7 @@ private TabManager() {
     keyboard = new ArrayList<>();
   }
 
-  public void addTab(String name, SymbolKeyboardType type, List<SimpleKeyBean> keyBeans) {
+  public void addTab(@NonNull String name, SymbolKeyboardType type, List<SimpleKeyBean> keyBeans) {
     if (name.trim().length() < 1) return;
 
     if (SymbolKeyboardType.Companion.needKeys(type)) {
@@ -111,15 +112,15 @@ public int getSelected() {
     return selected;
   }
 
-  public TabTag[] getTabCanditates() {
-    boolean add_exit = true;
+  public TabTag[] getTabCandidates() {
+    boolean addExit = true;
     for (TabTag tag : tabTags) {
       if (tag.command == KeyCommandType.EXIT) {
-        add_exit = false;
+        addExit = false;
         break;
       }
     }
-    if (add_exit) {
+    if (addExit) {
       tabTags.add(tagExit);
       keyboards.add(notKeyboard);
     }

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/TabView.java b/app/src/main/java/com/osfans/trime/ime/symbol/TabView.java
@@ -197,7 +197,7 @@ public void updateCandidateWidth() {
     int i;
     int x = 0;
 
-    candidates = TabManager.get().getTabCanditates();
+    candidates = TabManager.get().getTabCandidates();
     highlightIndex = TabManager.get().getSelected();
     num_candidates = candidates.length;