add layout/swipe capture! bump to version 0.0.12

Author: dupontgu

.github/workflows/pr-check.yml

@@ -0,0 +1,40 @@
+name: PR Check
+
+on:
+  pull_request:
+    branches: [main]
+
+permissions:
+  contents: read
+  packages: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    name: Gradle check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run check
+        env:
+          GH_PACKAGES_USER: ${{ github.actor }}
+          GH_PACKAGES_TOKEN: ${{ secrets.GH_CI_TOKEN }}
+        run: ./gradlew check --stacktrace

.idea/gradle.xml

@@ -13,29 +13,35 @@ import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryController
 import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.thelightphone.lp3Keyboard.ui.DefaultLp3KeyboardViewModel
+import com.thelightphone.lp3Keyboard.ui.Lp3KeyboardSwipeCallback
 import com.thelightphone.lp3Keyboard.ui.Lp3KeyboardView
-import com.thelightphone.lp3Keyboard.ui.Lp3RepeatableKeyboardCallback
 import com.thelightphone.lp3Keyboard.ui.SpecialKey
+import com.thelightphone.lp3Keyboard.ui.viewmodel.EnQwertyLp3KeyboardViewModel
+import com.thelightphone.lp3Keyboard.ui.viewmodel.Lp3RepeatableKeyboardCallback
 
 class IMEService : LifecycleInputMethodService(),
     ViewModelStoreOwner,
     SavedStateRegistryOwner,
     Lp3RepeatableKeyboardCallback {
 
-    private val viewModel: DefaultLp3KeyboardViewModel by lazy {
+    private val viewModel: EnQwertyLp3KeyboardViewModel<*> by lazy {
         val factory = object : ViewModelProvider.Factory {
             @Suppress("UNCHECKED_CAST")
             override fun <T : androidx.lifecycle.ViewModel> create(modelClass: Class<T>): T {
-                return DefaultLp3KeyboardViewModel(this@IMEService, ::tick) as T
+                val dummySwipeCallback = object : Lp3KeyboardSwipeCallback<Unit> {}
+                return EnQwertyLp3KeyboardViewModel(
+                    this@IMEService,
+                    dummySwipeCallback,
+                    ::tick
+                ) as T
             }
         }
-        ViewModelProvider(store, factory)[DefaultLp3KeyboardViewModel::class.java]
+        ViewModelProvider(store, factory)[EnQwertyLp3KeyboardViewModel::class.java]
     }
 
     override fun onCreateInputView(): View {
         val view = Lp3KeyboardView(this, viewModel)
-        setCandidatesViewShown(false);
+        setCandidatesViewShown(false)
         window?.window?.apply {
             decorView.let { decorView ->
                 decorView.setViewTreeLifecycleOwner(this@IMEService)
@@ -65,7 +71,7 @@ class IMEService : LifecycleInputMethodService(),
     private val vibrator by lazy { getSystemService(Vibrator::class.java) }
 
     private fun tick() {
-        // 50ms feels good on LP#, other device motors may allow faster buzz
+        // 50ms feels good on LP3, other device motors may allow faster buzz
         vibrator.vibrate(50)
     }
 
@@ -94,6 +100,10 @@ class IMEService : LifecycleInputMethodService(),
     override fun onKeyPressed(code: Int) {
     }
 
+    override fun onSubmitWord(word: CharSequence) {
+        currentInputConnection?.commitText("$word ", 1)
+    }
+
     override fun onSpecialKeyPressed(key: SpecialKey) {
         when (key) {
             SpecialKey.Space -> {
@@ -116,7 +126,8 @@ class IMEService : LifecycleInputMethodService(),
             SpecialKey.Backspace -> {
                 val ic = currentInputConnection ?: return
                 val before = ic.getTextBeforeCursor(1, 0)
-                val charsToDelete = if (before != null && before.isNotEmpty() && Character.isLowSurrogate(before[0])) 2 else 1
+                val charsToDelete =
+                    if (!before.isNullOrEmpty() && Character.isLowSurrogate(before[0])) 2 else 1
                 ic.deleteSurroundingText(charsToDelete, 0)
                 updateCapsMode()
             }
@@ -168,6 +179,7 @@ class IMEService : LifecycleInputMethodService(),
                 currentInputConnection?.commitText(" ", 1)
                 updateCapsMode()
             }
+
             SpecialKey.Backspace -> {
                 deletePrecedingWord()
             }

app/src/main/java/com/thelightphone/lp3keyboard/IMEService.kt

@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.useAndroidX=true
-projectVersion=0.0.11
+projectVersion=0.0.12