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

Safe progress

Browse Source
This commit is contained in:
Nehemiah of Zebulun 2023-08-30 12:56:26 +02:00
parent a356774001
commit 113a3b994d
11 changed files with 117 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/net/mezimmah/wkt9/WKT9.kt
View File

@ -320,6 +320,7 @@ class WKT9: InputMethodService() {
if (res.startComposing) markComposingRegion()
if (!res.codeWord.isNullOrEmpty()) onCodeWordUpdate(res.codeWord, res.timeout)
if (!res.candidates.isNullOrEmpty()) onCandidates(res.candidates, res.timeout)
if (!res.commit.isNullOrEmpty()) onCommit(res.commit)
if (res.deleteBeforeCursor > 0 || res.deleteAfterCursor > 0) onDelete(res.deleteBeforeCursor, res.deleteAfterCursor)
if (res.goHome) goHome()
if (res.left) onLeft()
@ -405,6 +406,10 @@ class WKT9: InputMethodService() {
}
}
private fun onCommit(text: String) {
commitText(text, cursorPosition, cursorPosition)
}
private fun onDelete(beforeCursor: Int, afterCursor: Int) {
clearCandidates()
deleteText(beforeCursor, afterCursor)
@ -444,7 +449,7 @@ class WKT9: InputMethodService() {
recorder = MediaRecorder(this).also {
recording = File.createTempFile("recording.3gp", null, cacheDir)
it.setAudioSource(MediaRecorder.AudioSource.VOICE_RECOGNITION)
it.setAudioSource(MediaRecorder.AudioSource.MIC)
it.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP)
it.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB)
it.setOutputFile(recording)

15
app/src/main/java/net/mezimmah/wkt9/inputmode/AlphaInputMode.kt
View File

@ -28,9 +28,7 @@ class AlphaInputMode: InputMode {
return when(keyCommandResolver.getCommand(key)) {
Command.BACK -> KeyEventResult(consumed = false)
Command.CHARACTER -> composeCharacter(key, composing)
Command.DELETE -> deleteCharacter(composing)
Command.SPACE -> finalizeWordOrSentence(composing)
Command.LEFT -> navigateLeft()
Command.RIGHT -> navigateRight()
Command.SELECT -> focus()
@ -41,6 +39,7 @@ class AlphaInputMode: InputMode {
override fun onKeyLongDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, true)) {
Command.RECORD -> record(composing)
Command.NUMBER -> commitNumber(key, composing)
Command.SWITCH_MODE -> switchMode(composing)
else -> KeyEventResult(true)
}
@ -57,7 +56,9 @@ class AlphaInputMode: InputMode {
override fun afterKeyDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, after = true)) {
Command.BACK -> goBack(composing)
Command.CHARACTER -> composeCharacter(key, composing)
Command.SHIFT_MODE -> shiftMode()
Command.SPACE -> finalizeWordOrSentence(composing)
else -> KeyEventResult()
}
}
@ -76,6 +77,16 @@ class AlphaInputMode: InputMode {
)
}
private fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
val code = KeyLayout.numeric[key] ?: return KeyEventResult(true)
return KeyEventResult(
consumed = true,
finishComposing = composing,
commit = code.toString()
)
}
private fun composeCharacter(key: Key, composing: Boolean): KeyEventResult {
if (composing && !newKey) return navigateRight()

39
app/src/main/java/net/mezimmah/wkt9/inputmode/NumericInputMode.kt
View File

@ -12,6 +12,20 @@ class NumericInputMode: InputMode {
private val parentKeyCommandResolver: KeyCommandResolver = KeyCommandResolver.getBasic()
private val keyCommandResolver: KeyCommandResolver = KeyCommandResolver(
parent = parentKeyCommandResolver,
onLong = HashMap(mapOf(
Key.N0 to Command.SPACE,
Key.N1 to Command.CHARACTER,
Key.N2 to Command.CHARACTER,
Key.N3 to Command.CHARACTER,
Key.N4 to Command.CHARACTER,
Key.N5 to Command.CHARACTER,
Key.N6 to Command.CHARACTER,
Key.N7 to Command.CHARACTER,
Key.N8 to Command.CHARACTER,
Key.N9 to Command.CHARACTER
)),
afterShort = HashMap(mapOf(
Key.N0 to Command.NUMBER,
Key.N1 to Command.NUMBER,
@ -52,6 +66,8 @@ class NumericInputMode: InputMode {
override fun onKeyLongDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, true)) {
Command.CHARACTER -> composeCharacter(key, composing)
Command.SPACE -> insertSpace(composing)
Command.SWITCH_MODE -> switchMode(composing)
else -> KeyEventResult(true)
}
@ -86,10 +102,8 @@ class NumericInputMode: InputMode {
)
}
private fun composeNumber(key: Key, composing: Boolean): KeyEventResult {
if (composing && !newKey) return navigateRight()
val layout = KeyLayout.numeric[key] ?: return KeyEventResult(true)
private fun composeCharacter(key: Key, composing: Boolean): KeyEventResult {
val layout = KeyLayout.en_US[key] ?: return KeyEventResult(true)
val candidates = layout.map { it.toString() }
return KeyEventResult(
@ -97,14 +111,17 @@ class NumericInputMode: InputMode {
finishComposing = composing,
startComposing = true,
candidates = candidates,
timeout = 400
timeout = 1200
)
}
private fun focus(): KeyEventResult {
private fun composeNumber(key: Key, composing: Boolean): KeyEventResult {
val code = KeyLayout.numeric[key] ?: return KeyEventResult(true)
return KeyEventResult(
consumed = true,
focus = true
finishComposing = composing,
commit = code.toString()
)
}
@ -125,6 +142,14 @@ class NumericInputMode: InputMode {
)
}
private fun insertSpace(composing: Boolean): KeyEventResult {
return KeyEventResult(
consumed = true,
finishComposing = composing,
commit = " "
)
}
private fun keyStats(key: Key) {
when (key != lastKey) {
true -> {

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

@ -5,6 +5,7 @@ import net.mezimmah.wkt9.keypad.Command
import net.mezimmah.wkt9.keypad.Key
import net.mezimmah.wkt9.keypad.KeyCommandResolver
import net.mezimmah.wkt9.keypad.KeyEventResult
import net.mezimmah.wkt9.keypad.KeyLayout
import java.lang.StringBuilder
class WordInputMode: InputMode {
@ -29,9 +30,7 @@ class WordInputMode: InputMode {
return when(keyCommandResolver.getCommand(key)) {
Command.BACK -> KeyEventResult(consumed = false)
Command.CHARACTER -> buildCodeWord(key)
Command.DELETE -> deleteCharacter(0, composing)
Command.SPACE -> finalizeWordOrSentence(composing)
Command.LEFT -> navigateLeft()
Command.RIGHT -> navigateRight()
Command.SELECT -> focus()
@ -43,6 +42,7 @@ class WordInputMode: InputMode {
return when(keyCommandResolver.getCommand(key, true)) {
Command.RECORD -> record(composing)
Command.SWITCH_MODE -> switchMode(composing)
Command.NUMBER -> commitNumber(key, composing)
else -> KeyEventResult(true)
}
}
@ -58,7 +58,9 @@ class WordInputMode: InputMode {
override fun afterKeyDown(key: Key, composing: Boolean): KeyEventResult {
return when(keyCommandResolver.getCommand(key, after = true)) {
Command.BACK -> goBack(composing)
Command.CHARACTER -> buildCodeWord(key)
Command.SHIFT_MODE -> shiftMode(composing)
Command.SPACE -> finalizeWordOrSentence(composing)
else -> KeyEventResult()
}
}
@ -72,8 +74,9 @@ class WordInputMode: InputMode {
private fun buildCodeWord(key: Key): KeyEventResult {
val startComposing = codeWord.isEmpty()
val code = KeyLayout.numeric[key]
codeWord.append(key.code)
codeWord.append(code)
return KeyEventResult(
codeWord = codeWord,
@ -82,6 +85,16 @@ class WordInputMode: InputMode {
)
}
private fun commitNumber(key: Key, composing: Boolean): KeyEventResult {
val number = KeyLayout.numeric[key] ?: return KeyEventResult(true)
return KeyEventResult(
consumed = true,
finishComposing = composing,
commit = number.toString()
)
}
private fun deleteCharacter(repeat: Int = 0, composing: Boolean): KeyEventResult {
if (repeat == 0) codeWord.clear()

4
app/src/main/java/net/mezimmah/wkt9/keypad/Command.kt
View File

@ -6,7 +6,6 @@ enum class Command {
SPACE,
NEWLINE,
DELETE,
CYCLE_CANDIDATES,
SELECT,
SHIFT_MODE,
SWITCH_MODE,
@ -16,5 +15,6 @@ enum class Command {
RECORD,
TRANSCRIBE,
BACK,
HOME
HOME,
FN
}

41
app/src/main/java/net/mezimmah/wkt9/keypad/Key.kt
View File

@ -1,23 +1,24 @@
package net.mezimmah.wkt9.keypad
enum class Key(val code: Char) {
N0('0'),
N1('1'),
N2('2'),
N3('3'),
N4('4'),
N5('5'),
N6('6'),
N7('7'),
N8('8'),
N9('9'),
STAR('*'),
POUND('#'),
UP('a'),
DOWN('b'),
LEFT('c'),
RIGHT('d'),
SELECT('e'),
DELETE('f'),
BACK('g'),
enum class Key() {
N0,
N1,
N2,
N3,
N4,
N5,
N6,
N7,
N8,
N9,
FN,
STAR,
POUND,
UP,
DOWN,
LEFT,
RIGHT,
SELECT,
DELETE,
BACK,
}

2
app/src/main/java/net/mezimmah/wkt9/keypad/KeyCodeMapping.kt
View File

@ -25,7 +25,7 @@ class KeyCodeMapping(
16 to Key.N9,
17 to Key.STAR,
18 to Key.POUND,
82 to Key.DELETE,
82 to Key.FN,
19 to Key.UP,
20 to Key.DOWN,
21 to Key.LEFT,

24
app/src/main/java/net/mezimmah/wkt9/keypad/KeyCommandResolver.kt
View File

@ -28,17 +28,6 @@ class KeyCommandResolver (
return KeyCommandResolver(
onShort = HashMap(mapOf(
Key.BACK to Command.BACK,
Key.N0 to Command.SPACE,
Key.N1 to Command.CHARACTER,
Key.N2 to Command.CHARACTER,
Key.N3 to Command.CHARACTER,
Key.N4 to Command.CHARACTER,
Key.N5 to Command.CHARACTER,
Key.N6 to Command.CHARACTER,
Key.N7 to Command.CHARACTER,
Key.N8 to Command.CHARACTER,
Key.N9 to Command.CHARACTER,
Key.LEFT to Command.LEFT,
Key.RIGHT to Command.RIGHT,
@ -46,7 +35,6 @@ class KeyCommandResolver (
Key.DOWN to Command.NAVIGATE,
Key.STAR to Command.DELETE,
Key.DELETE to Command.DELETE,
Key.SELECT to Command.SELECT
)),
@ -67,6 +55,18 @@ class KeyCommandResolver (
)),
afterShort = HashMap(mapOf(
Key.N0 to Command.SPACE,
Key.N1 to Command.CHARACTER,
Key.N2 to Command.CHARACTER,
Key.N3 to Command.CHARACTER,
Key.N4 to Command.CHARACTER,
Key.N5 to Command.CHARACTER,
Key.N6 to Command.CHARACTER,
Key.N7 to Command.CHARACTER,
Key.N8 to Command.CHARACTER,
Key.N9 to Command.CHARACTER,
Key.BACK to Command.BACK,
Key.POUND to Command.SHIFT_MODE,
)),

1
app/src/main/java/net/mezimmah/wkt9/keypad/KeyEventResult.kt
View File

@ -9,6 +9,7 @@ data class KeyEventResult(
val startComposing: Boolean = false,
val codeWord: StringBuilder? = null,
val candidates: List<String>? = null,
val commit: String? = null,
val timeout: Int? = null,
val deleteBeforeCursor: Int = 0,
val deleteAfterCursor: Int = 0,

20
app/src/main/java/net/mezimmah/wkt9/keypad/KeyLayout.kt
View File

@ -3,16 +3,16 @@ package net.mezimmah.wkt9.keypad
object KeyLayout {
// Map for number input mode
val numeric = mapOf(
Key.N0 to listOf('0'),
Key.N1 to listOf('1'),
Key.N2 to listOf('2'),
Key.N3 to listOf('3'),
Key.N4 to listOf('4'),
Key.N5 to listOf('5'),
Key.N6 to listOf('6'),
Key.N7 to listOf('7'),
Key.N8 to listOf('8'),
Key.N9 to listOf('9'),
Key.N0 to 0,
Key.N1 to 1,
Key.N2 to 2,
Key.N3 to 3,
Key.N4 to 4,
Key.N5 to 5,
Key.N6 to 6,
Key.N7 to 7,
Key.N8 to 8,
Key.N9 to 9,
)
val en_US = mapOf(

4
app/src/main/java/net/mezimmah/wkt9/keypad/Keypad.kt
View File

@ -1,5 +1,6 @@
package net.mezimmah.wkt9.keypad
import android.util.Log
import net.mezimmah.wkt9.exception.MissingLetterCode
import java.lang.StringBuilder
@ -49,7 +50,8 @@ class Keypad(
}
private fun codeForLetter(letter: Char): Char? {
return letterKeyMap[letter]?.code
Log.d("wkt9", "Letter key map: letterKeyMap")
return ' ' //letterKeyMap[letter]?.code
}
private fun initKeyMaps(layout: Map<Key, List<Char>>): Map<Char, Key> {