Merge remote-tracking branch 'origin/direct_boot_aware' into direct_boot_aware

Author: Merkost

app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt

@@ -165,17 +165,21 @@ fun Context.getKeyboardLanguages(): ArrayList<RadioItem> {
     return arrayListOf(
         RadioItem(LANGUAGE_BENGALI, getKeyboardLanguageText(LANGUAGE_BENGALI)),
         RadioItem(LANGUAGE_BULGARIAN, getKeyboardLanguageText(LANGUAGE_BULGARIAN)),
+        RadioItem(LANGUAGE_DANISH, getKeyboardLanguageText(LANGUAGE_DANISH)),
         RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)),
         RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)),
         RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)),
-        RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)),
+        RadioItem(LANGUAGE_FRENCH_AZERTY, getKeyboardLanguageText(LANGUAGE_FRENCH_AZERTY)),
+        RadioItem(LANGUAGE_FRENCH_BEPO, getKeyboardLanguageText(LANGUAGE_FRENCH_BEPO)),
         RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)),
         RadioItem(LANGUAGE_GREEK, getKeyboardLanguageText(LANGUAGE_GREEK)),
         RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)),
+        RadioItem(LANGUAGE_NORWEGIAN, getKeyboardLanguageText(LANGUAGE_NORWEGIAN)),
         RadioItem(LANGUAGE_ROMANIAN, getKeyboardLanguageText(LANGUAGE_ROMANIAN)),
         RadioItem(LANGUAGE_RUSSIAN, getKeyboardLanguageText(LANGUAGE_RUSSIAN)),
         RadioItem(LANGUAGE_SLOVENIAN, getKeyboardLanguageText(LANGUAGE_SLOVENIAN)),
         RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)),
+        RadioItem(LANGUAGE_SWEDISH, getKeyboardLanguageText(LANGUAGE_SWEDISH)),
         RadioItem(LANGUAGE_TURKISH_Q, getKeyboardLanguageText(LANGUAGE_TURKISH_Q)),
     )
 }
@@ -184,18 +188,23 @@ fun Context.getKeyboardLanguageText(language: Int): String {
     return when (language) {
         LANGUAGE_BENGALI -> getString(R.string.translation_bengali)
         LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian)
+        LANGUAGE_DANISH -> getString(R.string.translation_danish)
         LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)"
         LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)"
-        LANGUAGE_FRENCH -> getString(R.string.translation_french)
+        LANGUAGE_FRENCH_AZERTY -> "${getString(R.string.translation_french)} (AZERTY)"
+        LANGUAGE_FRENCH_BEPO -> "${getString(R.string.translation_french)} (BEPO)"
         LANGUAGE_GERMAN -> getString(R.string.translation_german)
         LANGUAGE_GREEK -> getString(R.string.translation_greek)
         LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian)
+        LANGUAGE_NORWEGIAN -> getString(R.string.translation_norwegian)
         LANGUAGE_ROMANIAN -> getString(R.string.translation_romanian)
         LANGUAGE_RUSSIAN -> getString(R.string.translation_russian)
         LANGUAGE_SLOVENIAN -> getString(R.string.translation_slovenian)
         LANGUAGE_SPANISH -> getString(R.string.translation_spanish)
+        LANGUAGE_SWEDISH -> getString(R.string.translation_swedish)
         LANGUAGE_TURKISH_Q -> "${getString(R.string.translation_turkish)} (Q)"
         else -> "${getString(R.string.translation_english)} (QWERTY)"
     }
 }
 
+

app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt

