From 9901cfbc10867ff73d9fe29304455e706327507a Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Wed, 7 Jun 2023 13:10:33 +1000
Subject: [PATCH 01/10] Added inner AccessHelper class for talkback functional
---
.../keyboard/views/MyKeyboardView.kt | 81 +++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index dd1f520..df08539 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -10,6 +10,7 @@ import android.content.Intent
import android.graphics.*
import android.graphics.Paint.Align
import android.graphics.drawable.*
+import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.Message
@@ -24,6 +25,9 @@ import android.widget.PopupWindow
import android.widget.TextView
import androidx.core.animation.doOnEnd
import androidx.core.animation.doOnStart
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import androidx.customview.widget.ExploreByTouchHelper
import androidx.emoji2.text.EmojiCompat
import androidx.emoji2.text.EmojiCompat.EMOJI_SUPPORTED
import com.simplemobiletools.commons.extensions.*
@@ -95,6 +99,83 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
fun reloadKeyboard()
}
+ override fun dispatchHoverEvent(event: MotionEvent): Boolean {
+ return if (accessHelper.dispatchHoverEvent(event)) {
+ true
+ } else {
+ super.dispatchHoverEvent(event)
+ }
+ }
+
+ private val accessHelper = AccessHelper()
+
+
+ inner class AccessHelper() : ExploreByTouchHelper(this) {
+
+ /**
+ * 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 = mKeyboard?.mKeys?.size ?: 0
+ 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 {
+ mKeyboard?.mKeys?.filterNotNull()?.let { keyList ->
+ val rects = keyList.map {
+ Rect(it.x, it.y, it.x + it.width, it.y + it.height)
+ }
+ rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
+ val exactIndexKey = rects.indexOf(exactRect)
+ return exactIndexKey
+ } ?: return HOST_ID
+ }
+ return 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 = MyKeyboardView::class.simpleName
+ val key = mKeyboard?.mKeys?.get(virtualViewId)
+ node.contentDescription = key?.label ?: "keyboard key"
+ 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 = mKeyboard?.mKeys ?: return Rect()
+ val key = keys[index]!!
+ 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
+ }
+ }
+
+ init {
+ ViewCompat.setAccessibilityDelegate(this, accessHelper)
+ }
+
private var mKeyboard: MyKeyboard? = null
private var mCurrentKeyIndex: Int = NOT_A_KEY
From 52836b8e5ffc96f31bf2cd454dd768ee750a2834 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Wed, 7 Jun 2023 14:04:05 +1000
Subject: [PATCH 02/10] Added contentDescriptions for the keys and a new string
resource
---
.../keyboard/helpers/MyKeyboard.kt | 35 +++++++++++++++++++
.../keyboard/views/MyKeyboardView.kt | 2 +-
app/src/main/res/values-ru/strings.xml | 3 +-
app/src/main/res/values/strings.xml | 1 +
4 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index b2c77c0..8a99a82 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -222,6 +222,41 @@ 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
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index df08539..ad1cdcb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -147,7 +147,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
override fun onPopulateNodeForVirtualView(virtualViewId: Int, node: AccessibilityNodeInfoCompat) {
node.className = MyKeyboardView::class.simpleName
val key = mKeyboard?.mKeys?.get(virtualViewId)
- node.contentDescription = key?.label ?: "keyboard key"
+ node.contentDescription = key?.getContentDescription(context)
val bounds = updateBoundsForInterval(virtualViewId)
node.setBoundsInParent(bounds)
}
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 930b9fe..e21e865 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Изменить тип клавиатуры</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Пробел</string>
<!-- Settings -->
<string name="show_clipboard_content">Показывать содержимое буфера обмена при наличии</string>
<string name="show_popup">Показывать ввод по нажатию</string>
@@ -40,4 +41,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b26fb32..976b51a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Space</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
From ca53db62c15af24afe02cb18b5a14ed31eef906b Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Wed, 7 Jun 2023 16:04:33 +1000
Subject: [PATCH 03/10] Fixed content description for pinned clipboard icon
---
app/src/main/res/layout/keyboard_view_keyboard.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/keyboard_view_keyboard.xml b/app/src/main/res/layout/keyboard_view_keyboard.xml
index ab15eae..16f5682 100644
--- a/app/src/main/res/layout/keyboard_view_keyboard.xml
+++ b/app/src/main/res/layout/keyboard_view_keyboard.xml
@@ -63,7 +63,7 @@
android:layout_height="@dimen/toolbar_icon_height"
android:layout_marginEnd="@dimen/medium_margin"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:contentDescription="@string/settings"
+ android:contentDescription="@string/clipboard_pinned"
android:padding="@dimen/small_margin"
android:src="@drawable/ic_clipboard_vector"
app:layout_constraintBottom_toBottomOf="parent"
From 29c8c763c0b64778c9ed2fc5c900e5f8b6fded55 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Fri, 9 Jun 2023 10:31:08 +1000
Subject: [PATCH 04/10] OnKeyboardActionListener extracted to a different file
---
.../interfaces/OnKeyboardActionListener.kt | 41 +++++++++++++++++
.../keyboard/services/SimpleKeyboardIME.kt | 3 +-
.../keyboard/views/MyKeyboardView.kt | 46 ++-----------------
3 files changed, 46 insertions(+), 44 deletions(-)
create mode 100644 app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt
new file mode 100644
index 0000000..8f9189a
--- /dev/null
+++ b/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()
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
index 8e1192e..e880622 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -19,11 +19,12 @@ import com.simplemobiletools.commons.extensions.getSharedPrefs
import com.simplemobiletools.keyboard.R
import com.simplemobiletools.keyboard.extensions.config
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
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index ad1cdcb..0fe63c2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -47,6 +47,7 @@ import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_ENTER
import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_MODE_CHANGE
import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SHIFT
import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SPACE
+import com.simplemobiletools.keyboard.interfaces.OnKeyboardActionListener
import com.simplemobiletools.keyboard.interfaces.RefreshClipsListener
import com.simplemobiletools.keyboard.models.Clip
import com.simplemobiletools.keyboard.models.ClipsSectionLabel
@@ -55,50 +56,10 @@ import kotlinx.android.synthetic.main.keyboard_popup_keyboard.view.*
import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.*
import java.util.*
-@SuppressLint("UseCompatLoadingForDrawables", "ClickableViewAccessibility")
+@SuppressLint("UseCompatLoadingForDrawables")
class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int = 0) :
View(context, attrs, defStyleRes) {
- 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()
- }
-
override fun dispatchHoverEvent(event: MotionEvent): Boolean {
return if (accessHelper.dispatchHoverEvent(event)) {
true
@@ -109,7 +70,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private val accessHelper = AccessHelper()
-
inner class AccessHelper() : ExploreByTouchHelper(this) {
/**
@@ -560,7 +520,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private fun adjustCase(label: CharSequence): CharSequence? {
var newLabel: CharSequence? = label
- if (newLabel != null && newLabel.isNotEmpty() && mKeyboard!!.mShiftState > SHIFT_OFF && newLabel.length < 3 && Character.isLowerCase(newLabel[0])) {
+ if (!newLabel.isNullOrEmpty() && mKeyboard!!.mShiftState > SHIFT_OFF && newLabel.length < 3 && Character.isLowerCase(newLabel[0])) {
newLabel = newLabel.toString().uppercase(Locale.getDefault())
}
return newLabel
From 91852ed63e4067924b7a8674461efd26121a8a64 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Fri, 9 Jun 2023 10:52:28 +1000
Subject: [PATCH 05/10] Removed old accessibility functions which caused manual
focus clearing
---
.../keyboard/views/MyKeyboardView.kt | 59 ++-----------------
1 file changed, 4 insertions(+), 55 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index 43bddfd..38f1923 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -17,8 +17,6 @@ import android.os.Message
import android.util.AttributeSet
import android.util.TypedValue
import android.view.*
-import android.view.accessibility.AccessibilityEvent
-import android.view.accessibility.AccessibilityManager
import android.view.animation.AccelerateInterpolator
import android.view.inputmethod.EditorInfo
import android.widget.PopupWindow
@@ -57,8 +55,7 @@ import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.*
import java.util.*
@SuppressLint("UseCompatLoadingForDrawables", "ClickableViewAccessibility")
-class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int = 0) :
- View(context, attrs, defStyleRes) {
+class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int = 0) : View(context, attrs, defStyleRes) {
override fun dispatchHoverEvent(event: MotionEvent): Boolean {
return if (accessHelper.dispatchHoverEvent(event)) {
@@ -225,9 +222,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
/** The canvas for the above mutable keyboard bitmap */
private var mCanvas: Canvas? = null
- /** The accessibility manager for accessibility support */
- private val mAccessibilityManager: AccessibilityManager
-
private var mHandler: Handler? = null
companion object {
@@ -286,7 +280,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
mPaint.textAlign = Align.CENTER
mPaint.alpha = 255
mMiniKeyboardCache = HashMap()
- mAccessibilityManager = (context.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager)
mPopupMaxMoveDistance = resources.getDimension(R.dimen.popup_max_move_distance)
mTopSmallNumberSize = resources.getDimension(R.dimen.small_text_size)
mTopSmallNumberMarginWidth = resources.getDimension(R.dimen.top_small_number_margin_width)
@@ -685,10 +678,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val secondaryIconBottom = secondaryIconTop + secondaryIconHeight
secondaryIcon.setBounds(
- secondaryIconLeft,
- secondaryIconTop,
- secondaryIconRight,
- secondaryIconBottom
+ secondaryIconLeft, secondaryIconTop, secondaryIconRight, secondaryIconBottom
)
secondaryIcon.draw(canvas)
@@ -874,29 +864,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val oldKeyIndex = mCurrentKeyIndex
val previewPopup = mPreviewPopup
mCurrentKeyIndex = keyIndex
- // Release the old key and press the new key
- val keys = mKeys
- if (oldKeyIndex != mCurrentKeyIndex) {
- if (oldKeyIndex != NOT_A_KEY && keys.size > oldKeyIndex) {
- val oldKey = keys[oldKeyIndex]
- oldKey.pressed = false
- invalidateKey(oldKeyIndex)
- val keyCode = oldKey.code
- sendAccessibilityEventForUnicodeCharacter(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED, keyCode)
- }
-
- if (mCurrentKeyIndex != NOT_A_KEY && keys.size > mCurrentKeyIndex) {
- val newKey = keys[mCurrentKeyIndex]
-
- val code = newKey.code
- if (context.config.showKeyBorders || (code == KEYCODE_SHIFT || code == KEYCODE_MODE_CHANGE || code == KEYCODE_DELETE || code == KEYCODE_ENTER || code == KEYCODE_SPACE)) {
- newKey.pressed = true
- }
-
- invalidateKey(mCurrentKeyIndex)
- sendAccessibilityEventForUnicodeCharacter(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED, code)
- }
- }
if (!context.config.showPopupOnKeypress) {
return
@@ -907,8 +874,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
if (previewPopup.isShowing) {
if (keyIndex == NOT_A_KEY) {
mHandler!!.sendMessageDelayed(
- mHandler!!.obtainMessage(MSG_REMOVE_PREVIEW),
- DELAY_AFTER_PREVIEW.toLong()
+ mHandler!!.obtainMessage(MSG_REMOVE_PREVIEW), DELAY_AFTER_PREVIEW.toLong()
)
}
}
@@ -1001,22 +967,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
}
- private fun sendAccessibilityEventForUnicodeCharacter(eventType: Int, code: Int) {
- if (mAccessibilityManager.isEnabled) {
- val event = AccessibilityEvent.obtain(eventType)
- onInitializeAccessibilityEvent(event)
- val text: String = when (code) {
- KEYCODE_DELETE -> context.getString(R.string.keycode_delete)
- KEYCODE_ENTER -> context.getString(R.string.keycode_enter)
- KEYCODE_MODE_CHANGE -> context.getString(R.string.keycode_mode_change)
- KEYCODE_SHIFT -> context.getString(R.string.keycode_shift)
- else -> code.toChar().toString()
- }
- event.text.add(text)
- mAccessibilityManager.sendAccessibilityEvent(event)
- }
- }
-
/**
* Requests a redraw of the entire keyboard. Calling [.invalidate] is not sufficient because the keyboard renders the keys to an off-screen buffer and
* an invalidate() only draws the cached buffer.
@@ -1131,8 +1081,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
mMiniKeyboard!!.setKeyboard(keyboard)
mPopupParent = this
mMiniKeyboardContainer!!.measure(
- MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST),
- MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)
+ MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)
)
mMiniKeyboardCache[popupKey] = mMiniKeyboardContainer
} else {
From e6a22e59209f11d2d0b69f26130cad7b881214a6 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Fri, 9 Jun 2023 11:40:41 +1000
Subject: [PATCH 06/10] Moved AccessHelper to an outer class
---
.../keyboard/helpers/AccessHelper.kt | 68 ++++++++++++++++
.../keyboard/helpers/MyKeyboard.kt | 2 +-
.../keyboard/views/MyKeyboardView.kt | 77 ++-----------------
3 files changed, 75 insertions(+), 72 deletions(-)
create mode 100644 app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
new file mode 100644
index 0000000..120432c
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
@@ -0,0 +1,68 @@
+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)
+ }
+ rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
+ return rects.indexOf(exactRect)
+ } ?: return 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
+ }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index 24f3198..ccba189 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/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
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index 38f1923..19c81d3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -10,7 +10,6 @@ import android.content.Intent
import android.graphics.*
import android.graphics.Paint.Align
import android.graphics.drawable.*
-import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.Message
@@ -24,8 +23,6 @@ import android.widget.TextView
import androidx.core.animation.doOnEnd
import androidx.core.animation.doOnStart
import androidx.core.view.ViewCompat
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
-import androidx.customview.widget.ExploreByTouchHelper
import androidx.emoji2.text.EmojiCompat
import androidx.emoji2.text.EmojiCompat.EMOJI_SUPPORTED
import com.simplemobiletools.commons.extensions.*
@@ -58,80 +55,14 @@ import java.util.*
class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int = 0) : View(context, attrs, defStyleRes) {
override fun dispatchHoverEvent(event: MotionEvent): Boolean {
- return if (accessHelper.dispatchHoverEvent(event)) {
+ return if (accessHelper?.dispatchHoverEvent(event) == true) {
true
} else {
super.dispatchHoverEvent(event)
}
}
- private val accessHelper = AccessHelper()
-
- inner class AccessHelper() : ExploreByTouchHelper(this) {
-
- /**
- * 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 = mKeyboard?.mKeys?.size ?: 0
- 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 {
- mKeyboard?.mKeys?.filterNotNull()?.let { keyList ->
- val rects = keyList.map {
- Rect(it.x, it.y, it.x + it.width, it.y + it.height)
- }
- rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
- val exactIndexKey = rects.indexOf(exactRect)
- return exactIndexKey
- } ?: return HOST_ID
- }
- return 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 = MyKeyboardView::class.simpleName
- val key = mKeyboard?.mKeys?.get(virtualViewId)
- node.contentDescription = key?.getContentDescription(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 = mKeyboard?.mKeys ?: return Rect()
- val key = keys[index]!!
- 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
- }
- }
-
- init {
- ViewCompat.setAccessibilityDelegate(this, accessHelper)
- }
+ private var accessHelper: AccessHelper? = null
private var mKeyboard: MyKeyboard? = null
private var mCurrentKeyIndex: Int = NOT_A_KEY
@@ -335,6 +266,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
invalidateAllKeys()
computeProximityThreshold(keyboard)
mMiniKeyboardCache.clear()
+
+ accessHelper = AccessHelper(this, mKeyboard?.mKeys.orEmpty())
+ ViewCompat.setAccessibilityDelegate(this, accessHelper)
+
// Not really necessary to do every time, but will free up views
// Switching to a different keyboard should abort any pending keys so that the key up
// doesn't get delivered to the old or new keyboard
From c2d17f5c3a99493934774cf267858bc7bb87e0d3 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 10 Jun 2023 11:33:48 +1000
Subject: [PATCH 07/10] Created keycode_space resource in any translation and
changed to Spacebar
---
app/src/main/res/values-ar/strings.xml | 1 +
app/src/main/res/values-be/strings.xml | 1 +
app/src/main/res/values-bg/strings.xml | 1 +
app/src/main/res/values-ca/strings.xml | 1 +
app/src/main/res/values-ckb/strings.xml | 1 +
app/src/main/res/values-cs/strings.xml | 3 ++-
app/src/main/res/values-da/strings.xml | 1 +
app/src/main/res/values-de/strings.xml | 1 +
app/src/main/res/values-el/strings.xml | 1 +
app/src/main/res/values-eo/strings.xml | 1 +
app/src/main/res/values-es/strings.xml | 3 ++-
app/src/main/res/values-et/strings.xml | 3 ++-
app/src/main/res/values-fi/strings.xml | 1 +
app/src/main/res/values-fr/strings.xml | 1 +
app/src/main/res/values-gl/strings.xml | 1 +
app/src/main/res/values-hr/strings.xml | 1 +
app/src/main/res/values-hu/strings.xml | 1 +
app/src/main/res/values-in/strings.xml | 1 +
app/src/main/res/values-it/strings.xml | 1 +
app/src/main/res/values-iw/strings.xml | 1 +
app/src/main/res/values-ja/strings.xml | 1 +
app/src/main/res/values-lt/strings.xml | 1 +
app/src/main/res/values-ml/strings.xml | 1 +
app/src/main/res/values-nb-rNO/strings.xml | 1 +
app/src/main/res/values-nl/strings.xml | 1 +
app/src/main/res/values-pa-rPK/strings.xml | 1 +
app/src/main/res/values-pa/strings.xml | 1 +
app/src/main/res/values-pl/strings.xml | 1 +
app/src/main/res/values-pt-rBR/strings.xml | 1 +
app/src/main/res/values-pt/strings.xml | 3 ++-
app/src/main/res/values-ro/strings.xml | 1 +
app/src/main/res/values-sk/strings.xml | 1 +
app/src/main/res/values-sl/strings.xml | 1 +
app/src/main/res/values-sr/strings.xml | 1 +
app/src/main/res/values-sv/strings.xml | 3 ++-
app/src/main/res/values-th/strings.xml | 1 +
app/src/main/res/values-tr/strings.xml | 1 +
app/src/main/res/values-uk/strings.xml | 1 +
app/src/main/res/values-zh-rCN/strings.xml | 1 +
app/src/main/res/values-zh-rTW/strings.xml | 1 +
app/src/main/res/values/strings.xml | 2 +-
41 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 385f894..77702f3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">تغيير نوع لوحة المفاتيح</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">إظهار محتوى الحافظة إذا كان متوفرا</string>
<string name="show_popup">إظهار نافذة منبثقة عند الضغط على المفاتيح</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 8b584fb..0a4c7f1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Змяніць тып клавіятуры</string>
<string name="keycode_shift">Зрух</string>
<string name="keycode_enter">Увайдзіце</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Паказаць змесціва буфера абмену, калі яно даступна</string>
<string name="show_popup">Паказваць усплывальнае акно пры націску клавішы</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cc35140..79c7c52 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Промяна на типа клавиатура</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Показване на клипборд съдържанието, ако е налично</string>
<string name="show_popup">Показване на изскачащ прозорец при натискане на клавиш</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5cb2829..4bf9824 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Canvia el tipus de teclat</string>
<string name="keycode_shift">Majúscules</string>
<string name="keycode_enter">Retorn</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostra el contingut del porta-retalls si està disponible</string>
<string name="show_popup">Mostra una finestra emergent en prémer les tecles</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 9499346..a7786e8 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">گۆڕینی شێواز</string>
<string name="keycode_shift">شێفت</string>
<string name="keycode_enter">ئینتەر</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">پیشاندانی دوایین لەبەرگیراوە</string>
<string name="show_popup">بچووککراوەی پیت</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cb2859f..0a89ba5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Změnit typ klávesnice</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Zobrazit obsah schránky, pokud je k dispozici</string>
<string name="show_popup">Zobrazit vyskakovací okno při stisknutí klávesy</string>
@@ -41,4 +42,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 3fbab32..c9cb548 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Skift tastaturtype</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Vis indhold i udklipsholder, hvis det er tilgængeligt</string>
<string name="show_popup">Vis en popup ved tastetryk</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6c2fd98..7c2f78f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Tastaturtyp ändern</string>
<string name="keycode_shift">Umschalttaste</string>
<string name="keycode_enter">Eingabe</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Inhalt der Zwischenablage anzeigen, falls vorhanden</string>
<string name="show_popup">Bei Tastendruck ein Popup anzeigen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 830ca70..2401ecf 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Αλλαγή τύπου πληκτρολογίου</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Εμφάνιση περιεχομένου πρόχειρου εάν είναι διαθέσιμο</string>
<string name="show_popup">Εμφάνιση ανάδυσης στο πάτημα πλήκτρων</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 14ce48a..ee13235 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 15b852c..93ba931 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Cambiar el tipo de teclado</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostrar el contenido del portapapeles si está disponible</string>
<string name="show_popup">Mostrar una ventana emergente al pulsar una tecla</string>
@@ -41,4 +42,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 34b5bbf..706b355 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Muuda klaviatuuri tüüpi</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Sisenema</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Näita lõikelaua kirjeid</string>
<string name="show_popup">Klahvivajutusel näita hüpikakent</string>
@@ -41,4 +42,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f934aac..58f89ba 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Vaihda näppäimistön tyyppi</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Näytä leikepöydän sisältö, jos saatavilla</string>
<string name="show_popup">Näytä ponnahdus näppäinten painalluksesta</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b6d1b0f..13eebd6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Changer de type de clavier</string>
<string name="keycode_shift">Majuscule</string>
<string name="keycode_enter">Entrée</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Afficher le contenu du presse-papiers si disponible</string>
<string name="show_popup">Afficher une fenêtre contextuelle en cas de pression sur une touche</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 9446f78..659fc24 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Cambialo tipo do teclado</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostralo contido do portapapeis se atopase dispoñible</string>
<string name="show_popup">Mostra unha ventá emerxente ao premer nunha tecla</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 592ec63..4406b93 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Promijeni vrstu tipkovnice</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Prikaži sadržaj međuspremnika ako postoji</string>
<string name="show_popup">Prikaži skočni prozor prilikom pritiskanja tipke</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e1821df..fb77295 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Billentyűzet típusának módosítása</string>
<string name="keycode_shift">Váltás</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Vágólap tartalmának megjelenítése, ha rendelkezésre áll</string>
<string name="show_popup">Felugró ablak megjelenítése billentyűleütéskor</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 705987e..fae512a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Ubah tipe keyboard</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Tampilkan konten papan klip jika tersedia</string>
<string name="show_popup">Tampilkan sebuah popup pada penekanan tombol</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 267b3d6..28cf1c3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Cambia il tipo di tastiera</string>
<string name="keycode_shift">Maiusc</string>
<string name="keycode_enter">Invio</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostra il contenuto degli appunti se disponibile</string>
<string name="show_popup">Mostra un popup alla pressione di un tasto</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index e7a984c..1a5bbad 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">שנה את סוג המקלדת</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">הצג תוכן של לוח אם זמין</string>
<string name="show_popup">הצג חלון קופץ בלחיצת מקש</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b2edb3c..c0b72fb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">キーボードの種類を変更する</string>
<string name="keycode_shift">シフト</string>
<string name="keycode_enter">エンター</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">クリップボードの内容がある場合、それを表示する</string>
<string name="show_popup">キー入力時にポップアップを表示する</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ae49ca6..a89afdb 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Keisti klaviatūros tipą</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Jei prieinama, rodyti iškarpinės turinį</string>
<string name="show_popup">Show a popup on keypress</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 8df0fe8..102038a 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">കീബോർഡ് തരം മാറ്റുക</string>
<string name="keycode_shift">ഷിഫ്റ്റ്</string>
<string name="keycode_enter">നൽകുക</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">ക്ലിപ്പ്ബോർഡ് ഉള്ളടക്കം ലഭ്യമാണെങ്കിൽ കാണിക്കുക</string>
<string name="show_popup">കീപ്രസ്സിൽ ഒരു പോപ്പ്അപ്പ് കാണിക്കുക</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 14ce48a..ee13235 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 95f68fb..344c01b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Type toetsenbord veranderen</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Klembordinhoud tonen indien beschikbaar</string>
<string name="show_popup">Pop-up tonen bij toetsaanslagen</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 4860f70..3bf51be 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">کیبورڈ دی قسم بدلو</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">جے اُپلبدھ ہووے تاں کاپی کیتی لکھت ویکھو</string>
<string name="show_popup">جدوں کنجی دباؤݨ کنجی تے وڈا اکھر ویکھو</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 47e09d3..8aab64e 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ff6fedd..bc11a37 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Zmień typ klawiatury</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Pokazuj zawartość schowka, jeśli jest dostępna</string>
<string name="show_popup">Pokazuj wyskakujące okienko przy naciśnięciu klawisza</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ee694ef..232e079 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Mudar tipo de teclado</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostrar conteúdo da área de transferência se houver</string>
<string name="show_popup">Mostrar pop-up ao digitar</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a031e0d..cf99140 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Alterar tipo de teclado</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Mostrar conteúdo da área de transferência, se disponível</string>
<string name="show_popup">Mostrar pop-up ao premir as teclas</string>
@@ -41,4 +42,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 410545a..7d76106 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Schimbați tipul de tastatură</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Afișează conținutul clipboard-ului, dacă este disponibil</string>
<string name="show_popup">Afișați o fereastră pop-up la apăsarea unei taste</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6332031..45ac58c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Zmeniť typ klávesnice</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Zobraziť obsah schránky, ak je dostupná</string>
<string name="show_popup">Zobraziť detail znaku pri stlačení</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f4838c0..33b27c7 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Spremeni vrsto tipkovnice</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Prikaži vsebino odložišča, če je na voljo</string>
<string name="show_popup">Prikaži pojavno okno ob pritisku tipke</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1a790f3..c2d89ed 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Промените тип тастатуре</string>
<string name="keycode_shift">Смена</string>
<string name="keycode_enter">Унеси</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Прикажи садржај међуспремника ако је доступан</string>
<string name="show_popup">Прикажи искачући прозор при притиску на тастер</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 1d71125..9454853 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Ändra tangentbordstyp</string>
<string name="keycode_shift">Skift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Visa urklippets innehåll om tillgängligt</string>
<string name="show_popup">Visa en popupp vid knapptryck</string>
@@ -41,4 +42,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 14ce48a..ee13235 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d357e48..41b315e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Klavye türünü değiştir</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Varsa pano içeriğini göster</string>
<string name="show_popup">Tuşa basıldığında bir açılır menü göster</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index dc8cb25..9ae5a85 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">Змінити тип клавіатури</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Показувати вміст буфера обміну, якщо він є</string>
<string name="show_popup">Показувати popup при натисканні</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cbc7f2c..8a203f4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -26,6 +26,7 @@
<string name="keycode_mode_change">更改键盘类型</string>
<string name="keycode_shift">上档</string>
<string name="keycode_enter">输入</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">如可用显示剪贴板内容</string>
<string name="show_popup">按键时显示弹框</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f9db284..d099b14 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -27,6 +27,7 @@
<string name="keycode_mode_change">變更鍵盤類型</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">可以的話顯示剪貼簿內容</string>
<string name="show_popup">按下按鍵時顯示彈出效果</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a30eefe..ee13235 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
<string name="keycode_mode_change">Change keyboard type</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
- <string name="keycode_space">Space</string>
+ <string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
From c17a79a7b422da6d4aee03168c57ce623a3c86b1 Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Sat, 10 Jun 2023 09:15:11 +0200
Subject: [PATCH 08/10] shortening some code
---
.../keyboard/helpers/MyKeyboard.kt | 34 ++++---------------
1 file changed, 7 insertions(+), 27 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index ccba189..fb90bdf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -230,33 +230,13 @@ class MyKeyboard {
*/
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
- }
+ 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
}
}
From 6a8ff890222231e3b0f1726bd0bda6e855f8b9f3 Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Sat, 10 Jun 2023 09:15:32 +0200
Subject: [PATCH 09/10] minor code style update
---
.../com/simplemobiletools/keyboard/helpers/AccessHelper.kt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
index 120432c..dd10066 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt
@@ -30,9 +30,10 @@ class AccessHelper(
val rects = keys.map {
Rect(it.x, it.y, it.x + it.width, it.y + it.height)
}
- rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
- return rects.indexOf(exactRect)
- } ?: return HOST_ID
+
+ return rects.firstOrNull { it.contains(x.toInt(), y.toInt()) }?.let { exactRect ->
+ rects.indexOf(exactRect)
+ } ?: HOST_ID
}
/**
From 9519caa01e9a8821baa64427032cc6b25efc68fc Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Sat, 10 Jun 2023 09:17:12 +0200
Subject: [PATCH 10/10] updating the slovak string
---
app/src/main/res/values-sk/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 45ac58c..79dc658 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,7 +26,7 @@
<string name="keycode_mode_change">Zmeniť typ klávesnice</string>
<string name="keycode_shift">Shift</string>
<string name="keycode_enter">Enter</string>
- <string name="keycode_space">Spacebar</string>
+ <string name="keycode_space">Medzerník</string>
<!-- Settings -->
<string name="show_clipboard_content">Zobraziť obsah schránky, ak je dostupná</string>
<string name="show_popup">Zobraziť detail znaku pri stlačení</string>