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 @@ Изменить тип клавиатуры Shift Enter + Пробел Показывать содержимое буфера обмена при наличии Показывать ввод по нажатию @@ -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 --> - \ No newline at end of file + 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 @@ Change keyboard type Shift Enter + Space Show clipboard content if available Show a popup on keypress