wephone/wekeyT9
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wephone:43df87f5ef034b194e45bbce300e705456d61a1c
Branches Tags
wephone:master
...
compare: wephone:c89d4f02045f45df5d0156186d41e637fbdd6ecd
Branches Tags
wephone:master

2 Commits
43df87f5ef ... c89d4f0204

Author SHA1 Message Date
Nehemiah of Zebulun
c89d4f0204 Add the option to insert newline in FN mode 2023-09-08 13:38:59 +02:00
Nehemiah of Zebulun
e9c1fe030e Make order in methods 2023-09-08 10:54:13 +02:00
3 changed files with 22 additions and 10 deletions
Show Stats Expand all files Collapse all files

8
app/src/main/java/net/mezimmah/wkt9/inputmode/BaseInputMode.kt
View File

@ -40,6 +40,14 @@ open class BaseInputMode: InputMode {
return KeyEventResult()
}
protected fun commit(text: String, composing: Boolean): KeyEventResult {
return KeyEventResult(
consumed = true,
finishComposing = composing,
commit = text
)
}
protected open fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
val number = KeyLayout.numeric[key] ?: return KeyEventResult(true)

12
app/src/main/java/net/mezimmah/wkt9/inputmode/FNInputMode.kt
View File

@ -12,6 +12,7 @@ class FNInputMode: BaseInputMode() {
parent = super.keyCommandResolver,
onShort = HashMap(mapOf(
Key.N0 to Command.NEWLINE,
Key.UP to Command.VOL_UP,
Key.DOWN to Command.VOL_DOWN,
Key.LEFT to Command.BRIGHTNESS_DOWN,
@ -19,6 +20,7 @@ class FNInputMode: BaseInputMode() {
)),
onRepeat = HashMap(mapOf(
Key.N0 to Command.NEWLINE,
Key.UP to Command.VOL_UP,
Key.DOWN to Command.VOL_DOWN,
Key.LEFT to Command.BRIGHTNESS_DOWN,
@ -38,10 +40,11 @@ class FNInputMode: BaseInputMode() {
override fun onKeyDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key)) {
Command.BACK -> KeyEventResult(false)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
Command.BRIGHTNESS_DOWN -> brightnessDown()
Command.BRIGHTNESS_UP -> brightnessUp()
Command.NEWLINE -> commit("\n", composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
else -> KeyEventResult(true)
}
}
@ -53,10 +56,11 @@ class FNInputMode: BaseInputMode() {
override fun onKeyDownRepeatedly(key: Key, repeat: Int, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, repeat = repeat)) {
Command.HOME -> goHome(repeat, composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
Command.BRIGHTNESS_DOWN -> brightnessDown()
Command.BRIGHTNESS_UP -> brightnessUp()
Command.NEWLINE -> commit("\n", composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
else -> KeyEventResult(true)
}
}

12
app/src/main/java/net/mezimmah/wkt9/inputmode/WordInputMode.kt
View File

@ -66,6 +66,12 @@ class WordInputMode: BaseInputMode() {
}
}
override fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
codeWord.clear()
return super.commitNumber(key, composing)
}
override fun deleteCharacter(composing: Boolean): KeyEventResult {
codeWord.clear()
@ -115,12 +121,6 @@ class WordInputMode: BaseInputMode() {
)
}
override fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
codeWord.clear()
return super.commitNumber(key, composing)
}
private fun reset() {
codeWord.clear()