Skip to content

Commit fc3c75f

Browse files
WhiredPlanckBambooin
authored andcommitted
utils: try to meet styling specification
1 parent 512cdc8 commit fc3c75f

File tree

8 files changed

+12
-15
lines changed

8 files changed

+12
-15
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.osfans.trime.ime.enums.SymbolKeyboardType;
1515
import com.osfans.trime.setup.Config;
1616
import com.osfans.trime.util.YamlUtils;
17-
1817
import java.io.File;
1918
import java.util.ArrayList;
2019
import java.util.List;

app/src/main/java/com/osfans/trime/ime/core/Trime.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,8 @@ private boolean handleAction(int code, int mask) { // 編輯操作
866866
etr.token = 0;
867867
final ExtractedText et = ic.getExtractedText(etr, 0);
868868
if (et != null) {
869-
int nextPosition = StringUtils.INSTANCE.findNextSection(et.text, et.startOffset + et.selectionEnd);
869+
int nextPosition =
870+
StringUtils.INSTANCE.findNextSection(et.text, et.startOffset + et.selectionEnd);
870871
ic.setSelection(nextPosition, nextPosition);
871872
return true;
872873
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ enum class SymbolKeyboardType {
2525
LONG,
2626

2727
// 需要展开显示的多行内容(不省略内容)
28-
MULT_LINE,
28+
MULTI_LINE,
2929

3030
// 成对显示的符号。当光标选中一段文字时,点击此分类的符号,用成对符号包裹选中内容。当光标未选择文本时,插入一对符号并移动光标到符号内侧。
31-
PAIR, ;
31+
PAIR;
3232

3333
companion object {
3434
private val convertMap: HashMap<String, SymbolKeyboardType> = hashMapOf()

app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java

-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@
2323
import android.graphics.drawable.Drawable;
2424
import android.util.DisplayMetrics;
2525
import android.view.KeyEvent;
26-
2726
import androidx.annotation.NonNull;
28-
2927
import com.osfans.trime.setup.Config;
3028
import com.osfans.trime.util.YamlUtils;
31-
3229
import java.util.ArrayList;
3330
import java.util.List;
3431
import java.util.Map;

app/src/main/java/com/osfans/trime/settings/PrefMainActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.osfans.trime.settings
33
import android.Manifest
44
import android.annotation.TargetApi
55
import android.app.ProgressDialog
6-
import android.content.Context
76
import android.content.Intent
87
import android.content.pm.PackageManager
98
import android.net.Uri

app/src/main/java/com/osfans/trime/util/ImeUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ object ImeUtils {
2121
) ?: "(none)"
2222
return selectedImeIds == IME_ID
2323
}
24-
}
24+
}

app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ object ShortcutUtils {
4949
}
5050
else -> IntentUtils.getLaunchAppIntent(arg)
5151
}
52-
intent.flags = (Intent.FLAG_ACTIVITY_NEW_TASK
53-
or Intent.FLAG_ACTIVITY_NO_HISTORY)
52+
intent.flags = (
53+
Intent.FLAG_ACTIVITY_NEW_TASK
54+
or Intent.FLAG_ACTIVITY_NO_HISTORY
55+
)
5456
ActivityUtils.startActivity(intent)
5557
}
5658

@@ -59,7 +61,7 @@ object ShortcutUtils {
5961
var intent = Intent(act)
6062
when (act) {
6163
// Search or open link
62-
// Note that web_search cannot directly open link
64+
// Note that web_search cannot directly open link
6365
Intent.ACTION_WEB_SEARCH, Intent.ACTION_SEARCH -> {
6466
if (arg.startsWith("http")) {
6567
startIntent(arg)
@@ -109,8 +111,7 @@ object ShortcutUtils {
109111
private fun pasteFromClipboard(context: Context): CharSequence {
110112
val systemClipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
111113
val systemPrimaryClip = systemClipboardManager.primaryClip
112-
return if (systemPrimaryClip?.getItemAt(0)?.text == null) {""}
113-
else systemPrimaryClip.getItemAt(0)?.text!!
114+
return if (systemPrimaryClip?.getItemAt(0)?.text == null) { "" } else systemPrimaryClip.getItemAt(0)?.text!!
114115
}
115116

116117
fun syncInBackground(context: Context) {

app/src/main/java/com/osfans/trime/util/YamlUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ object YamlUtils {
3737
val f = this.getFloat(key, default)
3838
return SizeUtils.applyDimension(f, TypedValue.COMPLEX_UNIT_SP).toInt()
3939
}
40-
}
40+
}

0 commit comments

Comments
 (0)