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