Skip to content

Commit 611cbb3

Browse files
committed
refactor(clipboard): fix typos
1 parent 65e4038 commit 611cbb3

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

app/src/main/java/com/osfans/trime/clipboard/ClipboardAdapter.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import android.view.ViewGroup;
1111
import android.widget.LinearLayout;
1212
import android.widget.TextView;
13-
import android.widget.Toast;
1413
import androidx.annotation.NonNull;
1514
import androidx.recyclerview.widget.RecyclerView;
15+
import com.blankj.utilcode.util.ToastUtils;
1616
import com.google.android.flexbox.FlexboxLayoutManager;
1717
import com.osfans.trime.R;
1818
import com.osfans.trime.ime.symbol.SimpleKeyBean;
@@ -42,7 +42,7 @@ public void configStyle(int keyMarginX, int keyMarginTop) {
4242
this.keyMarginX = keyMarginX;
4343
this.keyMarginTop = keyMarginTop;
4444

45-
// 边框尺寸、圆角、字号直接读取主题通用参数。配色优先读取liquidKeyboard专用参数
45+
// 边框尺寸、圆角、字号直接读取主题通用参数。配色优先读取 liquidKeyboard 专用参数
4646
Config config = Config.get(myContext);
4747
textColor = config.getLiquidColor("long_text_color");
4848
if (textColor == null) textColor = config.getLiquidColor("key_text_color");
@@ -105,27 +105,27 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int in
105105
flexboxLp.setMargins(marginX, marginTop, marginX, flexboxLp.getMarginBottom());
106106

107107
// TODO 设置剪贴板列表样式
108-
// copy SimpleAdapter会造成高度始终为3行无法自适应的效果
108+
// copy SimpleAdapter 会造成高度始终为 3 行无法自适应的效果
109109

110110
}
111111

112112
if (background != null) itemViewHold.listItemLayout.setBackground(background);
113113

114114
// 如果设置了回调,则设置点击事件
115-
if (mOnItemClickLitener != null) {
115+
if (mOnItemClickListener != null) {
116116
itemViewHold.listItemLayout.setOnClickListener(
117117
view -> {
118118
int position = itemViewHold.getLayoutPosition();
119-
mOnItemClickLitener.onItemClick(itemViewHold.listItemLayout, position);
119+
mOnItemClickListener.onItemClick(itemViewHold.listItemLayout, position);
120120
});
121121
}
122122

123123
itemViewHold.listItemLayout.setOnLongClickListener(
124124
view -> {
125125
int position = itemViewHold.getLayoutPosition();
126126
// TODO 长按删除、编辑剪贴板
127-
// 当文本较长时,目前样式只缩略显示为3行,长按时tosat消息可以预览全文,略有用处。
128-
Toast.makeText(myContext, list.get(position).getText(), Toast.LENGTH_SHORT).show();
127+
// 当文本较长时,目前样式只缩略显示为 3 行,长按时 toast 消息可以预览全文,略有用处。
128+
ToastUtils.showShort(list.get(position).getText());
129129
return true;
130130
});
131131

@@ -145,14 +145,14 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int in
145145
}
146146
}
147147

