From 5793d4e71d559cc2fcb05795fe2dcb4d473fab8e Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 26 Jun 2024 23:56:24 +0930 Subject: [PATCH] Add remaining contentDescriptions --- .../conversation/start/invitefriend/InviteFriend.kt | 2 +- .../securesms/onboarding/loadaccount/LoadAccount.kt | 5 ++--- .../securesms/preferences/SettingsActivity.kt | 9 +++++---- .../org/thoughtcrime/securesms/ui/components/Text.kt | 4 +++- app/src/main/res/layout/activity_conversation_v2.xml | 1 + app/src/main/res/layout/activity_settings.xml | 1 - 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt index 32bebaf149..256756521e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt @@ -42,7 +42,7 @@ internal fun InviteFriend( Text( accountId, modifier = Modifier - .contentDescription(R.string.AccessibilityId_recovery_password_container) + .contentDescription(R.string.AccessibilityId_account_id) .fillMaxWidth() .border() .padding(LocalDimensions.current.smallMargin), diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt index c91306445f..caef0cca41 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt @@ -102,9 +102,8 @@ private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onCo Spacer(Modifier.height(LocalDimensions.current.itemSpacing)) SessionOutlinedTextField( text = state.recoveryPhrase, - modifier = Modifier - .fillMaxWidth() - .contentDescription(R.string.AccessibilityId_recovery_phrase_input), + modifier = Modifier.fillMaxWidth(), + contentDescription = stringResource(R.string.AccessibilityId_recovery_phrase_input), placeholder = stringResource(R.string.recoveryPasswordEnter), onChange = onChange, onContinue = onContinue, diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt index b847ba6b03..e705cca1e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt @@ -7,6 +7,7 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.net.Uri +import android.os.Build import android.os.Bundle import android.os.Parcelable import android.util.SparseArray @@ -17,6 +18,7 @@ import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast +import androidx.annotation.RequiresApi import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -74,14 +76,10 @@ import org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity import org.thoughtcrime.securesms.showSessionDialog import org.thoughtcrime.securesms.ui.Cell import org.thoughtcrime.securesms.ui.Divider -import org.thoughtcrime.securesms.ui.ItemButton -import org.thoughtcrime.securesms.ui.ItemButtonWithDrawable import org.thoughtcrime.securesms.ui.LargeItemButton import org.thoughtcrime.securesms.ui.LargeItemButtonWithDrawable import org.thoughtcrime.securesms.ui.LocalDimensions import org.thoughtcrime.securesms.ui.color.destructiveButtonColors -import org.thoughtcrime.securesms.ui.components.OutlineButton -import org.thoughtcrime.securesms.ui.components.OutlineCopyButton import org.thoughtcrime.securesms.ui.components.PrimaryOutlineButton import org.thoughtcrime.securesms.ui.components.PrimaryOutlineCopyButton import org.thoughtcrime.securesms.ui.contentDescription @@ -169,6 +167,9 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.settings_general, menu) + if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + menu.findItem(R.id.action_qr_code)?.contentDescription = resources.getString(R.string.AccessibilityId_view_qr_code) + } return true } diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt index d3a44d8363..34aa426ea1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt @@ -36,6 +36,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import network.loki.messenger.R import org.thoughtcrime.securesms.ui.LocalDimensions import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.base @@ -118,7 +119,8 @@ fun SessionOutlinedTextField( Spacer(modifier = Modifier.height(LocalDimensions.current.xsItemSpacing)) Text( it, - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth() + .contentDescription(R.string.AccessibilityId_error_message), textAlign = TextAlign.Center, style = baseBold, color = LocalColors.current.danger diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml index 6fe0c4db60..23d5f97e55 100644 --- a/app/src/main/res/layout/activity_conversation_v2.xml +++ b/app/src/main/res/layout/activity_conversation_v2.xml @@ -256,6 +256,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/blockedBanner" android:elevation="8dp" + android:contentDescription="@string/AccessibilityId_control_message" tools:text="@string/activity_conversation_empty_state_default" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ddf231a752..3ccd5c2156 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -30,7 +30,6 @@