From 23fc427b004871eb42eae1ee9d3f27198d8dcb8a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 28 Nov 2021 20:01:21 +0100 Subject: [PATCH 1/2] adding a new string for content description --- app/src/main/res/values-cs/strings.xml | 1 + 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-es/strings.xml | 1 + 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-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/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/strings.xml | 2 ++ 23 files changed, 24 insertions(+) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b7f04bc6..71aa43ae 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -19,6 +19,7 @@ Číselník Asterisk Hashtag + Call number Telefon Přijmout diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c8bb5296..00eb046a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -21,6 +21,7 @@ Numerisk tastatur Asterisk Hashtag + Call number Opkald diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7d5bed81..724fa658 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,6 +19,7 @@ Wählpad Asterisk Hashtag + Call number Telefon akzeptieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a23bf665..d20eaed2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -21,6 +21,7 @@ Πληκτρολόγιο κλήσης Asterisk Hashtag + Call number Κλήση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index dd4f5eab..c43d3c75 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -21,6 +21,7 @@ Teclado de marcado Asterisk Hashtag + Call number Marcador diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ac10e43e..fd7ce277 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -21,6 +21,7 @@ Numerovalitsin Asterisk Hashtag + Call number Puhelin diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e2c97e04..1da1b1b2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,6 +19,7 @@ Pavé numérique Asterisk Hashtag + Call number Compositeur Accepter diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8111c685..b26186f7 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -21,6 +21,7 @@ Marcador Asterisk Hashtag + Call number Marcador diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6e3075de..2dd26a0a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -19,6 +19,7 @@ Tárcsázó Asterisk Hashtag + Call number Tárcsázó Fogadás diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 3239f84b..e9a6f5a5 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -21,6 +21,7 @@ Tombol nomor Asterisk Hashtag + Call number Dialer diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 39b9f939..f9aa0f86 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -21,6 +21,7 @@ Tastierino numerico Asterisk Hashtag + Call number Compositore diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 702e93d3..bb936505 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -21,6 +21,7 @@ ダイヤルパッド Asterisk Hashtag + Call number ダイヤラー diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index c87ce11c..8321579f 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -21,6 +21,7 @@ ഡയൽപാഡ് Asterisk Hashtag + Call number ഡയലർ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 772698cd..f1e7ee4a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -21,6 +21,7 @@ Toetsenblok Asterisk Hashtag + Call number Telefoon diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 23aa60d6..7fc5b76a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -19,6 +19,7 @@ Panel wybierania Asterisk Hashtag + Call number Telefon Odbierz diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 666fcf50..95d92f32 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -21,6 +21,7 @@ Marcador Asterisk Hashtag + Call number Marcador diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d62c3621..ef8c31de 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,6 +19,7 @@ Номеронабиратель Asterisk Hashtag + Call number Телефон Принять diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index c3ba5ec3..da3eefb1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -21,6 +21,7 @@ Číselník Hviezdička Mriežka + Zavolať číslo Telefón diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ddb08883..63c66ca3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -21,6 +21,7 @@ Knappsats Asterisk Hashtag + Call number Telefon diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a5d1f69a..097c42a0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -19,6 +19,7 @@ Tuş takımı Asterisk Hashtag + Call number Çevirici Kabul Et diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 78c04c6a..672574bd 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -21,6 +21,7 @@ Dialpad Asterisk Hashtag + Call number Dialer diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fe9c2a7b..79017b14 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -19,6 +19,7 @@ 拨号盘 Asterisk Hashtag + Call number 拨号器 接听 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f59a5fbc..99c41a65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,6 +21,8 @@ Dialpad Asterisk Hashtag + Call number + Call number Dialer From 681f6534e7872e01d8763adb5c657eb9f9268ce1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 28 Nov 2021 20:03:13 +0100 Subject: [PATCH 2/2] fix #236, adding some content descriptions for Talkback --- .../dialer/activities/CallActivity.kt | 2 ++ .../dialer/activities/MainActivity.kt | 11 +++++++++++ app/src/main/res/layout/activity_call.xml | 8 +++++--- app/src/main/res/layout/activity_dialpad.xml | 1 + app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/layout/dialpad.xml | 12 ++++++++++++ app/src/main/res/values/strings.xml | 1 - 7 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index ee962096..7aa6834c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -158,6 +158,7 @@ class CallActivity : SimpleActivity() { val newRoute = if (isSpeakerOn) CallAudioState.ROUTE_SPEAKER else CallAudioState.ROUTE_EARPIECE CallManager.inCallService?.setAudioRoute(newRoute) + call_toggle_speaker.contentDescription = getString(if (isSpeakerOn) R.string.turn_speaker_off else R.string.turn_speaker_on) } private fun toggleMicrophone() { @@ -166,6 +167,7 @@ class CallActivity : SimpleActivity() { call_toggle_microphone.setImageDrawable(getDrawable(drawable)) audioManager.isMicrophoneMute = !isMicrophoneOn CallManager.inCallService?.setMuted(!isMicrophoneOn) + call_toggle_microphone.contentDescription = getString(if (isMicrophoneOn) R.string.turn_microphone_off else R.string.turn_microphone_on) } private fun toggleDialpadVisibility() { diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt index 3da82ddf..3895adb8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt @@ -299,6 +299,7 @@ class MainActivity : SimpleActivity() { skippedTabs++ } else { val tab = main_tabs_holder.newTab().setIcon(getTabIcon(index)) + tab.contentDescription = getTabContentDescription(index) val wasAlreadySelected = selectedTabIndex > -1 && selectedTabIndex == index - skippedTabs val shouldSelect = !isAnySelected && wasAlreadySelected if (shouldSelect) { @@ -324,6 +325,16 @@ class MainActivity : SimpleActivity() { return resources.getColoredDrawableWithColor(drawableId, config.textColor) } + private fun getTabContentDescription(position: Int): String { + val stringId = when (position) { + 0 -> R.string.contacts_tab + 1 -> R.string.favorites_tab + else -> R.string.call_history_tab + } + + return resources.getString(stringId) + } + private fun refreshItems(openLastTab: Boolean = false) { if (isDestroyed || isFinishing) { return diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml index 38164332..94ed695f 100644 --- a/app/src/main/res/layout/activity_call.xml +++ b/app/src/main/res/layout/activity_call.xml @@ -126,6 +126,7 @@ android:layout_width="@dimen/dialpad_button_size" android:layout_height="@dimen/dialpad_button_size" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/show_dialpad" android:padding="@dimen/medium_margin" android:src="@drawable/ic_dialpad_vector" app:layout_constraintBottom_toBottomOf="parent" @@ -139,7 +140,7 @@ android:id="@+id/call_end" android:layout_width="@dimen/dialpad_button_size" android:layout_height="@dimen/dialpad_button_size" - android:contentDescription="@string/decline" + android:contentDescription="@string/end_call" android:src="@drawable/ic_call_decline" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -159,7 +160,7 @@ android:id="@+id/call_decline" android:layout_width="@dimen/incoming_call_button_size" android:layout_height="@dimen/incoming_call_button_size" - android:contentDescription="@string/decline" + android:contentDescription="@string/decline_call" android:src="@drawable/ic_call_decline" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -183,7 +184,7 @@ android:id="@+id/call_accept" android:layout_width="@dimen/incoming_call_button_size" android:layout_height="@dimen/incoming_call_button_size" - android:contentDescription="@string/accept" + android:contentDescription="@string/accept_call" android:src="@drawable/ic_call_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -241,6 +242,7 @@ android:layout_centerVertical="true" android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/hide_dialpad" android:padding="@dimen/medium_margin" android:src="@drawable/ic_cross_vector" /> diff --git a/app/src/main/res/layout/activity_dialpad.xml b/app/src/main/res/layout/activity_dialpad.xml index d3e8d12c..2a2b3a3a 100644 --- a/app/src/main/res/layout/activity_dialpad.xml +++ b/app/src/main/res/layout/activity_dialpad.xml @@ -99,6 +99,7 @@ android:layout_height="@dimen/dialpad_button_size" android:layout_marginBottom="@dimen/activity_margin" android:background="@drawable/circle_background" + android:contentDescription="@string/call_number" android:elevation="@dimen/medium_margin" android:padding="@dimen/normal_margin" android:src="@drawable/ic_phone_vector" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a003bfc1..09d93b84 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -28,6 +28,7 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/activity_margin" android:background="@drawable/circle_background" + android:contentDescription="@string/dialpad" android:elevation="@dimen/medium_margin" android:padding="@dimen/activity_margin" android:src="@drawable/ic_dialpad_vector" /> diff --git a/app/src/main/res/layout/dialpad.xml b/app/src/main/res/layout/dialpad.xml index 08b9c463..15a81bd5 100644 --- a/app/src/main/res/layout/dialpad.xml +++ b/app/src/main/res/layout/dialpad.xml @@ -16,6 +16,7 @@ android:layout_height="0dp" android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/one" app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_2_holder" app:layout_constraintStart_toStartOf="parent" @@ -37,6 +38,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/two" app:layout_constraintBottom_toTopOf="@+id/dialpad_5_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_3_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_1_holder"> @@ -67,6 +69,7 @@ android:layout_height="0dp" android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/three" app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_2_holder" @@ -98,6 +101,7 @@ android:layout_height="0dp" android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/four" app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_5_holder" app:layout_constraintStart_toStartOf="parent" @@ -129,6 +133,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/five" app:layout_constraintBottom_toTopOf="@+id/dialpad_8_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_6_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_4_holder"> @@ -159,6 +164,7 @@ android:layout_height="0dp" android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/six" app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_5_holder" @@ -190,6 +196,7 @@ android:layout_height="0dp" android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/seven" app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_8_holder" app:layout_constraintStart_toStartOf="parent" @@ -221,6 +228,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/eight" app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_9_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_7_holder"> @@ -251,6 +259,7 @@ android:layout_height="0dp" android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/nine" app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_8_holder" @@ -282,6 +291,7 @@ android:layout_height="0dp" android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/asterisk" app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_0_holder" app:layout_constraintStart_toStartOf="parent" @@ -303,6 +313,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/zero" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk_holder"> @@ -337,6 +348,7 @@ android:layout_height="0dp" android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/hashtag" app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_0_holder" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 99c41a65..d2b08bb4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,7 +22,6 @@ Asterisk Hashtag Call number - Call number Dialer