148-
/*=====================添加OnItemClickListener回调================================*/
149-
public interface OnItemClickLitener {
148+
/** 添加 OnItemClickListener 回调 **/
149+
public interface OnItemClickListener {
150150
void onItemClick(View view, int position);
151151
}
152152

153-
private ClipboardAdapter.OnItemClickLitener mOnItemClickLitener;
153+
private OnItemClickListener mOnItemClickListener;
154154

155-
public void setOnItemClickLitener(ClipboardAdapter.OnItemClickLitener mOnItemClickLitener) {
156-
this.mOnItemClickLitener = mOnItemClickLitener;
155+
public void setOnItemClickListener(OnItemClickListener mOnItemClickListener) {
156+
this.mOnItemClickListener = mOnItemClickListener;
157157
}
158158
}

app/src/main/java/com/osfans/trime/clipboard/ClipboardBean.java

+2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@ public ClipboardBean(String text) {
4343
this.html = "";
4444
}
4545

46+
@SuppressWarnings("unused")
4647
public ClipboardBean(String text, String html) {
4748
this.text = text;
4849
this.time = System.currentTimeMillis();
4950
this.type = 1;
5051
this.html = html;
5152
}
5253

54+
@SuppressWarnings("unused")
5355
public ClipboardBean(String text, String html, int type, long time) {
5456
this.text = text;
5557
this.time = time;

app/src/main/java/com/osfans/trime/clipboard/ClipboardDao.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import android.database.Cursor;
44
import android.database.sqlite.SQLiteDatabase;
55
import android.database.sqlite.SQLiteOpenHelper;
6+
7+
import androidx.annotation.NonNull;
8+
69
import com.osfans.trime.ime.core.Trime;
710
import com.osfans.trime.ime.symbol.SimpleKeyBean;
811
import java.util.ArrayList;
@@ -21,8 +24,7 @@ public static ClipboardDao get() {
2124

2225
public ClipboardDao() {}
2326

24-
public void insert(ClipboardBean clipboardBean) {
25-
27+
public void insert(@NonNull ClipboardBean clipboardBean) {
2628
helper = new ClipboardSqlHelper(Trime.getService(), "clipboard.db", null, 1);
2729
SQLiteDatabase db = helper.getWritableDatabase();
2830
db.execSQL(
@@ -36,8 +38,8 @@ public void insert(ClipboardBean clipboardBean) {
3638
db.close();
3739
}
3840

39-
// 删除文字相同的剪贴板记录,插入新记录
40-
public void add(ClipboardBean clipboardBean) {
41+
/** 删除文字相同的剪贴板记录,插入新记录 **/
42+
public void add(@NonNull ClipboardBean clipboardBean) {
4143
helper = new ClipboardSqlHelper(Trime.getService(), "clipboard.db", null, 1);
4244
SQLiteDatabase db = helper.getWritableDatabase();
4345
db.delete("t_clipboard", "text=?", new String[] {clipboardBean.getText()});
@@ -52,8 +54,7 @@ public void add(ClipboardBean clipboardBean) {
5254
db.close();
5355
}
5456

55-
public void update(ClipboardBean clipboardBean) {
56-
57+
public void update(@NonNull ClipboardBean clipboardBean) {
5758
helper = new ClipboardSqlHelper(Trime.getService(), "clipboard.db", null, 1);
5859
SQLiteDatabase db = helper.getWritableDatabase();
5960
db.execSQL(

app/src/main/java/com/osfans/trime/clipboard/ClipboardSqlHelper.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import android.content.Context;
44
import android.database.sqlite.SQLiteDatabase;
55
import android.database.sqlite.SQLiteOpenHelper;
6+
7+
import androidx.annotation.NonNull;
8+
69
import timber.log.Timber;
710

811
public class ClipboardSqlHelper extends SQLiteOpenHelper {
@@ -23,7 +26,7 @@ public void onOpen(SQLiteDatabase db) {
2326
}
2427

2528
@Override
26-
public void onCreate(SQLiteDatabase db) {
29+
public void onCreate(@NonNull SQLiteDatabase db) {
2730
Timber.i("create db");
2831
db.execSQL(CREATE_STUDENT);
2932
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void initClipboardData() {
220220
// 调用ListView的setSelected(!ListView.isSelected())方法,这样就能及时刷新布局
221221
keyboardView.setSelected(true);
222222

223-
mClipboardAdapter.setOnItemClickLitener(
223+
mClipboardAdapter.setOnItemClickListener(
224224
(view, position) -> {
225225
InputConnection ic = Trime.getService().getCurrentInputConnection();
226226
if (ic != null) {

0 commit comments

Comments
 (0)