Refactor/keyboard UI manager

app/src/androidTest/kotlin/be/scri/helpers/KeyboardTest.kt → app/src/androidTestKeyboards/kotlin/be/scri/helpers/KeyboardTest.kt

@@ -59,7 +59,7 @@ class KeyboardTest {
         }
         every { mockInputConnection.deleteSurroundingText(1, 0) } returns true
 
-        keyHandler.handleKey(KeyboardBase.KEYCODE_DELETE, "en")
+        keyHandler.handleKey(KeyboardBase.Companion.KEYCODE_DELETE, "en")
 
         assert(currentText.length == initialText.length - 1) {
             "Expected length ${initialText.length - 1}, but got ${currentText.length}"
@@ -81,7 +81,7 @@ class KeyboardTest {
             mockInputConnection.sendKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER))
         }
 
-        keyHandler.handleKey(KeyboardBase.KEYCODE_ENTER, "en")
+        keyHandler.handleKey(KeyboardBase.Companion.KEYCODE_ENTER, "en")
 
         verify(exactly = 1) { mockIME.handleKeycodeEnter() }
         verify(exactly = 1) {

app/src/androidTest/kotlin/be/scri/services/GeneralKeyboardIMETest.kt → app/src/androidTestKeyboards/kotlin/be/scri/services/GeneralKeyboardIMETest.kt

@@ -19,41 +19,47 @@ class GeneralKeyboardIMETest {
 
     @Before
     fun setUp() {
-        inputConnection =
-            mockk {
-                every { getTextBeforeCursor(any(), any()) } returns ""
-            }
+        inputConnection = mockk(relaxed = true)
+
+        ime = mockk(relaxed = true)
 
-        ime =
-            mockk(relaxed = true) {
-                every { getCurrentInputConnection() } returns inputConnection
+        every { ime.currentInputConnection } returns inputConnection
 
-                every { hasTextBeforeCursor } answers {
-                    val text = inputConnection.getTextBeforeCursor(Int.MAX_VALUE, 0)?.toString() ?: ""
-                    text.isNotEmpty() && text.trim() != "." && text.trim() != ""
-                }
+        every { ime.hasTextBeforeCursor } answers {
+            val ic = ime.currentInputConnection
+            if (ic == null) {
+                false
+            } else {
+                val text = ic.getTextBeforeCursor(Int.MAX_VALUE, 0)?.toString() ?: ""
+                text.isNotEmpty() && text.trim() != "." && text.trim() != ""
             }
+        }
     }
 
     @Test
     fun hasTextBeforeCursor_returnsTrue_whenTextExists() {
-        every { inputConnection.getTextBeforeCursor(Int.MAX_VALUE, 0) } returns "hello"
+        every { inputConnection.getTextBeforeCursor(any(), any()) } returns "hello"
 
-        println("Result: ${ime.hasTextBeforeCursor}")
         assertTrue(ime.hasTextBeforeCursor)
     }
 
     @Test
     fun hasTextBeforeCursor_returnsFalse_whenTextIsEmpty() {
-        every { inputConnection.getTextBeforeCursor(Int.MAX_VALUE, 0) } returns ""
+        every { inputConnection.getTextBeforeCursor(any(), any()) } returns ""
 
         assertFalse(ime.hasTextBeforeCursor)
     }
 
     @Test
     fun hasTextBeforeCursor_returnsFalse_whenTextIsPeriod() {
-        every { inputConnection.getTextBeforeCursor(Int.MAX_VALUE, 0) } returns ". "
+        every { inputConnection.getTextBeforeCursor(any(), any()) } returns ". "
+
+        assertFalse(ime.hasTextBeforeCursor)
+    }
 
+    @Test
+    fun hasTextBeforeCursor_returnsFalse_whenInputConnectionIsNull() {
+        every { ime.currentInputConnection } returns null
         assertFalse(ime.hasTextBeforeCursor)
     }
 }

app/src/androidTest/kotlin/be/scri/ui/screens/about/AboutUtilInstrumentedTest.kt → app/src/androidTestKeyboards/kotlin/be/scri/ui/screens/about/AboutUtilInstrumentedTest.kt

@@ -297,11 +297,11 @@ class AboutUtilInstrumentedTest {
         println("Testing ExternalLinks constants...")
 
         // Test that external links are properly defined.
-        assertThat(be.scri.ui.screens.about.ExternalLinks.GITHUB_SCRIBE).isNotEmpty()
-        assertThat(be.scri.ui.screens.about.ExternalLinks.GITHUB_ISSUES).isNotEmpty()
-        assertThat(be.scri.ui.screens.about.ExternalLinks.GITHUB_RELEASES).isNotEmpty()
-        assertThat(be.scri.ui.screens.about.ExternalLinks.MATRIX).isNotEmpty()
-        assertThat(be.scri.ui.screens.about.ExternalLinks.MASTODON).isNotEmpty()
+        assertThat(ExternalLinks.GITHUB_SCRIBE).isNotEmpty()
+        assertThat(ExternalLinks.GITHUB_ISSUES).isNotEmpty()
+        assertThat(ExternalLinks.GITHUB_RELEASES).isNotEmpty()
+        assertThat(ExternalLinks.MATRIX).isNotEmpty()
+        assertThat(ExternalLinks.MASTODON).isNotEmpty()
 
         println("ExternalLinks constants test passed!")
     }

app/src/main/java/be/scri/helpers/KeyHandler.kt

@@ -201,12 +201,7 @@ class KeyHandler(
      */
 
     private fun handleDeleteKey() {
-        val isCommandBarActive =
-            ime.currentState == ScribeState.TRANSLATE ||
-                ime.currentState == ScribeState.CONJUGATE ||
-                ime.currentState == ScribeState.PLURAL
-
-        ime.handleDelete(isCommandBarActive, ime.isDeleteRepeating()) // Pass the actual repeating status
+        ime.handleDelete(ime.isDeleteRepeating()) // pass the actual repeating status
 
         if (ime.currentState == ScribeState.IDLE) {
             val currentWord = ime.getLastWordBeforeCursor()
@@ -356,8 +351,8 @@ class KeyHandler(
                 ScribeState.TRANSLATE,
                 ScribeState.CONJUGATE,
                 ScribeState.PLURAL,
-                -> true // Use command bar for actual commands
-                else -> false // Use main input field for IDLE and SELECT_COMMAND
+                -> true // use command bar for actual commands
+                else -> false // use main input field for IDLE and SELECT_COMMAND
             }
 
         ime.handleElseCondition(code, ime.keyboardMode, isCommandBarActive)