Skip to content

Commit e3ccb9e

Browse files
committed
refactor(keyboard): tidy KeyboardView
1 parent e5c0d7a commit e3ccb9e

File tree

5 files changed

+1493
-1614
lines changed

5 files changed

+1493
-1614
lines changed

app/src/main/java/com/osfans/trime/ime/core/InputView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ class InputView(
285285
quickBar.view.visibility =
286286
if (it.value) View.GONE else View.VISIBLE
287287
}
288-
"_hide_key_hint" -> keyboardWindow.oldMainInputView.mainKeyboardView.setShowHint(!it.value)
289-
"_hide_key_symbol" -> keyboardWindow.oldMainInputView.mainKeyboardView.setShowSymbol(!it.value)
288+
"_hide_key_hint" -> keyboardWindow.oldMainInputView.mainKeyboardView.showKeyHint = !it.value
289+
"_hide_key_symbol" -> keyboardWindow.oldMainInputView.mainKeyboardView.showKeySymbol = !it.value
290290
}
291291
keyboardWindow.oldMainInputView.mainKeyboardView.invalidateAllKeys()
292292
}

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -460,16 +460,22 @@ class Keyboard() {
460460
c: Int,
461461
key: Key?,
462462
) {
463-
if (c == KeyEvent.KEYCODE_SHIFT_LEFT || c == KeyEvent.KEYCODE_SHIFT_RIGHT) {
464-
mShiftKey = key
465-
} else if (c == KeyEvent.KEYCODE_CTRL_LEFT || c == KeyEvent.KEYCODE_CTRL_RIGHT) {
466-
mCtrlKey = key
467-
} else if (c == KeyEvent.KEYCODE_META_LEFT || c == KeyEvent.KEYCODE_META_RIGHT) {
468-
mMetaKey = key
469-
} else if (c == KeyEvent.KEYCODE_ALT_LEFT || c == KeyEvent.KEYCODE_ALT_RIGHT) {
470-
mAltKey = key
471-
} else if (c == KeyEvent.KEYCODE_SYM) {
472-
mSymKey = key
463+
when (c) {
464+
KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.KEYCODE_SHIFT_RIGHT -> {
465+
mShiftKey = key
466+
}
467+
KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.KEYCODE_CTRL_RIGHT -> {
468+
mCtrlKey = key
469+
}
470+
KeyEvent.KEYCODE_META_LEFT, KeyEvent.KEYCODE_META_RIGHT -> {
471+
mMetaKey = key
472+
}
473+
KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.KEYCODE_ALT_RIGHT -> {
474+
mAltKey = key
475+
}
476+
KeyEvent.KEYCODE_SYM -> {
477+
mSymKey = key
478+
}
473479
}
474480
}
475481

0 commit comments

Comments
 (0)