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

Add the option to insert newline in FN mode

Browse Source
This commit is contained in:
Nehemiah of Zebulun 2023-09-08 13:38:59 +02:00
parent e9c1fe030e
commit c89d4f0204
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File 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() 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 { protected open fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
val number = KeyLayout.numeric[key] ?: return KeyEventResult(true) 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, parent = super.keyCommandResolver,
onShort = HashMap(mapOf( onShort = HashMap(mapOf(
Key.N0 to Command.NEWLINE,
Key.UP to Command.VOL_UP, Key.UP to Command.VOL_UP,
Key.DOWN to Command.VOL_DOWN, Key.DOWN to Command.VOL_DOWN,
Key.LEFT to Command.BRIGHTNESS_DOWN, Key.LEFT to Command.BRIGHTNESS_DOWN,
@ -19,6 +20,7 @@ class FNInputMode: BaseInputMode() {
)), )),
onRepeat = HashMap(mapOf( onRepeat = HashMap(mapOf(
Key.N0 to Command.NEWLINE,
Key.UP to Command.VOL_UP, Key.UP to Command.VOL_UP,
Key.DOWN to Command.VOL_DOWN, Key.DOWN to Command.VOL_DOWN,
Key.LEFT to Command.BRIGHTNESS_DOWN, Key.LEFT to Command.BRIGHTNESS_DOWN,
@ -38,10 +40,11 @@ class FNInputMode: BaseInputMode() {
override fun onKeyDown(key: Key, composing: Boolean): KeyEventResult { override fun onKeyDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key)) { return when(keyCommandResolver.getCommand(key)) {
Command.BACK -> KeyEventResult(false) Command.BACK -> KeyEventResult(false)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
Command.BRIGHTNESS_DOWN -> brightnessDown() Command.BRIGHTNESS_DOWN -> brightnessDown()
Command.BRIGHTNESS_UP -> brightnessUp() Command.BRIGHTNESS_UP -> brightnessUp()
Command.NEWLINE -> commit("\n", composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
else -> KeyEventResult(true) else -> KeyEventResult(true)
} }
} }
@ -53,10 +56,11 @@ class FNInputMode: BaseInputMode() {
override fun onKeyDownRepeatedly(key: Key, repeat: Int, composing: Boolean): KeyEventResult { override fun onKeyDownRepeatedly(key: Key, repeat: Int, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, repeat = repeat)) { return when(keyCommandResolver.getCommand(key, repeat = repeat)) {
Command.HOME -> goHome(repeat, composing) Command.HOME -> goHome(repeat, composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
Command.BRIGHTNESS_DOWN -> brightnessDown() Command.BRIGHTNESS_DOWN -> brightnessDown()
Command.BRIGHTNESS_UP -> brightnessUp() Command.BRIGHTNESS_UP -> brightnessUp()
Command.NEWLINE -> commit("\n", composing)
Command.VOL_UP -> volumeUp()
Command.VOL_DOWN -> volumeDown()
else -> KeyEventResult(true) else -> KeyEventResult(true)
} }
} }