@@ -0,0 +1,69 @@
+package com.simplemobiletools.keyboard.helpers
+
+import android.graphics.Rect
+import android.os.Bundle
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import androidx.customview.widget.ExploreByTouchHelper
+import com.simplemobiletools.keyboard.views.MyKeyboardView
+
+class AccessHelper(
+    private val keyboardView: MyKeyboardView,
+    private val keys: List<MyKeyboard.Key>
+) : ExploreByTouchHelper(keyboardView) {
+
+    /**
+     * We need to populate the list with the IDs of all of the visible virtual views (the intervals in the chart).
+     * In our case, all keys are always visible, so we’ll return a list of all IDs.
+     */
+    override fun getVisibleVirtualViews(virtualViewIds: MutableList<Int>) {
+        val keysSize = keys.size
+        for (i in 0 until keysSize) {
+            virtualViewIds.add(i)
+        }
+    }
+
+    /**
+     * For this function, we need to return the ID of the virtual view that’s under the x, y position,
+     * or ExploreByTouchHelper.HOST_ID if there’s no item at those coordinates.
+     */
+    override fun getVirtualViewAt(x: Float, y: Float): Int {
+        val rects = keys.map {
+            Rect(it.x, it.y, it.x + it.width, it.y + it.height)
+        }
+
+        return rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
+            rects.indexOf(exactRect)
+        } ?: HOST_ID
+    }
+
+    /**
+     * This is where we provide all the metadata for our virtual view.
+     * We need to set the content description (or text, if it’s presented visually) and set the bounds in parent.
+     */
+    override fun onPopulateNodeForVirtualView(virtualViewId: Int, node: AccessibilityNodeInfoCompat) {
+        node.className = keyboardView::class.simpleName
+        val key = keys.getOrNull(virtualViewId)
+        node.contentDescription = key?.getContentDescription(keyboardView.context) ?: ""
+        val bounds = updateBoundsForInterval(virtualViewId)
+        node.setBoundsInParent(bounds)
+    }
+
+    /**
+     * We need to set the content description (or text, if it’s presented visually) and set the bounds in parent.
+     * The bounds in the parent should match the logic in the onDraw() function.
+     */
+    private fun updateBoundsForInterval(index: Int): Rect {
+        val keys = keys
+        val key = keys.getOrNull(index) ?: return Rect()
+        return Rect().apply {
+            left = key.x
+            top = key.y
+            right = key.x + key.width
+            bottom = key.y + key.height
+        }
+    }
+
+    override fun onPerformActionForVirtualView(virtualViewId: Int, action: Int, arguments: Bundle?): Boolean {
+        return false
+    }
+}

app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt

@@ -27,7 +27,7 @@ const val ITEM_CLIP = 1
 
 const val LANGUAGE_ENGLISH_QWERTY = 0
 const val LANGUAGE_RUSSIAN = 1
-const val LANGUAGE_FRENCH = 2
+const val LANGUAGE_FRENCH_AZERTY = 2
 const val LANGUAGE_ENGLISH_QWERTZ = 3
 const val LANGUAGE_SPANISH = 4
 const val LANGUAGE_GERMAN = 5
@@ -39,6 +39,10 @@ const val LANGUAGE_TURKISH_Q = 10
 const val LANGUAGE_LITHUANIAN = 11
 const val LANGUAGE_BENGALI = 12
 const val LANGUAGE_GREEK = 13
+const val LANGUAGE_NORWEGIAN = 14
+const val LANGUAGE_SWEDISH = 15
+const val LANGUAGE_DANISH = 16
+const val LANGUAGE_FRENCH_BEPO = 17
 
 // keyboard height multiplier options
 const val KEYBOARD_HEIGHT_MULTIPLIER_SMALL = 1

app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt

