diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c95d834..446fcec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + diff --git a/app/src/main/java/net/mezimmah/wkt9/WKT9.kt b/app/src/main/java/net/mezimmah/wkt9/WKT9.kt index d13abef..c36f3f1 100644 --- a/app/src/main/java/net/mezimmah/wkt9/WKT9.kt +++ b/app/src/main/java/net/mezimmah/wkt9/WKT9.kt @@ -1,6 +1,7 @@ package net.mezimmah.wkt9 import android.annotation.SuppressLint +import android.content.Context import android.content.Intent import android.inputmethodservice.InputMethodService import android.media.AudioManager @@ -398,7 +399,7 @@ class WKT9: InputMethodService(), SpellCheckerSession.SpellCheckerSessionListene commitHistory.add(lastComposed) - loadSuggestions(commitHistory.joinToString("")) +// loadSuggestions(commitHistory.joinToString("")) } private fun loadSuggestions(word: String) { @@ -421,11 +422,20 @@ class WKT9: InputMethodService(), SpellCheckerSession.SpellCheckerSessionListene } private fun goHome() { - with(Intent(Intent.ACTION_MAIN)) { - this.addCategory(Intent.CATEGORY_HOME) - this.flags = Intent.FLAG_ACTIVITY_NEW_TASK + if (Settings.canDrawOverlays(this)) { + val startMain = Intent(Intent.ACTION_MAIN) - startActivity(this) + startMain.addCategory(Intent.CATEGORY_HOME) + startMain.flags = Intent.FLAG_ACTIVITY_NEW_TASK + + startActivity(startMain) + } else { + val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION) + + intent.data = Uri.parse("package:$packageName") + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + + startActivity(intent) } } diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/AlphaInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/AlphaInputMode.kt index 9575c5a..750efd6 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/AlphaInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/AlphaInputMode.kt @@ -6,8 +6,6 @@ import net.mezimmah.wkt9.keypad.Key import net.mezimmah.wkt9.keypad.KeyEventResult class AlphaInputMode: BaseInputMode() { - private val tag = "WKT9" - init { mode = "alpha" status = Status.CAP diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/BaseInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/BaseInputMode.kt index b96556d..8b46ac3 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/BaseInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/BaseInputMode.kt @@ -6,6 +6,8 @@ import net.mezimmah.wkt9.keypad.KeyEventResult import net.mezimmah.wkt9.keypad.KeyLayout open class BaseInputMode: InputMode { + protected val tag = "WKT9" + protected var newKey = true protected var keyIndex = 0 protected var lastKey: Key? = null diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/FNInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/FNInputMode.kt index d572bce..2f17f7f 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/FNInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/FNInputMode.kt @@ -7,7 +7,6 @@ import net.mezimmah.wkt9.keypad.KeyCommandResolver import net.mezimmah.wkt9.keypad.KeyEventResult class FNInputMode: BaseInputMode() { - private val tag = "WKT9" override val keyCommandResolver: KeyCommandResolver = KeyCommandResolver( parent = super.keyCommandResolver, diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/IdleInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/IdleInputMode.kt index 204e5b8..90ed867 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/IdleInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/IdleInputMode.kt @@ -6,8 +6,6 @@ import net.mezimmah.wkt9.keypad.Key import net.mezimmah.wkt9.keypad.KeyEventResult class IdleInputMode : BaseInputMode() { - private val tag = "WKT9" - init { mode = "idle" status = Status.NA diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/NumericInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/NumericInputMode.kt index f021bba..30f6ee4 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/NumericInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/NumericInputMode.kt @@ -7,7 +7,6 @@ import net.mezimmah.wkt9.keypad.KeyCommandResolver import net.mezimmah.wkt9.keypad.KeyEventResult class NumericInputMode: BaseInputMode() { - private val tag = "WKT9" override val keyCommandResolver: KeyCommandResolver = KeyCommandResolver( parent = super.keyCommandResolver, diff --git a/app/src/main/java/net/mezimmah/wkt9/inputmode/WordInputMode.kt b/app/src/main/java/net/mezimmah/wkt9/inputmode/WordInputMode.kt index 88ee8fc..731848d 100644 --- a/app/src/main/java/net/mezimmah/wkt9/inputmode/WordInputMode.kt +++ b/app/src/main/java/net/mezimmah/wkt9/inputmode/WordInputMode.kt @@ -8,7 +8,6 @@ import net.mezimmah.wkt9.keypad.KeyLayout import java.lang.StringBuilder class WordInputMode: BaseInputMode() { - private val tag = "WKT9" private val codeWord = StringBuilder() init { diff --git a/app/src/main/java/net/mezimmah/wkt9/keypad/KeyLayout.kt b/app/src/main/java/net/mezimmah/wkt9/keypad/KeyLayout.kt index d6182b8..e52abb9 100644 --- a/app/src/main/java/net/mezimmah/wkt9/keypad/KeyLayout.kt +++ b/app/src/main/java/net/mezimmah/wkt9/keypad/KeyLayout.kt @@ -16,7 +16,7 @@ object KeyLayout { ) val en_US = mapOf( - Key.N1 to listOf('.','?','!',',','-','\'','"','@','$','/','%',':','(',')'), + Key.N1 to listOf('.','?','!',',','-','+','=','\'','"','@','$','/','%',':','(',')'), Key.N2 to listOf('a','b','c','ä','æ','å','à','á','â','ã','ç'), Key.N3 to listOf('d','e','f','è','é','ê','ë','đ'), Key.N4 to listOf('g','h','i','ì','í','î','ï'), diff --git a/build.gradle.kts b/build.gradle.kts index e5ef217..be5e9c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.0" apply false + id("com.android.application") version "8.1.1" apply false id("org.jetbrains.kotlin.android") version "1.8.0" apply false id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false } \ No newline at end of file