@@ -43,7 +43,7 @@ class MyKeyboard {
     var mMinWidth = 0
 
     /** List of keys in this keyboard  */
-    var mKeys: MutableList<Key?>? = null
+    var mKeys: MutableList<Key>? = null
 
     /** Width of the screen available to fit the keyboard  */
     private var mDisplayWidth = 0
@@ -225,6 +225,21 @@ class MyKeyboard {
             a.recycle()
         }
 
+        /**
+         * Content description for talkback functional
+         */
+        fun getContentDescription(context: Context): CharSequence {
+            return when (code) {
+                KEYCODE_SHIFT -> context.getString(R.string.keycode_shift)
+                KEYCODE_MODE_CHANGE -> context.getString(R.string.keycode_mode_change)
+                KEYCODE_ENTER -> context.getString(R.string.keycode_enter)
+                KEYCODE_DELETE -> context.getString(R.string.keycode_delete)
+                KEYCODE_SPACE -> context.getString(R.string.keycode_space)
+                KEYCODE_EMOJI -> context.getString(R.string.emojis)
+                else -> label
+            }
+        }
+
         /** Create an empty key with no attributes.  */
         init {
             height = parent.defaultHeight

app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt

@@ -0,0 +1,41 @@
+package com.simplemobiletools.keyboard.interfaces
+
+interface OnKeyboardActionListener {
+    /**
+     * Called when the user presses a key. This is sent before the [.onKey] is called. For keys that repeat, this is only called once.
+     * @param primaryCode the unicode of the key being pressed. If the touch is not on a valid key, the value will be zero.
+     */
+    fun onPress(primaryCode: Int)
+
+    /**
+     * Send a key press to the listener.
+     * @param code this is the key that was pressed
+     */
+    fun onKey(code: Int)
+
+    /**
+     * Called when the finger has been lifted after pressing a key
+     */
+    fun onActionUp()
+
+    /**
+     * Called when the user long presses Space and moves to the left
+     */
+    fun moveCursorLeft()
+
+    /**
+     * Called when the user long presses Space and moves to the right
+     */
+    fun moveCursorRight()
+
+    /**
+     * Sends a sequence of characters to the listener.
+     * @param text the string to be displayed.
+     */
+    fun onText(text: String)
+
+    /**
+     * Called to force the KeyboardView to reload the keyboard
+     */
+    fun reloadKeyboard()
+}

app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt

@@ -16,11 +16,12 @@ import com.simplemobiletools.keyboard.R
 import com.simplemobiletools.keyboard.extensions.config
 import com.simplemobiletools.keyboard.extensions.safeStorageContext
 import com.simplemobiletools.keyboard.helpers.*
+import com.simplemobiletools.keyboard.interfaces.OnKeyboardActionListener
 import com.simplemobiletools.keyboard.views.MyKeyboardView
 import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.*
 
 // based on https://www.androidauthority.com/lets-build-custom-keyboard-android-832362/
-class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionListener, SharedPreferences.OnSharedPreferenceChangeListener {
+class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, SharedPreferences.OnSharedPreferenceChangeListener {
     private var SHIFT_PERM_TOGGLE_SPEED = 500   // how quickly do we have to doubletap shift to enable permanent caps lock
     private val KEYBOARD_LETTERS = 0
     private val KEYBOARD_SYMBOLS = 1
@@ -283,15 +284,19 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
         return when (baseContext.config.keyboardLanguage) {
             LANGUAGE_BENGALI -> R.xml.keys_letters_bengali
             LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian
+            LANGUAGE_DANISH -> R.xml.keys_letters_danish
             LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak
             LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz
-            LANGUAGE_FRENCH -> R.xml.keys_letters_french
+            LANGUAGE_FRENCH_AZERTY -> R.xml.keys_letters_french_azerty
+            LANGUAGE_FRENCH_BEPO -> R.xml.keys_letters_french_bepo
             LANGUAGE_GERMAN -> R.xml.keys_letters_german
             LANGUAGE_GREEK -> R.xml.keys_letters_greek
             LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian
+            LANGUAGE_NORWEGIAN -> R.xml.keys_letters_norwegian
             LANGUAGE_ROMANIAN -> R.xml.keys_letters_romanian
             LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian
             LANGUAGE_SLOVENIAN -> R.xml.keys_letters_slovenian
+            LANGUAGE_SWEDISH -> R.xml.keys_letters_swedish
             LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty
             LANGUAGE_TURKISH_Q -> R.xml.keys_letters_turkish_q
             else -> R.xml.keys_letters_english_qwerty