From 76b6a4391dcf9cbcddbf98b8be64ebc701bbe0e9 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 13 Jul 2022 10:34:40 +1000
Subject: [PATCH 01/31] adding accessibility id to new conversation button

---
 app/src/main/res/layout/activity_home.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 893bf88bcf6..e6d95ed4cb4 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -159,6 +159,7 @@
 
         <org.thoughtcrime.securesms.home.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
+            android:contentDescription="@string/"
             android:layout_width="276dp"
             android:layout_height="236dp"
             android:layout_alignParentBottom="true"

From ff8032d2f68a63db6f85b70b92e996b4f559c500 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 13 Jul 2022 13:19:58 +1000
Subject: [PATCH 02/31] adding accessibility ids and strings for testing

---
 .../res/layout-sw400dp/view_seed_reminder.xml |  1 +
 .../main/res/layout/activity_display_name.xml |  2 +
 app/src/main/res/layout/activity_home.xml     |  7 ++-
 app/src/main/res/layout/activity_landing.xml  |  3 ++
 .../main/res/layout/activity_link_device.xml  | 44 +++++++++----------
 app/src/main/res/layout/activity_pn_mode.xml  |  4 ++
 .../activity_recovery_phrase_restore.xml      | 10 +++--
 app/src/main/res/layout/activity_register.xml |  3 ++
 app/src/main/res/layout/activity_seed.xml     |  2 +
 app/src/main/res/layout/activity_settings.xml | 15 ++++---
 app/src/main/res/layout/dialog_seed.xml       |  3 ++
 .../main/res/layout/view_seed_reminder.xml    |  1 +
 app/src/main/res/values/strings.xml           | 30 ++++++++++++-
 13 files changed, 91 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout-sw400dp/view_seed_reminder.xml b/app/src/main/res/layout-sw400dp/view_seed_reminder.xml
index 41069f02f2c..6cda096e3f0 100644
--- a/app/src/main/res/layout-sw400dp/view_seed_reminder.xml
+++ b/app/src/main/res/layout-sw400dp/view_seed_reminder.xml
@@ -60,6 +60,7 @@
         <Button
             style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/button"
+            android:contentDescription="@string/AccessibilityId_continue"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:layout_marginLeft="4dp"
diff --git a/app/src/main/res/layout/activity_display_name.xml b/app/src/main/res/layout/activity_display_name.xml
index 60a6580cef8..c4848aca14d 100644
--- a/app/src/main/res/layout/activity_display_name.xml
+++ b/app/src/main/res/layout/activity_display_name.xml
@@ -32,6 +32,7 @@
 
     <EditText
         style="@style/SmallSessionEditText"
+        android:contentDescription="@string/AccessibilityId_enter_display_name"
         android:id="@+id/displayNameEditText"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -51,6 +52,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index e6d95ed4cb4..429d65e9031 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -33,7 +33,8 @@
                     android:layout_height="@dimen/small_profile_picture_size"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="9dp" />
+                    android:layout_marginLeft="9dp"
+                    android:contentDescription="@string/AccessibilityId_profile_picture" />
 
                 <org.thoughtcrime.securesms.home.PathStatusView
                     android:id="@+id/pathStatusView"
@@ -55,6 +56,7 @@
 
                 <RelativeLayout
                     android:id="@+id/searchViewContainer"
+                    android:contentDescription="@string/AccessibilityId_search_icon"
                     android:layout_width="@dimen/small_profile_picture_size"
                     android:layout_height="@dimen/small_profile_picture_size"
                     android:layout_alignParentRight="true"
@@ -163,7 +165,8 @@
             android:layout_width="276dp"
             android:layout_height="236dp"
             android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true" />
+            android:layout_marginBottom="0dp"
+            android:contentDescription="@string/AccessibilityId_new_conversation_button" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
index f22cb155510..9d3cd3fae39 100644
--- a/app/src/main/res/layout/activity_landing.xml
+++ b/app/src/main/res/layout/activity_landing.xml
@@ -32,6 +32,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
+        android:contentDescription="@string/AccessibilityId_create_session_id"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -41,6 +42,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:contentDescription="@string/AccessibilityId_restore_your_session"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -50,6 +52,7 @@
         android:text="@string/activity_landing_restore_button_title" />
 
     <Button
+        android:contentDescription="@string/AccessibilityId_link_device"
         android:id="@+id/linkButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/onboarding_button_bottom_offset"
diff --git a/app/src/main/res/layout/activity_link_device.xml b/app/src/main/res/layout/activity_link_device.xml
index 947d2c1c29f..2a3a9d1dd9c 100644
--- a/app/src/main/res/layout/activity_link_device.xml
+++ b/app/src/main/res/layout/activity_link_device.xml
@@ -9,38 +9,38 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <com.google.android.material.tabs.TabLayout
-            style="@style/Widget.Session.TabLayout"
             android:id="@+id/tabLayout"
+            style="@style/Widget.Session.TabLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_bar_height" />
 
-    </androidx.viewpager.widget.ViewPager>
-
-    <FrameLayout
-        android:animateLayoutChanges="true"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:id="@+id/loader"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#A4000000"
-            android:visibility="gone">
+            android:animateLayoutChanges="true">
+
+            <RelativeLayout
+                android:id="@+id/loader"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#A4000000"
+                android:visibility="gone">
 
-            <com.github.ybq.android.spinkit.SpinKitView
-                style="@style/SpinKitView.Large.ThreeBounce"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_centerInParent="true"
-                app:SpinKit_Color="@android:color/white" />
+                <com.github.ybq.android.spinkit.SpinKitView
+                    style="@style/SpinKitView.Large.ThreeBounce"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:layout_marginTop="8dp"
+                    app:SpinKit_Color="@android:color/white" />
 
-        </RelativeLayout>
+            </RelativeLayout>
 
-    </FrameLayout>
+        </FrameLayout>
+
+    </androidx.viewpager.widget.ViewPager>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 5c0f032e7b4..091b0de2208 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -32,6 +32,7 @@
             android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.util.PNModeView
+            android:contentDescription="@string/AccessibilityId_fast_mode_notifications_option"
             android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,6 +44,7 @@
             android:background="@drawable/pn_option_background">
 
             <TextView
+
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/medium_font_size"
@@ -70,6 +72,7 @@
         </org.thoughtcrime.securesms.util.PNModeView>
 
         <org.thoughtcrime.securesms.util.PNModeView
+            android:contentDescription="@string/AccessibilityId_slow_mode_notifications_option"
             android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -100,6 +103,7 @@
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
+            android:contentDescription="@string/AccessibilityId_continue_message_notifications"
             android:id="@+id/registerButton"
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_recovery_phrase_restore.xml b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
index 188c592e978..1f91c455914 100644
--- a/app/src/main/res/layout/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
@@ -32,19 +32,20 @@
         android:text="@string/activity_restore_explanation" />
 
     <EditText
-        style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
+        style="@style/SmallSessionEditText"
+        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:paddingTop="0dp"
-        android:paddingBottom="0dp"
         android:gravity="center_vertical"
+        android:hint="@string/activity_restore_seed_edit_text_hint"
         android:inputType="textMultiLine"
         android:maxLines="3"
-        android:hint="@string/activity_restore_seed_edit_text_hint" />
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp" />
 
     <View
         android:layout_width="match_parent"
@@ -53,6 +54,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
+        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 0f0d560b868..a14e9bd395b 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -33,6 +33,7 @@
 
     <TextView
         style="@style/SessionIDTextView"
+        android:contentDescription="@string/AccessibilityId_session_id"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,6 +50,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -58,6 +60,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:contentDescription="@string/AccessibilityId_copy_session_id"
         android:id="@+id/copyButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_seed.xml b/app/src/main/res/layout/activity_seed.xml
index a650d147f37..e80677eaf69 100644
--- a/app/src/main/res/layout/activity_seed.xml
+++ b/app/src/main/res/layout/activity_seed.xml
@@ -38,6 +38,7 @@
 
     <TextView
         style="@style/SessionIDTextView"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase"
         android:id="@+id/seedTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -68,6 +69,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:contentDescription="@string/AccessibilityId_copy_recovery_phrase"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ba8baca1bff..11964969ba4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -28,6 +28,7 @@
 
             <RelativeLayout
                 android:id="@+id/ctnGroupNameSection"
+                android:contentDescription="@string/AccessibilityId_username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/large_spacing"
@@ -35,19 +36,21 @@
                 android:layout_marginRight="@dimen/large_spacing">
 
                 <EditText
-                    style="@style/SessionEditText"
                     android:id="@+id/displayNameEditText"
+                    style="@style/SessionEditText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:textAlignment="center"
+                    android:layout_centerVertical="true"
+                    android:contentDescription="@string/AccessibilityId_username"
+                    android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
-                    android:visibility="invisible"
-                    android:hint="@string/activity_settings_display_name_edit_text_hint" />
+                    android:textAlignment="center"
+                    android:visibility="invisible" />
 
                 <TextView
                     android:id="@+id/btnGroupNameDisplay"
+                    android:contentDescription="@string/AccessibilityId_username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
@@ -67,6 +70,7 @@
 
             <TextView
                 android:id="@+id/publicKeyTextView"
+                android:contentDescription="@string/AccessibilityId_session_id"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/large_spacing"
@@ -213,6 +217,7 @@
 
             <TextView
                 android:id="@+id/seedButton"
+                android:contentDescription="@string/AccessibilityId_show_recovery_phrase"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/setting_button_height"
                 android:background="@drawable/setting_button_background"
diff --git a/app/src/main/res/layout/dialog_seed.xml b/app/src/main/res/layout/dialog_seed.xml
index dd4c2d32b2a..04388ea9de8 100644
--- a/app/src/main/res/layout/dialog_seed.xml
+++ b/app/src/main/res/layout/dialog_seed.xml
@@ -19,6 +19,7 @@
 
     <TextView
         style="@style/SessionIDTextView"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase"
         android:id="@+id/seedTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -47,6 +48,7 @@
 
         <Button
             style="@style/Widget.Session.Button.Dialog.Unimportant"
+            android:contentDescription="@string/AccessibilityId_cancel_button"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -55,6 +57,7 @@
 
         <Button
             style="@style/Widget.Session.Button.Dialog.Unimportant"
+            android:contentDescription="@string/AccessibilityId_copy_recovery_phrase"
             android:id="@+id/copyButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/view_seed_reminder.xml b/app/src/main/res/layout/view_seed_reminder.xml
index f16b03c4bf1..db02ec9b7a4 100644
--- a/app/src/main/res/layout/view_seed_reminder.xml
+++ b/app/src/main/res/layout/view_seed_reminder.xml
@@ -59,6 +59,7 @@
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentOutline"
+            android:contentDescription="@string/AccessibilityId_continue"
             android:id="@+id/button"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b315026d67..f397ad33eca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,35 @@
     <string name="save">Save</string>
     <string name="note_to_self">Note to Self</string>
     <string name="version_s">Version %s</string>
-
+<!--Accessibility ID's-->
+    <!-- Landing Page -->
+    <string name="AccessibilityId_create_session_id">Create Session ID</string>
+    <string name="AccessibilityId_restore_your_session">Restore Your Session</string>
+    <string name="AccessibilityId_link_device">Link Device</string>
+    <!-- Session ID Page-->
+    <string name="AccessibilityId_session_id">Session ID</string>
+    <string name="AccessibilityId_continue">Continue</string>
+    <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
+    <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
+    <!--Restore by seed page-->
+    <string name="AccessibilityId_enter_your_recovery_phrase">Enter your recovery phrase</string>
+    <!--Create Display Name    -->
+    <string name="AccessibilityId_enter_display_name">Enter display name</string>
+    <!--Message Notifications Options-->
+    <string name="AccessibilityId_fast_mode_notifications_option">Fast mode notifications option</string>
+    <string name="AccessibilityId_slow_mode_notifications_option">Slow mode notifications option</string>
+    <!--Recovery Phrase reminder-->
+    <string name="AccessibilityId_recovery_phrase">Recovery Phrase</string>
+    <string name="AccessibilityId_copy_recovery_phrase">Copy Recovery Phrase</string>
+    <!--Home Page-->
+    <string name="AccessibilityId_profile_picture">Profile picture</string>
+    <string name="AccessibilityId_search_icon">Search icon</string>
+    <string name="AccessibilityId_new_conversation_button">New conversation button</string>
+    <!--Settings Page-->
+    <string name="AccessibilityId_username">Username</string>
+    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+<!--    Recovery Phrase Dialog-->
+    <string name="AccessibilityId_cancel_button">Cancel</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
 

From a86ab3ee9c5e1d7e7c26eabf0b1ff0b4bf884068 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 13 Jul 2022 14:23:15 +1000
Subject: [PATCH 03/31] updating id tags for new conversation buttons

---
 .../securesms/home/NewConversationButtonSetView.kt        | 8 ++++----
 app/src/main/res/values/strings.xml                       | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
index 3533a1aa8c0..0ad0960ce49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt
@@ -72,8 +72,8 @@ class NewConversationButtonSetView : RelativeLayout {
     // endregion
 
     // region Components
-    private val mainButton by lazy { Button(context, true, R.drawable.ic_plus) }
-    private val sessionButton by lazy { Button(context, false, R.drawable.ic_message) }
+    private val mainButton by lazy { Button(context, true, R.drawable.ic_plus).apply{contentDescription = context.getString(R.string.AccessibilityId_new_conversation_button)} }
+    private val sessionButton by lazy { Button(context, false, R.drawable.ic_message).apply {contentDescription = context.getString(R.string.AccessibilityId_new_direct_message)} }
     private val sessionTooltip by lazy {
         TextView(context).apply {
             setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
@@ -82,7 +82,7 @@ class NewConversationButtonSetView : RelativeLayout {
             isAllCaps = true
         }
     }
-    private val closedGroupButton by lazy { Button(context, false, R.drawable.ic_group) }
+    private val closedGroupButton by lazy { Button(context, false, R.drawable.ic_group).apply {contentDescription = context.getString(R.string.AccessibilityId_create_group)} }
     private val closedGroupTooltip by lazy {
         TextView(context).apply {
             setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
@@ -91,7 +91,7 @@ class NewConversationButtonSetView : RelativeLayout {
             isAllCaps = true
         }
     }
-    private val openGroupButton by lazy { Button(context, false, R.drawable.ic_globe) }
+    private val openGroupButton by lazy { Button(context, false, R.drawable.ic_globe).apply {contentDescription = context.getString(R.string.AccessibilityId_join_community)} }
     private val openGroupTooltip by lazy {
         TextView(context).apply {
             setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f397ad33eca..43554781cff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,12 +32,18 @@
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
+    <!--New conversation pop up-->
     <string name="AccessibilityId_new_conversation_button">New conversation button</string>
+    <string name="AccessibilityId_new_direct_message">New direct message</string>
+    <string name="AccessibilityId_create_group">Create group</string>
+    <string name="AccessibilityId_join_community">Join community</string>
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
+
+
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
 

From 11c4d282f08ebf1566c4ea0f4a9f04154cfa5823 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Thu, 14 Jul 2022 11:13:20 +1000
Subject: [PATCH 04/31] accessibility tags for create contact test

---
 .../securesms/conversation/v2/input_bar/InputBar.kt       | 6 +++---
 .../main/res/layout-sw400dp/fragment_enter_public_key.xml | 2 ++
 app/src/main/res/layout/activity_home.xml                 | 4 +---
 app/src/main/res/layout/fragment_enter_public_key.xml     | 2 ++
 app/src/main/res/layout/view_input_bar.xml                | 2 ++
 app/src/main/res/values/strings.xml                       | 8 ++++++++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index 2db35616071..b9d0608e032 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -53,9 +53,9 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
     val attachmentButtonsContainerHeight: Int
         get() = binding.attachmentsButtonContainer.height
 
-    private val attachmentsButton by lazy { InputBarButton(context, R.drawable.ic_plus_24) }
-    private val microphoneButton by lazy { InputBarButton(context, R.drawable.ic_microphone) }
-    private val sendButton by lazy { InputBarButton(context, R.drawable.ic_arrow_up, true) }
+    private val attachmentsButton by lazy { InputBarButton(context, R.drawable.ic_plus_24).apply {contentDescription = context.getString(R.string.AccessibilityId_attachments_button)} }
+    private val microphoneButton by lazy { InputBarButton(context, R.drawable.ic_microphone).apply {contentDescription = context.getString(R.string.AccessibilityId_microphone_button)} }
+    private val sendButton by lazy { InputBarButton(context, R.drawable.ic_arrow_up, true).apply {contentDescription = context.getString(R.string.AccessibilityId_send_message_button)} }
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }
diff --git a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
index 33b8133db2a..c47700a0653 100644
--- a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -17,6 +17,7 @@
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/publicKeyEditText"
+        android:contentDescription="@string/AccessibilityId_session_id_input"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/large_spacing"
@@ -107,6 +108,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
+        android:contentDescription="@string/AccessibilityId_next"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginBottom="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 429d65e9031..d34caed89ee 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -161,12 +161,10 @@
 
         <org.thoughtcrime.securesms.home.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
-            android:contentDescription="@string/"
             android:layout_width="276dp"
             android:layout_height="236dp"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="0dp"
-            android:contentDescription="@string/AccessibilityId_new_conversation_button" />
+            android:layout_centerHorizontal="true" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml
index 33b8133db2a..c47700a0653 100644
--- a/app/src/main/res/layout/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout/fragment_enter_public_key.xml
@@ -17,6 +17,7 @@
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/publicKeyEditText"
+        android:contentDescription="@string/AccessibilityId_session_id_input"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/large_spacing"
@@ -107,6 +108,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
+        android:contentDescription="@string/AccessibilityId_next"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginBottom="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/view_input_bar.xml b/app/src/main/res/layout/view_input_bar.xml
index 67d3af38c60..e594652bfbf 100644
--- a/app/src/main/res/layout/view_input_bar.xml
+++ b/app/src/main/res/layout/view_input_bar.xml
@@ -24,6 +24,7 @@
 
         <RelativeLayout
             android:id="@+id/attachmentsButtonContainer"
+            android:contentDescription="@string/AccessibilityId_attachments_button"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
             android:layout_alignParentStart="true"
@@ -32,6 +33,7 @@
 
         <org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarEditText
             android:id="@+id/inputBarEditText"
+            android:contentDescription="@string/AccessibilityId_message_input"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_centerInParent="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43554781cff..5e322f89b11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,14 @@
     <string name="AccessibilityId_new_direct_message">New direct message</string>
     <string name="AccessibilityId_create_group">Create group</string>
     <string name="AccessibilityId_join_community">Join community</string>
+    <!--New Session -->
+    <string name="AccessibilityId_session_id_input">Session id input box</string>
+    <string name="AccessibilityId_next">Next</string>
+    <!--Conversation screen -->
+    <string name="AccessibilityId_message_input">Message input box</string>
+    <string name="AccessibilityId_microphone_button">Microphone button</string>
+    <string name="AccessibilityId_send_message_button">Send message button</string>
+    <string name="AccessibilityId_attachments_button">Attachment button</string>
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>

From 7b9a6dd3f063fe9fd911918dcb0eb4e87a16483c Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Fri, 15 Jul 2022 15:12:10 +1000
Subject: [PATCH 05/31] adding ids for message requests, config message,
 requests banner and conversation view

---
 .../v2/messages/ControlMessageView.kt         |  2 ++
 .../v2/messages/VisibleMessageView.kt         | 19 ++++++++++++-------
 .../main/res/layout/view_message_request.xml  |  1 +
 .../layout/view_message_request_banner.xml    |  1 +
 app/src/main/res/values/strings.xml           |  7 +++++++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index a4e4a52d5ba..3e370104ead 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -31,6 +31,7 @@ class ControlMessageView : LinearLayout {
         binding.dateBreakTextView.showDateBreak(message, previous)
         binding.iconImageView.visibility = View.GONE
         var messageBody: CharSequence = message.getDisplayBody(context)
+        binding.root.contentDescription= null
         when {
             message.isExpirationTimerUpdate -> {
                 binding.iconImageView.setImageDrawable(
@@ -46,6 +47,7 @@ class ControlMessageView : LinearLayout {
             }
             message.isMessageRequestResponse -> {
                 messageBody = context.getString(R.string.message_requests_accepted)
+                binding.root.contentDescription=context.getString(R.string.AccessibilityId_message_request_config_message)
             }
             message.isCallLog -> {
                 val drawable = when {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 615c5ff094d..f9067f7dbac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -15,6 +15,8 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
@@ -159,7 +161,7 @@ class VisibleMessageView : LinearLayout {
         val gravity = if (message.isOutgoing) Gravity.END else Gravity.START
         binding.mainContainer.gravity = gravity or Gravity.BOTTOM
         // Message status indicator
-        val (iconID, iconColor) = getMessageStatusImage(message)
+        val (iconID, iconColor, contentDescription) = getMessageStatusImage(message)
         if (iconID != null) {
             val drawable = ContextCompat.getDrawable(context, iconID)?.mutate()
             if (iconColor != null) {
@@ -167,6 +169,7 @@ class VisibleMessageView : LinearLayout {
             }
             binding.messageStatusImageView.setImageDrawable(drawable)
         }
+        binding.messageStatusImageView.contentDescription = contentDescription
         if (message.isOutgoing) {
             val lastMessageID = mmsSmsDb.getLastMessageID(message.threadId)
             binding.messageStatusImageView.isVisible = !message.isSent || message.id == lastMessageID
@@ -212,13 +215,15 @@ class VisibleMessageView : LinearLayout {
         }
     }
 
-    private fun getMessageStatusImage(message: MessageRecord): Pair<Int?,Int?> {
+    data class MessageStatusInfo(@DrawableRes val iconId: Int?, @ColorInt val iconTint: Int?, val contentDescription: String?)
+
+    private fun getMessageStatusImage(message: MessageRecord): MessageStatusInfo {
         return when {
-            !message.isOutgoing -> null to null
-            message.isFailed -> R.drawable.ic_error to resources.getColor(R.color.destructive, context.theme)
-            message.isPending -> R.drawable.ic_circle_dot_dot_dot to null
-            message.isRead -> R.drawable.ic_filled_circle_check to null
-            else -> R.drawable.ic_circle_check to null
+            !message.isOutgoing -> MessageStatusInfo(null, null, null)
+            message.isFailed -> MessageStatusInfo(R.drawable.ic_error, resources.getColor(R.color.destructive, context.theme), null)
+            message.isPending -> MessageStatusInfo(R.drawable.ic_circle_dot_dot_dot, null, context.getString(R.string.AccessibilityId_message_sent_status_pending))
+            message.isRead -> MessageStatusInfo(R.drawable.ic_filled_circle_check, null, null)
+            else -> MessageStatusInfo(R.drawable.ic_circle_check, null, context.getString(R.string.AccessibilityId_message_sent_status_tick))
         }
     }
 
diff --git a/app/src/main/res/layout/view_message_request.xml b/app/src/main/res/layout/view_message_request.xml
index 28ccd0ea234..6a88ce7757a 100644
--- a/app/src/main/res/layout/view_message_request.xml
+++ b/app/src/main/res/layout/view_message_request.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:contentDescription="@string/AccessibilityId_message_request"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/view_message_request_banner.xml b/app/src/main/res/layout/view_message_request_banner.xml
index e3121aaa5a0..0aa30c2a0d9 100644
--- a/app/src/main/res/layout/view_message_request_banner.xml
+++ b/app/src/main/res/layout/view_message_request_banner.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:contentDescription="@string/AccessibilityId_message_request_banner"
     android:layout_height="wrap_content"
     android:background="@drawable/conversation_view_background"
     android:gravity="center_vertical"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e322f89b11..2983c5d59ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,8 @@
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
+    <string name="AccessibilityId_message_request_banner">Message requests banner</string>
+    <string name="AccessibilityId_message_request">Message request</string>
     <!--New conversation pop up-->
     <string name="AccessibilityId_new_conversation_button">New conversation button</string>
     <string name="AccessibilityId_new_direct_message">New direct message</string>
@@ -45,6 +47,11 @@
     <string name="AccessibilityId_microphone_button">Microphone button</string>
     <string name="AccessibilityId_send_message_button">Send message button</string>
     <string name="AccessibilityId_attachments_button">Attachment button</string>
+    <!-- Conversation View-->
+    <string name="AccessibilityId_message_sent_status_tick">Message sent status tick</string>
+    <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
+    <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
+
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>

From 93373e2c467b77b101be27d4f8868208c60a4d4c Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Thu, 4 Aug 2022 13:52:24 +1000
Subject: [PATCH 06/31] adding more tags to settings page

---
 app/src/main/res/layout/activity_settings.xml | 3 ++-
 app/src/main/res/values/strings.xml           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 11964969ba4..011e7502a7b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -50,10 +50,10 @@
 
                 <TextView
                     android:id="@+id/btnGroupNameDisplay"
-                    android:contentDescription="@string/AccessibilityId_username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
+                    android:contentDescription="@string/AccessibilityId_username"
                     android:textColor="@color/text"
                     android:textSize="@dimen/very_large_font_size"
                     android:textStyle="bold" />
@@ -153,6 +153,7 @@
 
             <TextView
                 android:id="@+id/privacyButton"
+                android:contentDescription="@string/AccessibilityId_privacy"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/setting_button_height"
                 android:background="@drawable/setting_button_background"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2983c5d59ed..3ce68d783e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,7 @@
 
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>
+    <string name="AccessibilityId_privacy">Privacy</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>

From a1a69839520d78d07045fd0eb2ac7f38109b138e Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Mon, 8 Aug 2022 13:16:02 +1000
Subject: [PATCH 07/31] adding tags to different resolutions for landing page

---
 app/src/main/res/layout-sw400dp/activity_landing.xml | 3 +++
 app/src/main/res/layout/activity_settings.xml        | 4 ++--
 app/src/main/res/values/strings.xml                  | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-sw400dp/activity_landing.xml b/app/src/main/res/layout-sw400dp/activity_landing.xml
index d1cbc8f2f35..da6a04a8ec9 100644
--- a/app/src/main/res/layout-sw400dp/activity_landing.xml
+++ b/app/src/main/res/layout-sw400dp/activity_landing.xml
@@ -32,6 +32,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
+        android:contentDescription="@string/AccessibilityId_create_session_id"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
@@ -42,6 +43,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/restoreButton"
+        android:contentDescription="@string/AccessibilityId_restore_your_session"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
@@ -51,6 +53,7 @@
 
     <Button
         android:id="@+id/linkButton"
+        android:contentDescription="@string/AccessibilityId_link_device"
         android:layout_width="match_parent"
         android:layout_height="@dimen/onboarding_button_bottom_offset"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 011e7502a7b..cab124c226f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -41,7 +41,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:contentDescription="@string/AccessibilityId_username"
+                    android:contentDescription="@string/AccessibilityId_username_input"
                     android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
@@ -53,7 +53,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:contentDescription="@string/AccessibilityId_username"
+                    android:contentDescription="@string/AccessibilityId_username_text"
                     android:textColor="@color/text"
                     android:textSize="@dimen/very_large_font_size"
                     android:textStyle="bold" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ce68d783e7..70e1abeda6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,6 +53,8 @@
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
 
     <!--Settings Page-->
+    <string name="AccessibilityId_username_input">Username input</string>
+    <string name="AccessibilityId_username_text">Username text</string>
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_privacy">Privacy</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>

From 8ab3841d42c663e192b7282404c3ecb61fb6df3a Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 10 Aug 2022 10:58:14 +1000
Subject: [PATCH 08/31] updating display name in settings to include
 accessibility id

---
 app/src/main/res/layout/activity_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index cab124c226f..4ae83db2b2b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -40,7 +40,7 @@
                     style="@style/SessionEditText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_centerInParent="true"
                     android:contentDescription="@string/AccessibilityId_username_input"
                     android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:paddingTop="12dp"

From 432ebf0e2cbf872eb388e9f9469fdb81e23d6ee5 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 17 Aug 2022 16:06:14 +1000
Subject: [PATCH 09/31] found some stashed changes which i forgot about

---
 app/src/main/res/layout/activity_pn_mode.xml  |  4 ++++
 app/src/main/res/layout/activity_settings.xml |  7 +++++++
 app/src/main/res/values/strings.xml           | 11 +++++++++++
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 091b0de2208..e2338ad5d4f 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -103,7 +103,11 @@
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
+<<<<<<< Updated upstream
             android:contentDescription="@string/AccessibilityId_continue_message_notifications"
+=======
+            android:contentDescription="@string/AccessibilityId_continue"
+>>>>>>> Stashed changes
             android:id="@+id/registerButton"
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 4ae83db2b2b..ea2383918dd 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -38,10 +38,17 @@
                 <EditText
                     android:id="@+id/displayNameEditText"
                     style="@style/SessionEditText"
+<<<<<<< Updated upstream
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:contentDescription="@string/AccessibilityId_username_input"
+=======
+                    android:contentDescription="@string/AccessibilityId_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+>>>>>>> Stashed changes
                     android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70e1abeda6c..82a87e67f7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,10 @@
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
     <string name="AccessibilityId_continue">Continue</string>
+<<<<<<< Updated upstream
     <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
+=======
+>>>>>>> Stashed changes
     <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
     <string name="AccessibilityId_enter_your_recovery_phrase">Enter your recovery phrase</string>
@@ -32,6 +35,7 @@
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
+<<<<<<< Updated upstream
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
     <!--New conversation pop up-->
@@ -62,6 +66,13 @@
     <string name="AccessibilityId_cancel_button">Cancel</string>
 
 
+=======
+    <!--Settings Page-->
+    <string name="AccessibilityId_username">Username</string>
+    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+<!--    Recovery Phrase Dialog-->
+    <string name="AccessibilityId_cancel_button">Cancel</string>
+>>>>>>> Stashed changes
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
 

From e0bd4e9869110423adf19cc72df0a77e9017913e Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 17 Aug 2022 16:08:59 +1000
Subject: [PATCH 10/31] more stashed changes

---
 app/src/main/res/layout/activity_pn_mode.xml  |  4 ++++
 app/src/main/res/layout/activity_settings.xml |  7 +++++++
 app/src/main/res/values/strings.xml           | 11 +++++++++++
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index e2338ad5d4f..5ca7616c7e6 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -103,8 +103,12 @@
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
             android:contentDescription="@string/AccessibilityId_continue_message_notifications"
+=======
+            android:contentDescription="@string/AccessibilityId_continue"
+>>>>>>> Stashed changes
 =======
             android:contentDescription="@string/AccessibilityId_continue"
 >>>>>>> Stashed changes
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ea2383918dd..7c40906c56d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -38,11 +38,18 @@
                 <EditText
                     android:id="@+id/displayNameEditText"
                     style="@style/SessionEditText"
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:contentDescription="@string/AccessibilityId_username_input"
+=======
+                    android:contentDescription="@string/AccessibilityId_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+>>>>>>> Stashed changes
 =======
                     android:contentDescription="@string/AccessibilityId_username"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82a87e67f7a..06f4dba200f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,9 +17,12 @@
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
     <string name="AccessibilityId_continue">Continue</string>
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
 =======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
     <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
@@ -35,6 +38,7 @@
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
@@ -66,6 +70,13 @@
     <string name="AccessibilityId_cancel_button">Cancel</string>
 
 
+=======
+    <!--Settings Page-->
+    <string name="AccessibilityId_username">Username</string>
+    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+<!--    Recovery Phrase Dialog-->
+    <string name="AccessibilityId_cancel_button">Cancel</string>
+>>>>>>> Stashed changes
 =======
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>

From 4378bca5e36ff5228a40e3184a5fc26009451fa8 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 17 Aug 2022 16:50:22 +1000
Subject: [PATCH 11/31] adding tags to layout sw400dp

---
 .../res/layout-sw400dp/activity_display_name.xml    |  2 ++
 .../main/res/layout-sw400dp/activity_pn_mode.xml    |  1 +
 .../activity_recovery_phrase_restore.xml            |  2 ++
 .../main/res/layout-sw400dp/activity_register.xml   |  2 ++
 app/src/main/res/layout-sw400dp/activity_seed.xml   |  2 ++
 .../res/layout-sw400dp/fragment_recovery_phrase.xml |  2 ++
 app/src/main/res/layout/activity_pn_mode.xml        |  4 ++++
 app/src/main/res/layout/activity_settings.xml       |  7 +++++++
 app/src/main/res/values/strings.xml                 | 13 +++++++++++++
 9 files changed, 35 insertions(+)

diff --git a/app/src/main/res/layout-sw400dp/activity_display_name.xml b/app/src/main/res/layout-sw400dp/activity_display_name.xml
index fe00d541a21..28a0205fd8f 100644
--- a/app/src/main/res/layout-sw400dp/activity_display_name.xml
+++ b/app/src/main/res/layout-sw400dp/activity_display_name.xml
@@ -33,6 +33,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/displayNameEditText"
+        android:contentDescription="@string/AccessibilityId_enter_display_name"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
@@ -52,6 +53,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
index 577a2eddc70..e46a93fd35d 100644
--- a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
+++ b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
@@ -101,6 +101,7 @@
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
             android:id="@+id/registerButton"
+            android:contentDescription="@string/AccessibilityId_continue_message_notifications"
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
index b88592a68c3..dd9c2c3c25c 100644
--- a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
@@ -34,6 +34,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase_input"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
@@ -54,6 +55,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/restoreButton"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout-sw400dp/activity_register.xml b/app/src/main/res/layout-sw400dp/activity_register.xml
index 76e4e3e7499..301d9d021d3 100644
--- a/app/src/main/res/layout-sw400dp/activity_register.xml
+++ b/app/src/main/res/layout-sw400dp/activity_register.xml
@@ -33,6 +33,7 @@
 
     <TextView
         style="@style/SessionIDTextView"
+        android:contentDescription="@string/AccessibilityId_session_id"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,6 +50,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout-sw400dp/activity_seed.xml b/app/src/main/res/layout-sw400dp/activity_seed.xml
index 1d984a84d81..af20cf59917 100644
--- a/app/src/main/res/layout-sw400dp/activity_seed.xml
+++ b/app/src/main/res/layout-sw400dp/activity_seed.xml
@@ -39,6 +39,7 @@
     <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
@@ -67,6 +68,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:contentDescription="@string/AccessibilityId_copy_recovery_phrase"
         android:id="@+id/copyButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
index ee4176b83f9..ae78f3003e1 100644
--- a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
@@ -33,6 +33,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase_input"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
@@ -53,6 +54,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/continueButton"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 5ca7616c7e6..9e37e708bc7 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -104,11 +104,15 @@
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
             android:contentDescription="@string/AccessibilityId_continue_message_notifications"
 =======
             android:contentDescription="@string/AccessibilityId_continue"
 >>>>>>> Stashed changes
+=======
+            android:contentDescription="@string/AccessibilityId_continue"
+>>>>>>> Stashed changes
 =======
             android:contentDescription="@string/AccessibilityId_continue"
 >>>>>>> Stashed changes
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 7c40906c56d..2c0680d9a39 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -39,6 +39,7 @@
                     android:id="@+id/displayNameEditText"
                     style="@style/SessionEditText"
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -50,6 +51,12 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
 >>>>>>> Stashed changes
+=======
+                    android:contentDescription="@string/AccessibilityId_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+>>>>>>> Stashed changes
 =======
                     android:contentDescription="@string/AccessibilityId_username"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06f4dba200f..45ad709e155 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,12 +17,17 @@
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
     <string name="AccessibilityId_continue">Continue</string>
+    <!-- Recovery phrase input -->
+    <string name="AccessibilityId_recovery_phrase_input">Recovery phrase input</string>
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
     <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
 =======
 >>>>>>> Stashed changes
 =======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
     <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
@@ -39,6 +44,7 @@
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
@@ -77,6 +83,13 @@
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
 >>>>>>> Stashed changes
+=======
+    <!--Settings Page-->
+    <string name="AccessibilityId_username">Username</string>
+    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+<!--    Recovery Phrase Dialog-->
+    <string name="AccessibilityId_cancel_button">Cancel</string>
+>>>>>>> Stashed changes
 =======
     <!--Settings Page-->
     <string name="AccessibilityId_username">Username</string>

From 72f1d5dd8cefa52abd7f8aed30d2cfee595ec03d Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Tue, 23 Aug 2022 11:14:55 +1000
Subject: [PATCH 12/31] closed group testing, delete/unsend message testing and
 selecting contacts tag

---
 .../layout/activity_create_closed_group.xml   |  2 +
 app/src/main/res/layout/activity_pn_mode.xml  | 13 -----
 app/src/main/res/layout/activity_settings.xml | 29 +----------
 .../fragment_delete_message_bottom_sheet.xml  |  3 ++
 .../main/res/layout/view_deleted_message.xml  |  1 +
 app/src/main/res/layout/view_user.xml         |  1 +
 .../layout/view_visible_message_content.xml   |  1 +
 app/src/main/res/values/strings.xml           | 48 +++++--------------
 8 files changed, 23 insertions(+), 75 deletions(-)

diff --git a/app/src/main/res/layout/activity_create_closed_group.xml b/app/src/main/res/layout/activity_create_closed_group.xml
index 09bfd38b34c..20bdb097e8f 100644
--- a/app/src/main/res/layout/activity_create_closed_group.xml
+++ b/app/src/main/res/layout/activity_create_closed_group.xml
@@ -18,6 +18,7 @@
             <EditText
                 style="@style/SmallSessionEditText"
                 android:id="@+id/nameEditText"
+                android:contentDescription="@string/AccessibilityId_group_name_input"
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
                 android:layout_marginLeft="@dimen/large_spacing"
@@ -58,6 +59,7 @@
         <Button
             style="@style/Widget.Session.Button.Common.ProminentOutline"
             android:id="@+id/createNewPrivateChatButton"
+            android:contentDescription="@string/AccessibilityId_continue_group_creation"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginTop="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 9e37e708bc7..d0edd1d9ab4 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -44,7 +44,6 @@
             android:background="@drawable/pn_option_background">
 
             <TextView
-
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/medium_font_size"
@@ -103,19 +102,7 @@
 
         <Button
             style="@style/Widget.Session.Button.Common.ProminentFilled"
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
             android:contentDescription="@string/AccessibilityId_continue_message_notifications"
-=======
-            android:contentDescription="@string/AccessibilityId_continue"
->>>>>>> Stashed changes
-=======
-            android:contentDescription="@string/AccessibilityId_continue"
->>>>>>> Stashed changes
-=======
-            android:contentDescription="@string/AccessibilityId_continue"
->>>>>>> Stashed changes
             android:id="@+id/registerButton"
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2c0680d9a39..82ddd357aa0 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -38,36 +38,14 @@
                 <EditText
                     android:id="@+id/displayNameEditText"
                     style="@style/SessionEditText"
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:contentDescription="@string/AccessibilityId_username_input"
-=======
                     android:contentDescription="@string/AccessibilityId_username"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
->>>>>>> Stashed changes
-=======
-                    android:contentDescription="@string/AccessibilityId_username"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
->>>>>>> Stashed changes
-=======
-                    android:contentDescription="@string/AccessibilityId_username"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
->>>>>>> Stashed changes
-                    android:hint="@string/activity_settings_display_name_edit_text_hint"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
-                    android:textAlignment="center"
-                    android:visibility="invisible" />
+                    android:visibility="invisible"
+                    android:hint="@string/activity_settings_display_name_edit_text_hint" />
 
                 <TextView
                     android:id="@+id/btnGroupNameDisplay"
@@ -91,7 +69,6 @@
 
             <TextView
                 android:id="@+id/publicKeyTextView"
-                android:contentDescription="@string/AccessibilityId_session_id"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/large_spacing"
@@ -174,7 +151,6 @@
 
             <TextView
                 android:id="@+id/privacyButton"
-                android:contentDescription="@string/AccessibilityId_privacy"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/setting_button_height"
                 android:background="@drawable/setting_button_background"
@@ -239,7 +215,6 @@
 
             <TextView
                 android:id="@+id/seedButton"
-                android:contentDescription="@string/AccessibilityId_show_recovery_phrase"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/setting_button_height"
                 android:background="@drawable/setting_button_background"
diff --git a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
index 031813a7c56..21bf4cd9068 100644
--- a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
@@ -11,18 +11,21 @@
 
     <TextView
         android:id="@+id/deleteForMeTextView"
+        android:contentDescription="@string/AccessibilityId_delete_just_for_me"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_me"
         android:textColor="@color/destructive"/>
 
     <TextView
         android:id="@+id/deleteForEveryoneTextView"
+        android:contentDescription="@string/delete_message_for_everyone"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_everyone"
         android:textColor="@color/destructive"/>
 
     <TextView
         android:id="@+id/cancelTextView"
+        android:contentDescription="@string/AccessibilityId_cancel_deletion"
         style="@style/BottomSheetActionItem"
         android:text="@string/cancel" />
 
diff --git a/app/src/main/res/layout/view_deleted_message.xml b/app/src/main/res/layout/view_deleted_message.xml
index aed76025915..6dc9325a18c 100644
--- a/app/src/main/res/layout/view_deleted_message.xml
+++ b/app/src/main/res/layout/view_deleted_message.xml
@@ -19,6 +19,7 @@
 
     <TextView
         android:id="@+id/deleteTitleTextView"
+        android:contentDescription="@string/AccessibilityId_deleted_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 47e817c368a..04867471749 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -21,6 +21,7 @@
 
         <TextView
             android:id="@+id/nameTextView"
+            android:contentDescription="@string/AccessibilityId_contact"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/view_visible_message_content.xml b/app/src/main/res/layout/view_visible_message_content.xml
index 06b7eb393c7..9def55f656d 100644
--- a/app/src/main/res/layout/view_visible_message_content.xml
+++ b/app/src/main/res/layout/view_visible_message_content.xml
@@ -97,6 +97,7 @@
         android:paddingHorizontal="12dp"
         android:paddingVertical="@dimen/small_spacing"
         android:id="@+id/bodyTextView"
+        android:contentDescription="@string/AccessibilityId_message_body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 45ad709e155..e50e7b098cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,16 +19,7 @@
     <string name="AccessibilityId_continue">Continue</string>
     <!-- Recovery phrase input -->
     <string name="AccessibilityId_recovery_phrase_input">Recovery phrase input</string>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-    <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
+
     <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
     <string name="AccessibilityId_enter_your_recovery_phrase">Enter your recovery phrase</string>
@@ -37,15 +28,14 @@
     <!--Message Notifications Options-->
     <string name="AccessibilityId_fast_mode_notifications_option">Fast mode notifications option</string>
     <string name="AccessibilityId_slow_mode_notifications_option">Slow mode notifications option</string>
+    <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
     <!--Recovery Phrase reminder-->
     <string name="AccessibilityId_recovery_phrase">Recovery Phrase</string>
     <string name="AccessibilityId_copy_recovery_phrase">Copy Recovery Phrase</string>
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
+
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
     <!--New conversation pop up-->
@@ -56,6 +46,10 @@
     <!--New Session -->
     <string name="AccessibilityId_session_id_input">Session id input box</string>
     <string name="AccessibilityId_next">Next</string>
+    <!--  New group -->
+    <string name="AccessibilityId_group_name_input">Group name input</string>
+    <string name="AccessibilityId_continue_group_creation">Continue group creation</string>
+    <string name="AccessibilityId_contact">Contact</string>
     <!--Conversation screen -->
     <string name="AccessibilityId_message_input">Message input box</string>
     <string name="AccessibilityId_microphone_button">Microphone button</string>
@@ -65,7 +59,13 @@
     <string name="AccessibilityId_message_sent_status_tick">Message sent status tick</string>
     <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
+    <string name="AccessibilityId_message_body">Message Body</string>
+    <string name="AccessibilityId_deleted_message">Deleted message</string>
 
+    <!-- Delete message modal-->
+    <string name="AccessibilityId_delete_just_for_me">Delete just for me</string>
+    <string name="AccessibilityId_delete_for_everyone">Delete for everyone</string>
+    <string name="AccessibilityId_cancel_deletion">Cancel deletion</string>
     <!--Settings Page-->
     <string name="AccessibilityId_username_input">Username input</string>
     <string name="AccessibilityId_username_text">Username text</string>
@@ -75,28 +75,6 @@
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
 
-
-=======
-    <!--Settings Page-->
-    <string name="AccessibilityId_username">Username</string>
-    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
-<!--    Recovery Phrase Dialog-->
-    <string name="AccessibilityId_cancel_button">Cancel</string>
->>>>>>> Stashed changes
-=======
-    <!--Settings Page-->
-    <string name="AccessibilityId_username">Username</string>
-    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
-<!--    Recovery Phrase Dialog-->
-    <string name="AccessibilityId_cancel_button">Cancel</string>
->>>>>>> Stashed changes
-=======
-    <!--Settings Page-->
-    <string name="AccessibilityId_username">Username</string>
-    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
-<!--    Recovery Phrase Dialog-->
-    <string name="AccessibilityId_cancel_button">Cancel</string>
->>>>>>> Stashed changes
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
 

From ad7ea560373f929f0e858dec1e6b6c074434c3f5 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Thu, 25 Aug 2022 17:36:54 +1000
Subject: [PATCH 13/31] adding tags for message body, selecting contacts for
 group creation, deleted message config, unsend message modal, and trash icon

---
 app/src/main/res/layout/view_conversation.xml | 1 +
 app/src/main/res/layout/view_user.xml         | 1 +
 app/src/main/res/values/strings.xml           | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index f523ce2d8d7..fcc0a12766d 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -49,6 +49,7 @@
 
                     <TextView
                         android:id="@+id/conversationViewDisplayNameTextView"
+                        android:contentDescription="@string/AccessibilityId_conversation_list_item"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:drawablePadding="4dp"
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 04867471749..831d171666d 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -35,6 +35,7 @@
 
         <ImageView
             android:id="@+id/actionIndicatorImageView"
+            android:contentDescription="@string/AccessibilityId_select_contact"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="@dimen/medium_spacing"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e50e7b098cc..49ce6d16fbc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
     <!--Home Page-->
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
+    <string name="AccessibilityId_conversation_list_item">Conversation list item</string>
 
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
@@ -50,6 +51,7 @@
     <string name="AccessibilityId_group_name_input">Group name input</string>
     <string name="AccessibilityId_continue_group_creation">Continue group creation</string>
     <string name="AccessibilityId_contact">Contact</string>
+    <string name="AccessibilityId_select_contact">Select contact</string>
     <!--Conversation screen -->
     <string name="AccessibilityId_message_input">Message input box</string>
     <string name="AccessibilityId_microphone_button">Microphone button</string>

From bfc8ba399de6b8bc59adb60fd7dc4ecae0884f35 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 31 Aug 2022 13:58:15 +1000
Subject: [PATCH 14/31] added tags for disappearing messages menu option, time
 selector, clock icon, confirm of change (ok)and control message

---
 app/src/main/res/layout/expiration_dialog.xml       |  1 +
 app/src/main/res/layout/view_control_message.xml    |  1 +
 .../res/menu/menu_conversation_expiration_off.xml   |  1 +
 .../res/menu/menu_conversation_expiration_on.xml    |  1 +
 app/src/main/res/values/strings.xml                 | 13 +++++++++++++
 5 files changed, 17 insertions(+)

diff --git a/app/src/main/res/layout/expiration_dialog.xml b/app/src/main/res/layout/expiration_dialog.xml
index 66fafb41361..a79f974f60f 100644
--- a/app/src/main/res/layout/expiration_dialog.xml
+++ b/app/src/main/res/layout/expiration_dialog.xml
@@ -11,6 +11,7 @@
 
     <cn.carbswang.android.numberpickerview.library.NumberPickerView
         android:id="@+id/expiration_number_picker"
+        android:contentDescription="@string/AccessibilityId_disappearing_messages_time_picker"
         android:layout_alignParentTop="true"
         app:npv_WrapSelectorWheel="false"
         app:npv_DividerColor="#cbc8ea"
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index 1198fdf93ee..4f67d3bf843 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -31,6 +31,7 @@
 
     <TextView
         android:id="@+id/textView"
+        android:contentDescription="@string/AccessibilityId_control_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/app/src/main/res/menu/menu_conversation_expiration_off.xml b/app/src/main/res/menu/menu_conversation_expiration_off.xml
index 8e062dc6443..939220009c5 100644
--- a/app/src/main/res/menu/menu_conversation_expiration_off.xml
+++ b/app/src/main/res/menu/menu_conversation_expiration_off.xml
@@ -4,6 +4,7 @@
 
     <item
         android:title="@string/conversation_expiring_off__disappearing_messages"
+        android:contentDescription="@string/AccessibilityId_disappearing_messages"
         android:id="@+id/menu_expiring_messages_off"
         android:icon="@drawable/ic_baseline_timer_off_24" />
 
diff --git a/app/src/main/res/menu/menu_conversation_expiration_on.xml b/app/src/main/res/menu/menu_conversation_expiration_on.xml
index 2abb49cef60..88775cf71de 100644
--- a/app/src/main/res/menu/menu_conversation_expiration_on.xml
+++ b/app/src/main/res/menu/menu_conversation_expiration_on.xml
@@ -5,6 +5,7 @@
 
     <item
         android:id="@+id/menu_expiring_messages"
+        android:contentDescription="@string/AccessibilityId_disappearing_messages_timer"
         app:actionLayout="@layout/expiration_timer_menu"
         app:showAsAction="always"
         android:title="@string/menu_conversation_expiring_on__messages_expiring" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49ce6d16fbc..fb027586362 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,6 +44,19 @@
     <string name="AccessibilityId_new_direct_message">New direct message</string>
     <string name="AccessibilityId_create_group">Create group</string>
     <string name="AccessibilityId_join_community">Join community</string>
+    <!--  Conversation options (three dots menu)-->
+    <string name="AccessibilityId_all_media">All media</string>
+    <string name="AccessibilityId_search">Search</string>
+    <string name="AccessibilityId_add_to_home_screen">Add to home screen</string>
+    <string name="AccessibilityId_disappearing_messages">Disappearing messages</string>
+    <string name="AccessibilityId_block">Block</string>
+    <string name="AccessibilityId_mute_notifications">Mute notifications</string>
+    <!--  Conversation icons -->
+    <string name="AccessibilityId_call_button">Call button</string>
+    <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
+    <string name="AccessibilityId_disappearing_messages_time_picker">Time selector</string>
+<!--    Control messages -->
+    <string name="AccessibilityId_control_message">Control message</string>
     <!--New Session -->
     <string name="AccessibilityId_session_id_input">Session id input box</string>
     <string name="AccessibilityId_next">Next</string>

From 19396037125de70f11ab199bcd1d7d6dbe6f1c26 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Fri, 2 Sep 2022 16:12:57 +1000
Subject: [PATCH 15/31] add test for block user

---
 app/src/main/res/menu/menu_conversation_block.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/menu/menu_conversation_block.xml b/app/src/main/res/menu/menu_conversation_block.xml
index 82bb05d500f..4c499eb8454 100644
--- a/app/src/main/res/menu/menu_conversation_block.xml
+++ b/app/src/main/res/menu/menu_conversation_block.xml
@@ -4,6 +4,7 @@
 
     <item
         android:title="@string/recipient_preferences__block"
+        android:contentDescription="@string/AccessibilityId_block"
         android:id="@+id/menu_block" />
 
 </menu>
\ No newline at end of file

From dfd7bad93ddbfbbfceca405ff2678345accdb828 Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Fri, 9 Sep 2022 11:22:12 +1000
Subject: [PATCH 16/31] docs: Adding in accessibility ID's for Appium testing

---
 app/src/main/res/layout/activity_conversation_v2.xml     | 8 ++++++--
 app/src/main/res/layout/dialog_blocked.xml               | 1 +
 app/src/main/res/menu/menu_conversation_call.xml         | 1 +
 app/src/main/res/menu/menu_conversation_closed_group.xml | 2 ++
 .../res/menu/menu_conversation_notification_settings.xml | 1 +
 app/src/main/res/values/strings.xml                      | 9 +++++++++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 84cbeeaeae2..3f17e82cbb5 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -149,21 +149,23 @@
 
     <RelativeLayout
         android:id="@+id/blockedBanner"
+        android:contentDescription="@string/AccessibilityId_blocked_banner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/destructive"
         android:layout_alignParentTop="true"
+        android:background="@color/destructive"
         android:visibility="gone"
         tools:visibility="visible">
 
         <TextView
             android:id="@+id/blockedBannerTextView"
+            android:contentDescription="@string/AccessibilityId_blocked_banner_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_margin="@dimen/medium_spacing"
-            android:textSize="@dimen/small_font_size"
             android:textColor="@color/white"
+            android:textSize="@dimen/small_font_size"
             android:textStyle="bold"
             tools:text="Elon is blocked. Unblock them?" />
 
@@ -199,6 +201,7 @@
             <Button
                 android:id="@+id/acceptMessageRequestButton"
                 style="@style/Widget.Session.Button.Common.ProminentOutline"
+                android:contentDescription="@string/AccessibilityId_accept_message_request_button"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_weight="1"
@@ -207,6 +210,7 @@
             <Button
                 android:id="@+id/declineMessageRequestButton"
                 style="@style/Widget.Session.Button.Common.DestructiveOutline"
+                android:contentDescription="@string/AccessibilityId_decline_message_request_button"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginStart="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/dialog_blocked.xml b/app/src/main/res/layout/dialog_blocked.xml
index 38b13c3da57..94726b6a94b 100644
--- a/app/src/main/res/layout/dialog_blocked.xml
+++ b/app/src/main/res/layout/dialog_blocked.xml
@@ -46,6 +46,7 @@
         <Button
             style="@style/Widget.Session.Button.Dialog.Unimportant"
             android:id="@+id/unblockButton"
+            android:contentDescription="@string/AccessibilityId_block_confirm"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
             android:layout_weight="1"
diff --git a/app/src/main/res/menu/menu_conversation_call.xml b/app/src/main/res/menu/menu_conversation_call.xml
index 8ebfeb8c8df..1fa6955af7a 100644
--- a/app/src/main/res/menu/menu_conversation_call.xml
+++ b/app/src/main/res/menu/menu_conversation_call.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:title="@string/conversation_context__menu_call"
+        android:contentDescription="@string/AccessibilityId_call_button"
         android:icon="@drawable/ic_baseline_call_24"
         app:showAsAction="always"
         android:id="@+id/menu_call"/>
diff --git a/app/src/main/res/menu/menu_conversation_closed_group.xml b/app/src/main/res/menu/menu_conversation_closed_group.xml
index 7ab02e07d98..979d2afbf8c 100644
--- a/app/src/main/res/menu/menu_conversation_closed_group.xml
+++ b/app/src/main/res/menu/menu_conversation_closed_group.xml
@@ -5,11 +5,13 @@
 
     <item
         android:id="@+id/menu_edit_group"
+        android:contentDescription="@string/AccessibilityId_edit_group"
         android:title="@string/conversation__menu_edit_group"
         app:showAsAction="collapseActionView" />
 
     <item
         android:id="@+id/menu_leave_group"
+        android:contentDescription="@string/AccessibilityId_leave_group"
         android:title="@string/conversation__menu_leave_group"
         app:showAsAction="collapseActionView"/>
 
diff --git a/app/src/main/res/menu/menu_conversation_notification_settings.xml b/app/src/main/res/menu/menu_conversation_notification_settings.xml
index 2275db01f2a..af5ac222d78 100644
--- a/app/src/main/res/menu/menu_conversation_notification_settings.xml
+++ b/app/src/main/res/menu/menu_conversation_notification_settings.xml
@@ -2,5 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:title="@string/RecipientPreferenceActivity_notification_settings"
+
         android:id="@+id/menu_notification_settings"/>
 </menu>
\ 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 fb027586362..22934c881bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,13 +50,22 @@
     <string name="AccessibilityId_add_to_home_screen">Add to home screen</string>
     <string name="AccessibilityId_disappearing_messages">Disappearing messages</string>
     <string name="AccessibilityId_block">Block</string>
+    <string name="AccessibilityId_block_confirm">Confirm block</string>
     <string name="AccessibilityId_mute_notifications">Mute notifications</string>
+    <!--  Conversation options for closed group-->
+    <string name="AccessibilityId_edit_group">Edit group</string>
+    <string name="AccessibilityId_leave_group">Leave group</string>
     <!--  Conversation icons -->
     <string name="AccessibilityId_call_button">Call button</string>
     <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
     <string name="AccessibilityId_disappearing_messages_time_picker">Time selector</string>
+    <string name="AccessibilityId_accept_message_request_button">Accept message request</string>
+    <string name="AccessibilityId_decline_message_request_button">Decline message request</string>
+    <string name="AccessibilityId_block_message_request_button">Block message request</string>
 <!--    Control messages -->
     <string name="AccessibilityId_control_message">Control message</string>
+    <string name="AccessibilityId_blocked_banner">Blocked banner</string>
+    <string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
     <!--New Session -->
     <string name="AccessibilityId_session_id_input">Session id input box</string>
     <string name="AccessibilityId_next">Next</string>

From 843fffb180d682611fdfb68b798af5d90f91320c Mon Sep 17 00:00:00 2001
From: Emily <emily@oxen.io>
Date: Wed, 14 Sep 2022 13:49:31 +1000
Subject: [PATCH 17/31] accessibility tags for conversation options, profile
 picture/settings and block options

---
 .../securesms/components/menu/ActionItem.kt       |  5 +++--
 .../securesms/components/menu/ContextMenuList.kt  |  1 +
 .../v2/ConversationReactionOverlay.java           | 15 ++++++++++++---
 app/src/main/res/layout/activity_home.xml         |  2 +-
 app/src/main/res/layout/view_profile_picture.xml  |  1 +
 app/src/main/res/values/strings.xml               |  2 ++
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
index 358a9d326b3..d0b101a9f16 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
@@ -5,8 +5,9 @@ import androidx.annotation.AttrRes
 /**
  * Represents an action to be rendered
  */
-data class ActionItem(
+data class ActionItem @JvmOverloads constructor(
   @AttrRes val iconRes: Int,
   val title: CharSequence,
-  val action: Runnable
+  val action: Runnable,
+  val contentDescription: String? = null
 )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
index 65fb1ddbbc9..c86b40dfa5e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
@@ -77,6 +77,7 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) {
         context.theme.resolveAttribute(model.item.iconRes, typedValue, true)
         icon.setImageDrawable(ContextCompat.getDrawable(context, typedValue.resourceId))
       }
+      itemView.contentDescription = model.item.contentDescription
       title.text = model.item.title
       itemView.setOnClickListener {
         model.item.action.run()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
index 52d4e155f23..a3160cee69d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
@@ -657,7 +657,10 @@ public void setOnHideListener(@Nullable OnHideListener onHideListener) {
     items.add(new ActionItem(R.attr.menu_select_icon, getContext().getResources().getString(R.string.conversation_context__menu_select), () -> handleActionItemClicked(Action.SELECT)));
     // Reply
     if (!message.isPending() && !message.isFailed()) {
-      items.add(new ActionItem(R.attr.menu_reply_icon, getContext().getResources().getString(R.string.conversation_context__menu_reply), () -> handleActionItemClicked(Action.REPLY)));
+      items.add(
+              new ActionItem(R.attr.menu_reply_icon, getContext().getResources().getString(R.string.conversation_context__menu_reply), () -> handleActionItemClicked(Action.REPLY),
+                     getContext().getResources().getString(R.string.AccessibilityId_reply_message))
+      );
     }
     // Copy message text
     if (!containsControlMessage && hasText) {
@@ -665,11 +668,17 @@ public void setOnHideListener(@Nullable OnHideListener onHideListener) {
     }
     // Copy Session ID
     if (recipient.isGroupRecipient() && !recipient.isOpenGroupRecipient() && !message.getRecipient().getAddress().toString().equals(userPublicKey)) {
-      items.add(new ActionItem(R.attr.menu_copy_icon, getContext().getResources().getString(R.string.activity_conversation_menu_copy_session_id), () -> handleActionItemClicked(Action.COPY_SESSION_ID)));
+      items.add(new ActionItem(
+              R.attr.menu_copy_icon, getContext().getResources().getString(R.string.activity_conversation_menu_copy_session_id), () -> handleActionItemClicked(Action.COPY_SESSION_ID))
+      );
     }
     // Delete message
     if (ConversationMenuItemHelper.userCanDeleteSelectedItems(getContext(), message, openGroup, userPublicKey)) {
-      items.add(new ActionItem(R.attr.menu_trash_icon, getContext().getResources().getString(R.string.delete), () -> handleActionItemClicked(Action.DELETE)));
+      items.add(new ActionItem(R.attr.menu_trash_icon, getContext().getResources().getString(R.string.delete),
+              () -> handleActionItemClicked(Action.DELETE),
+              getContext().getResources().getString(R.string.AccessibilityId_delete_message)
+              )
+      );
     }
     // Ban user
     if (ConversationMenuItemHelper.userCanBanSelectedUsers(getContext(), message, openGroup, userPublicKey)) {
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 0f71e381881..e4fb5ab7db8 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -34,7 +34,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="9dp"
-                    android:contentDescription="@string/AccessibilityId_profile_picture" />
+                    />
 
                 <org.thoughtcrime.securesms.home.PathStatusView
                     android:id="@+id/pathStatusView"
diff --git a/app/src/main/res/layout/view_profile_picture.xml b/app/src/main/res/layout/view_profile_picture.xml
index 876dfe8eb8a..66ac65f55a4 100644
--- a/app/src/main/res/layout/view_profile_picture.xml
+++ b/app/src/main/res/layout/view_profile_picture.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ProfilePictureView
+    android:contentDescription="@string/AccessibilityId_profile_picture"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7b9dddfb90..024a57c61c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,8 @@
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
     <string name="AccessibilityId_message_body">Message Body</string>
     <string name="AccessibilityId_deleted_message">Deleted message</string>
+    <string name="AccessibilityId_delete_message">Delete message</string>
+    <string name="AccessibilityId_reply_message">Reply</string>
 
     <!-- Delete message modal-->
     <string name="AccessibilityId_delete_just_for_me">Delete just for me</string>

From c0dd64a80805817452c1792221ed20e187b50fcb Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Wed, 5 Oct 2022 16:29:14 +1100
Subject: [PATCH 18/31] Add content descriptions for better accessibility

---
 app/src/main/res/layout/activity_edit_closed_group.xml | 7 +++++--
 app/src/main/res/layout/activity_settings.xml          | 3 ++-
 app/src/main/res/layout/view_seed_reminder.xml         | 1 +
 app/src/main/res/menu/menu_edit_closed_group.xml       | 5 +++--
 app/src/main/res/values/strings.xml                    | 7 +++++++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml
index f95cc2d1848..7ddd794db55 100644
--- a/app/src/main/res/layout/activity_edit_closed_group.xml
+++ b/app/src/main/res/layout/activity_edit_closed_group.xml
@@ -32,6 +32,7 @@
                     android:id="@+id/btnCancelGroupNameEdit"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
+                    android:contentDescription="@string/AccessibilityId_cancel_name_change"
                     android:src="@drawable/ic_baseline_clear_24"/>
 
                 <EditText
@@ -55,6 +56,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
+                    android:contentDescription="@string/AccessibilityId_accept_name_change"
                     android:src="@drawable/ic_baseline_done_24"/>
 
             </LinearLayout>
@@ -72,6 +74,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:contentDescription="@string/AccessibilityId_group_name"
                     android:textColor="@color/text"
                     android:textSize="@dimen/very_large_font_size"
                     android:textStyle="bold"
@@ -113,10 +116,10 @@
                 style="@style/Widget.Session.Button.Common.ProminentOutline"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/small_button_height"
-                android:layout_marginTop="@dimen/small_spacing"
+                android:layout_marginVertical="@dimen/small_spacing"
                 android:layout_marginEnd="@dimen/medium_spacing"
                 android:layout_marginStart="@dimen/small_spacing"
-                android:layout_marginBottom="@dimen/small_spacing"
+                android:contentDescription="@string/AccessibilityId_add_members"
                 android:paddingStart="@dimen/medium_spacing"
                 android:paddingEnd="@dimen/medium_spacing"
                 android:text="@string/activity_edit_closed_group_add_members" />
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ca310b265ff..314ce2957c6 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -24,7 +24,8 @@
                 android:id="@+id/profilePictureView"
                 android:layout_width="@dimen/large_profile_picture_size"
                 android:layout_height="@dimen/large_profile_picture_size"
-                android:layout_marginTop="@dimen/medium_spacing" />
+                android:layout_marginTop="@dimen/medium_spacing"
+                android:contentDescription="@string/AccessibilityId_user_settings" />
 
             <RelativeLayout
                 android:id="@+id/ctnGroupNameSection"
diff --git a/app/src/main/res/layout/view_seed_reminder.xml b/app/src/main/res/layout/view_seed_reminder.xml
index db02ec9b7a4..6eb6eb86116 100644
--- a/app/src/main/res/layout/view_seed_reminder.xml
+++ b/app/src/main/res/layout/view_seed_reminder.xml
@@ -20,6 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:contentDescription="@string/AccessibilityId_recovery_phrase_reminder"
         android:gravity="center_vertical"
         android:padding="@dimen/medium_spacing"
         android:orientation="horizontal">
diff --git a/app/src/main/res/menu/menu_edit_closed_group.xml b/app/src/main/res/menu/menu_edit_closed_group.xml
index 0c6b915d05c..bcf5c784ec5 100644
--- a/app/src/main/res/menu/menu_edit_closed_group.xml
+++ b/app/src/main/res/menu/menu_edit_closed_group.xml
@@ -4,8 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="@string/menu_apply_button"
         android:id="@+id/action_apply"
-        app:showAsAction="always|withText"/>
+        android:title="@string/menu_apply_button"
+        android:contentDescription="@string/AccessibilityId_apply_changes"
+        app:showAsAction="always|withText" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 024a57c61c2..a4fc2a46343 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="AccessibilityId_link_device">Link Device</string>
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
+    <string name="AccessibilityId_recovery_phrase_reminder">Recovery phrase reminder</string>
     <string name="AccessibilityId_continue">Continue</string>
     <!-- Recovery phrase input -->
     <string name="AccessibilityId_recovery_phrase_input">Recovery phrase input</string>
@@ -55,6 +56,11 @@
     <!--  Conversation options for closed group-->
     <string name="AccessibilityId_edit_group">Edit group</string>
     <string name="AccessibilityId_leave_group">Leave group</string>
+    <string name="AccessibilityId_group_name">Group name</string>
+    <string name="AccessibilityId_accept_name_change">Accept name change</string>
+    <string name="AccessibilityId_cancel_name_change">Cancel name change</string>
+    <string name="AccessibilityId_apply_changes">Apply changes</string>
+    <string name="AccessibilityId_add_members">Add members</string>
     <!--  Conversation icons -->
     <string name="AccessibilityId_call_button">Call button</string>
     <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
@@ -95,6 +101,7 @@
     <!--Settings Page-->
     <string name="AccessibilityId_username_input">Username input</string>
     <string name="AccessibilityId_username_text">Username text</string>
+    <string name="AccessibilityId_user_settings">User settings</string>
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_privacy">Privacy</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>

From 860d47ee071c763a4c31c91276ee7af80a1bad07 Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Fri, 7 Oct 2022 09:36:45 +1100
Subject: [PATCH 19/31] Add more content descriptions

---
 .../conversation/v2/ConversationActivityV2.kt |  4 +++-
 .../v2/ConversationReactionOverlay.java       |  7 ++++--
 .../conversation/v2/input_bar/InputBar.kt     |  6 ++---
 .../mentions/MentionCandidatesView.kt         |  5 +++-
 .../v2/menus/ConversationMenuHelper.kt        |  8 +++++--
 .../securesms/permissions/Permissions.java    |  7 ++++--
 .../res/layout-sw400dp/activity_landing.xml   |  2 +-
 .../res/layout/activity_conversation_v2.xml   | 11 ++++++---
 .../activity_conversation_v2_action_bar.xml   |  1 +
 app/src/main/res/layout/activity_landing.xml  |  5 ++--
 app/src/main/res/layout/dialog_download.xml   |  2 ++
 .../fragment_conversation_bottom_sheet.xml    |  5 ++++
 .../res/layout/fragment_recovery_phrase.xml   |  8 +++----
 .../fragment_user_details_bottom_sheet.xml    | 15 +++++++-----
 .../res/layout/view_untrusted_attachment.xml  |  3 ++-
 app/src/main/res/layout/view_user.xml         |  1 +
 app/src/main/res/menu/menu_conversation.xml   |  4 +++-
 .../menu_conversation_copy_session_id.xml     |  3 ++-
 ...enu_conversation_notification_settings.xml |  4 ++--
 .../res/menu/menu_conversation_unmuted.xml    |  3 ++-
 app/src/main/res/menu/menu_done.xml           |  1 +
 app/src/main/res/values/strings.xml           | 23 ++++++++++++++++++-
 22 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 467be2c0b6b..9e82dac50ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -771,7 +771,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         val recipient = viewModel.recipient ?: return
         if (!isShowingMentionCandidatesView) {
             additionalContentContainer.removeAllViews()
-            val view = MentionCandidatesView(this)
+            val view = MentionCandidatesView(this).apply {
+                contentDescription = context.getString(R.string.AccessibilityId_mentions_list)
+            }
             view.glide = glide
             view.onCandidateSelected = { handleMentionSelected(it) }
             additionalContentContainer.addView(view)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
index 19f24ce4997..b3c151690f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
@@ -660,7 +660,8 @@ public void setOnHideListener(@Nullable OnHideListener onHideListener) {
 
     String userPublicKey = TextSecurePreferences.getLocalNumber(getContext());
     // Select message
-    items.add(new ActionItem(R.attr.menu_select_icon, getContext().getResources().getString(R.string.conversation_context__menu_select), () -> handleActionItemClicked(Action.SELECT)));
+    items.add(new ActionItem(R.attr.menu_select_icon, getContext().getResources().getString(R.string.conversation_context__menu_select), () -> handleActionItemClicked(Action.SELECT),
+            getContext().getResources().getString(R.string.AccessibilityId_select)));
     // Reply
     if (!message.isPending() && !message.isFailed()) {
       items.add(
@@ -704,7 +705,9 @@ R.attr.menu_copy_icon, getContext().getResources().getString(R.string.activity_c
     }
     // Save media
     if (message.isMms() && ((MediaMmsMessageRecord)message).containsMediaSlide()) {
-      items.add(new ActionItem(R.attr.menu_save_icon, getContext().getResources().getString(R.string.conversation_context_image__save_attachment), () -> handleActionItemClicked(Action.DOWNLOAD)));
+      items.add(new ActionItem(R.attr.menu_save_icon, getContext().getResources().getString(R.string.conversation_context_image__save_attachment), () -> handleActionItemClicked(Action.DOWNLOAD),
+              getContext().getResources().getString(R.string.AccessibilityId_save_attachment))
+      );
     }
 
     backgroundView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index c213364fc69..508c025298f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -53,9 +53,9 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
     val attachmentButtonsContainerHeight: Int
         get() = binding.attachmentsButtonContainer.height
 
-    private val attachmentsButton by lazy { InputBarButton(context, R.drawable.ic_plus_24).apply {contentDescription = context.getString(R.string.AccessibilityId_attachments_button)} }
-    private val microphoneButton by lazy { InputBarButton(context, R.drawable.ic_microphone).apply {contentDescription = context.getString(R.string.AccessibilityId_microphone_button)} }
-    private val sendButton by lazy { InputBarButton(context, R.drawable.ic_arrow_up, true).apply {contentDescription = context.getString(R.string.AccessibilityId_send_message_button)} }
+    private val attachmentsButton by lazy { InputBarButton(context, R.drawable.ic_plus_24).apply { contentDescription = context.getString(R.string.AccessibilityId_attachments_button)} }
+    private val microphoneButton by lazy { InputBarButton(context, R.drawable.ic_microphone).apply { contentDescription = context.getString(R.string.AccessibilityId_microphone_button)} }
+    private val sendButton by lazy { InputBarButton(context, R.drawable.ic_arrow_up, true).apply { contentDescription = context.getString(R.string.AccessibilityId_send_message_button)} }
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
index 401ccaa3c26..e62f7f8f851 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ListView
 import dagger.hilt.android.AndroidEntryPoint
+import network.loki.messenger.R
 import org.session.libsession.messaging.mentions.Mention
 import org.thoughtcrime.securesms.database.LokiThreadDatabase
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -41,7 +42,9 @@ class MentionCandidatesView(context: Context, attrs: AttributeSet?, defStyleAttr
         override fun getItem(position: Int): Mention { return candidates[position] }
 
         override fun getView(position: Int, cellToBeReused: View?, parent: ViewGroup): View {
-            val cell = cellToBeReused as MentionCandidateView? ?: MentionCandidateView(context)
+            val cell = cellToBeReused as MentionCandidateView? ?: MentionCandidateView(context).apply {
+                contentDescription = context.getString(R.string.AccessibilityId_contact)
+            }
             val mentionCandidate = getItem(position)
             cell.glide = glide
             cell.candidate = mentionCandidate
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index c5f12650f7a..dbc5fe24a87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2.menus
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.PorterDuff
@@ -179,7 +180,7 @@ object ConversationMenuHelper {
     private fun call(context: Context, thread: Recipient) {
 
         if (!TextSecurePreferences.isCallNotificationsEnabled(context)) {
-            AlertDialog.Builder(context)
+            val dialog = AlertDialog.Builder(context)
                 .setTitle(R.string.ConversationActivity_call_title)
                 .setMessage(R.string.ConversationActivity_call_prompt)
                 .setPositiveButton(R.string.activity_settings_title) { _, _ ->
@@ -188,7 +189,10 @@ object ConversationMenuHelper {
                 }
                 .setNeutralButton(R.string.cancel) { d, _ ->
                     d.dismiss()
-                }.show()
+                }.create()
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).contentDescription = context.getString(R.string.AccessibilityId_settings)
+            dialog.getButton(DialogInterface.BUTTON_NEGATIVE).contentDescription = context.getString(R.string.AccessibilityId_cancel_button)
+            dialog.show()
             return
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index f2adf32cd37..ba33f652c79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -353,12 +354,14 @@ public void run() {
       Context context = this.context.get();
 
       if (context != null) {
-        new AlertDialog.Builder(context)
+        AlertDialog alertDialog = new AlertDialog.Builder(context)
             .setTitle(R.string.Permissions_permission_required)
             .setMessage(message)
             .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
             .setNegativeButton(android.R.string.cancel, null)
-            .show();
+            .create();
+        alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setContentDescription(context.getString(R.string.AccessibilityId_continue));
+        alertDialog.show();
       }
     }
   }
diff --git a/app/src/main/res/layout-sw400dp/activity_landing.xml b/app/src/main/res/layout-sw400dp/activity_landing.xml
index da6a04a8ec9..1e89cd967dd 100644
--- a/app/src/main/res/layout-sw400dp/activity_landing.xml
+++ b/app/src/main/res/layout-sw400dp/activity_landing.xml
@@ -53,7 +53,7 @@
 
     <Button
         android:id="@+id/linkButton"
-        android:contentDescription="@string/AccessibilityId_link_device"
+        android:contentDescription="@string/AccessibilityId_link_a_device"
         android:layout_width="match_parent"
         android:layout_height="@dimen/onboarding_button_bottom_offset"
         android:layout_marginLeft="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 334480af623..740821a5012 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -84,6 +84,7 @@
             android:id="@+id/gifButtonContainer"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
+            android:contentDescription="@string/AccessibilityId_gif_button"
             android:alpha="0" />
 
         <RelativeLayout
@@ -91,6 +92,7 @@
             android:layout_marginTop="8dp"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
+            android:contentDescription="@string/AccessibilityId_documents_folder"
             android:alpha="0" />
 
         <RelativeLayout
@@ -98,6 +100,7 @@
             android:layout_marginTop="8dp"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
+            android:contentDescription="@string/AccessibilityId_images_folder"
             android:alpha="0" />
 
         <RelativeLayout
@@ -105,6 +108,7 @@
             android:layout_marginTop="8dp"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
+            android:contentDescription="@string/AccessibilityId_select_camera_button"
             android:alpha="0" />
 
     </LinearLayout>
@@ -205,14 +209,15 @@
 
         <TextView
             android:id="@+id/messageRequestBlock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:contentDescription="@string/AccessibilityId_block_message_request_button"
             android:textColor="@color/destructive"
             android:paddingHorizontal="@dimen/massive_spacing"
             android:paddingVertical="@dimen/small_spacing"
             android:textSize="@dimen/text_size"
-            android:text="@string/activity_conversation_block_user"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:text="@string/activity_conversation_block_user"/>
 
         <TextView
             android:id="@+id/sendAcceptsTextView"
diff --git a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
index f28a0a07489..ba0921f787a 100644
--- a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
+++ b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
@@ -23,6 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
+            android:contentDescription="@string/AccessibilityId_username"
             tools:text="@tools:sample/full_names"
             android:textColor="@color/text"
             android:textStyle="bold"
diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
index 9d3cd3fae39..3b93a670891 100644
--- a/app/src/main/res/layout/activity_landing.xml
+++ b/app/src/main/res/layout/activity_landing.xml
@@ -52,12 +52,11 @@
         android:text="@string/activity_landing_restore_button_title" />
 
     <Button
-        android:contentDescription="@string/AccessibilityId_link_device"
+        android:contentDescription="@string/AccessibilityId_link_a_device"
         android:id="@+id/linkButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/onboarding_button_bottom_offset"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginHorizontal="@dimen/massive_spacing"
         android:gravity="center"
         android:background="@color/transparent"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index f4279bf5201..1640199ad6b 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -41,6 +41,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
             android:layout_weight="1"
+            android:contentDescription="@string/AccessibilityId_dont_download_media"
             android:text="@string/cancel" />
 
         <Button
@@ -50,6 +51,7 @@
             android:layout_height="@dimen/small_button_height"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/medium_spacing"
+            android:contentDescription="@string/AccessibilityId_download_media"
             android:text="@string/dialog_download_button_title" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml b/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
index 81f62c4a737..e65abc3ffaf 100644
--- a/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
@@ -12,6 +12,7 @@
     <TextView
         android:id="@+id/detailsTextView"
         style="@style/BottomSheetActionItem"
+        android:contentDescription="@string/AccessibilityId_details"
         android:drawableStart="@drawable/ic_info_outline_white_24dp"
         android:drawableTint="?attr/colorControlNormal"
         android:text="@string/details" />
@@ -19,6 +20,7 @@
     <TextView
         android:id="@+id/pinTextView"
         style="@style/BottomSheetActionItem"
+        android:contentDescription="@string/AccessibilityId_pin"
         android:drawableStart="?attr/menu_pin_icon"
         android:text="@string/conversation_pin"
         android:visibility="gone"
@@ -35,6 +37,7 @@
     <TextView
         android:id="@+id/blockTextView"
         style="@style/BottomSheetActionItem"
+        android:contentDescription="@string/AccessibilityId_block"
         android:drawableStart="?attr/menu_block_icon"
         android:text="@string/RecipientPreferenceActivity_block"
         android:visibility="gone"
@@ -51,6 +54,7 @@
     <TextView
         android:id="@+id/muteNotificationsTextView"
         style="@style/BottomSheetActionItem"
+        android:contentDescription="@string/AccessibilityId_mute_notifications"
         android:drawableStart="@drawable/ic_outline_notifications_off_24"
         android:text="@string/MuteDialog_mute_notifications"
         tools:visibility="visible"
@@ -86,6 +90,7 @@
     <TextView
         android:id="@+id/deleteTextView"
         style="@style/BottomSheetActionItem"
+        android:contentDescription="@string/AccessibilityId_delete"
         android:drawableStart="?attr/menu_trash_icon"
         android:text="@string/delete" />
 
diff --git a/app/src/main/res/layout/fragment_recovery_phrase.xml b/app/src/main/res/layout/fragment_recovery_phrase.xml
index c0cf7bb3b2d..fb6afc74933 100644
--- a/app/src/main/res/layout/fragment_recovery_phrase.xml
+++ b/app/src/main/res/layout/fragment_recovery_phrase.xml
@@ -35,9 +35,9 @@
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginHorizontal="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
+        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
@@ -55,9 +55,9 @@
         android:id="@+id/continueButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginHorizontal="@dimen/massive_spacing"
         android:layout_marginBottom="@dimen/medium_spacing"
+        android:contentDescription="@string/AccessibilityId_link_device"
         android:text="@string/continue_2" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index a954740be98..e3c278446e4 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -54,6 +54,7 @@
             <ImageView
                 android:layout_width="20dp"
                 android:layout_height="22dp"
+                android:contentDescription="@string/AccessibilityId_edit_user_nickname"
                 android:paddingTop="2dp"
                 android:src="@drawable/ic_baseline_edit_24" />
 
@@ -71,6 +72,7 @@
                 android:id="@+id/cancelNicknameEditingButton"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:contentDescription="@string/AccessibilityId_apply"
                 android:src="@drawable/ic_baseline_clear_24" />
 
             <EditText
@@ -79,11 +81,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginStart="@dimen/small_spacing"
-                android:layout_marginEnd="@dimen/small_spacing"
+                android:layout_marginHorizontal="@dimen/small_spacing"
+                android:contentDescription="@string/AccessibilityId_username"
                 android:textAlignment="center"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
+                android:paddingVertical="12dp"
                 android:inputType="text"
                 android:singleLine="true"
                 android:imeOptions="actionDone"
@@ -93,6 +94,7 @@
                 android:id="@+id/saveNicknameButton"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:contentDescription="@string/AccessibilityId_apply"
                 android:src="@drawable/ic_baseline_done_24" />
 
         </LinearLayout>
@@ -105,6 +107,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/medium_spacing"
+        android:contentDescription="@string/AccessibilityId_session_id"
         android:textSize="@dimen/medium_font_size"
         android:textIsSelectable="true"
         tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
@@ -115,8 +118,8 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:paddingLeft="@dimen/large_spacing"
-        android:paddingRight="@dimen/large_spacing"
+        android:contentDescription="@string/AccessibilityId_message_user"
+        android:paddingHorizontal="@dimen/large_spacing"
         android:text="@string/ConversationActivity_message" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_untrusted_attachment.xml b/app/src/main/res/layout/view_untrusted_attachment.xml
index 6d6b9ae1048..974cab07a5c 100644
--- a/app/src/main/res/layout/view_untrusted_attachment.xml
+++ b/app/src/main/res/layout/view_untrusted_attachment.xml
@@ -2,9 +2,10 @@
 <org.thoughtcrime.securesms.conversation.v2.messages.UntrustedAttachmentView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:contentDescription="@string/AccessibilityId_untrusted_attachment_message"
     android:orientation="horizontal"
     android:padding="@dimen/medium_spacing"
     android:gravity="center">
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 38ebdfe7d95..a9886cabe64 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/conversation_view_background"
+    android:contentDescription="@string/AccessibilityId_contact"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/main/res/menu/menu_conversation.xml b/app/src/main/res/menu/menu_conversation.xml
index 3be7af29645..de7bd8e1c2f 100644
--- a/app/src/main/res/menu/menu_conversation.xml
+++ b/app/src/main/res/menu/menu_conversation.xml
@@ -5,11 +5,13 @@
 
     <item
         android:title="@string/conversation__menu_view_all_media"
-        android:id="@+id/menu_view_all_media" />
+        android:id="@+id/menu_view_all_media"
+        android:contentDescription="@string/AccessibilityId_all_media"/>
 
     <item
         android:title="@string/SearchToolbar_search"
         android:id="@+id/menu_search"
+        android:contentDescription="@string/AccessibilityId_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView" />
 
diff --git a/app/src/main/res/menu/menu_conversation_copy_session_id.xml b/app/src/main/res/menu/menu_conversation_copy_session_id.xml
index 4ca49666cde..68a546ba9f0 100644
--- a/app/src/main/res/menu/menu_conversation_copy_session_id.xml
+++ b/app/src/main/res/menu/menu_conversation_copy_session_id.xml
@@ -5,6 +5,7 @@
     <item
         android:title="@string/activity_conversation_menu_copy_session_id"
         android:id="@+id/menu_copy_session_id"
-        android:icon="@drawable/ic_content_copy_white_24dp" />
+        android:icon="@drawable/ic_content_copy_white_24dp"
+        android:contentDescription="@string/AccessibilityId_copy_session_id"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_conversation_notification_settings.xml b/app/src/main/res/menu/menu_conversation_notification_settings.xml
index af5ac222d78..3ea3037f59b 100644
--- a/app/src/main/res/menu/menu_conversation_notification_settings.xml
+++ b/app/src/main/res/menu/menu_conversation_notification_settings.xml
@@ -2,6 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:title="@string/RecipientPreferenceActivity_notification_settings"
-
-        android:id="@+id/menu_notification_settings"/>
+        android:id="@+id/menu_notification_settings"
+        android:contentDescription="@string/AccessibilityId_notification_settings"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_conversation_unmuted.xml b/app/src/main/res/menu/menu_conversation_unmuted.xml
index 85b9d16e806..7cc5c094b5e 100644
--- a/app/src/main/res/menu/menu_conversation_unmuted.xml
+++ b/app/src/main/res/menu/menu_conversation_unmuted.xml
@@ -4,6 +4,7 @@
 
     <item
         android:title="@string/conversation_unmuted__mute_notifications"
-        android:id="@+id/menu_mute_notifications" />
+        android:id="@+id/menu_mute_notifications"
+        android:contentDescription="@string/AccessibilityId_mute_notifications" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_done.xml b/app/src/main/res/menu/menu_done.xml
index 9ee181de1e7..0919791727d 100644
--- a/app/src/main/res/menu/menu_done.xml
+++ b/app/src/main/res/menu/menu_done.xml
@@ -6,6 +6,7 @@
         android:title="@string/menu_done_button"
         android:id="@+id/doneButton"
         android:icon="?menu_accept_icon"
+        android:contentDescription="@string/AccessibilityId_done"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20713c11080..bf16ef1c547 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <!-- Landing Page -->
     <string name="AccessibilityId_create_session_id">Create Session ID</string>
     <string name="AccessibilityId_restore_your_session">Restore Your Session</string>
+    <string name="AccessibilityId_link_a_device">Link a Device</string>
     <string name="AccessibilityId_link_device">Link Device</string>
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
@@ -37,6 +38,8 @@
     <string name="AccessibilityId_profile_picture">Profile picture</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
     <string name="AccessibilityId_conversation_list_item">Conversation list item</string>
+    <string name="AccessibilityId_details">Details</string>
+    <string name="AccessibilityId_pin">Pin</string>
 
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
@@ -52,7 +55,9 @@
     <string name="AccessibilityId_disappearing_messages">Disappearing messages</string>
     <string name="AccessibilityId_block">Block</string>
     <string name="AccessibilityId_block_confirm">Confirm block</string>
+    <string name="AccessibilityId_notification_settings">Notification settings</string>
     <string name="AccessibilityId_mute_notifications">Mute notifications</string>
+    <string name="AccessibilityId_delete">Delete</string>
     <!--  Conversation options for closed group-->
     <string name="AccessibilityId_edit_group">Edit group</string>
     <string name="AccessibilityId_leave_group">Leave group</string>
@@ -61,8 +66,11 @@
     <string name="AccessibilityId_cancel_name_change">Cancel name change</string>
     <string name="AccessibilityId_apply_changes">Apply changes</string>
     <string name="AccessibilityId_add_members">Add members</string>
+    <string name="AccessibilityId_done">Done</string>
+    <string name="AccessibilityId_mentions_list">Mentions list</string>
     <!--  Conversation icons -->
     <string name="AccessibilityId_call_button">Call button</string>
+    <string name="AccessibilityId_settings">Settings</string>
     <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
     <string name="AccessibilityId_disappearing_messages_time_picker">Time selector</string>
     <string name="AccessibilityId_accept_message_request_button">Accept message request</string>
@@ -84,7 +92,14 @@
     <string name="AccessibilityId_message_input">Message input box</string>
     <string name="AccessibilityId_microphone_button">Microphone button</string>
     <string name="AccessibilityId_send_message_button">Send message button</string>
-    <string name="AccessibilityId_attachments_button">Attachment button</string>
+    <string name="AccessibilityId_attachments_button">Attachments button</string>
+    <string name="AccessibilityId_select_camera_button">Select camera button</string>
+    <string name="AccessibilityId_images_folder">Images folder</string>
+    <string name="AccessibilityId_documents_folder">Documents folder</string>
+    <string name="AccessibilityId_gif_button">GIF button</string>
+    <string name="AccessibilityId_untrusted_attachment_message">Untrusted attachment message</string>
+    <string name="AccessibilityId_download_media">Download media</string>
+    <string name="AccessibilityId_dont_download_media">Don\'t download media</string>
     <!-- Conversation View-->
     <string name="AccessibilityId_message_sent_status_tick">Message sent status tick</string>
     <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
@@ -93,6 +108,8 @@
     <string name="AccessibilityId_deleted_message">Deleted message</string>
     <string name="AccessibilityId_delete_message">Delete message</string>
     <string name="AccessibilityId_reply_message">Reply</string>
+    <string name="AccessibilityId_select">Select</string>
+    <string name="AccessibilityId_save_attachment">Save attachment</string>
 
     <!-- Delete message modal-->
     <string name="AccessibilityId_delete_just_for_me">Delete just for me</string>
@@ -105,6 +122,10 @@
     <string name="AccessibilityId_username">Username</string>
     <string name="AccessibilityId_privacy">Privacy</string>
     <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+    <string name="AccessibilityId_edit_user_nickname">Edit user nickname</string>
+    <string name="AccessibilityId_apply">Apply</string>
+    <string name="AccessibilityId_cancel">Cancel</string>
+    <string name="AccessibilityId_message_user">Message user</string>
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
 

From 5a8e189233e3a9878cf1bad1f1c45fca7aab62da Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Fri, 7 Oct 2022 16:41:07 +1100
Subject: [PATCH 20/31] Add timer icon content description

---
 app/src/main/res/layout/conversation_item_footer.xml | 1 +
 app/src/main/res/layout/view_visible_message.xml     | 1 +
 app/src/main/res/values/strings.xml                  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/src/main/res/layout/conversation_item_footer.xml b/app/src/main/res/layout/conversation_item_footer.xml
index ab16a093045..3aefb394445 100644
--- a/app/src/main/res/layout/conversation_item_footer.xml
+++ b/app/src/main/res/layout/conversation_item_footer.xml
@@ -32,6 +32,7 @@
             android:layout_marginStart="6dp"
             android:layout_width="12dp"
             android:layout_height="12dp"
+            android:contentDescription="@string/AccessibilityId_timer_icon"
             android:visibility="gone"
             tools:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml
index 83aec997125..c7550385114 100644
--- a/app/src/main/res/layout/view_visible_message.xml
+++ b/app/src/main/res/layout/view_visible_message.xml
@@ -92,6 +92,7 @@
                 android:layout_height="12dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginHorizontal="@dimen/small_spacing"
+                android:contentDescription="@string/AccessibilityId_timer_icon"
                 android:visibility="invisible"
                 tools:visibility="visible" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf16ef1c547..9d336fb26d6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
     <string name="AccessibilityId_accept_message_request_button">Accept message request</string>
     <string name="AccessibilityId_decline_message_request_button">Decline message request</string>
     <string name="AccessibilityId_block_message_request_button">Block message request</string>
+    <string name="AccessibilityId_timer_icon">Timer icon</string>
 <!--    Control messages -->
     <string name="AccessibilityId_control_message">Control message</string>
     <string name="AccessibilityId_blocked_banner">Blocked banner</string>

From ce646ebb3855d4943cb2cee957428e95624efb34 Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Fri, 7 Oct 2022 17:06:46 +1100
Subject: [PATCH 21/31] Update profile picture content description

---
 app/src/main/res/layout/activity_home.xml     | 2 +-
 app/src/main/res/layout/activity_settings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 4a09601851d..97ea98f165a 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -34,7 +34,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="9dp"
-                    />
+                    android:contentDescription="@string/AccessibilityId_user_settings" />
 
                 <org.thoughtcrime.securesms.home.PathStatusView
                     android:id="@+id/pathStatusView"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 314ce2957c6..6726bb993db 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -25,7 +25,7 @@
                 android:layout_width="@dimen/large_profile_picture_size"
                 android:layout_height="@dimen/large_profile_picture_size"
                 android:layout_marginTop="@dimen/medium_spacing"
-                android:contentDescription="@string/AccessibilityId_user_settings" />
+                android:contentDescription="@string/AccessibilityId_profile_picture" />
 
             <RelativeLayout
                 android:id="@+id/ctnGroupNameSection"

From b8887eda39666c89df10b943a1aa1e2ca2312f4b Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Wed, 25 Jan 2023 11:07:37 +1100
Subject: [PATCH 22/31] Adding accessibility ids to new conversation creation
 screen and to message notification settings

---
 app/src/main/res/layout/activity_home.xml           |  1 +
 app/src/main/res/layout/activity_pn_mode.xml        |  1 +
 app/src/main/res/layout/activity_settings.xml       |  1 +
 app/src/main/res/layout/fragment_create_group.xml   |  2 +-
 .../res/layout/fragment_new_conversation_home.xml   |  3 +++
 app/src/main/res/values/strings.xml                 | 13 ++++++++-----
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 92324cd8d76..3fff3890caa 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -156,6 +156,7 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/newConversationButton"
+            android:contentDescription="@string/AccessibilityId_new_conversation_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 5c579d10317..956c8d18d1c 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -19,6 +19,7 @@
             android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
             android:textColor="?android:textColorPrimary"
+            android:contentDescription="@string/AccessibilityId_message_notifications"
             android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 25224eb1e4c..1d436991efc 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -80,6 +80,7 @@
                 android:textColor="?android:textColorPrimary"
                 android:fontFamily="@font/space_mono_regular"
                 android:textAlignment="center"
+                android:contentDescription="@string/AccessibilityId_session_id"
                 tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml
index 8803d4629ce..9cbb97f64be 100644
--- a/app/src/main/res/layout/fragment_create_group.xml
+++ b/app/src/main/res/layout/fragment_create_group.xml
@@ -103,7 +103,7 @@
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginVertical="@dimen/large_spacing"
-        android:contentDescription="@string/AccessibilityId_continue_group_creation"
+        android:contentDescription="@string/AccessibilityId_create_group"
         android:text="@string/activity_create_group_create_button_title"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_conversation_home.xml b/app/src/main/res/layout/fragment_new_conversation_home.xml
index e9b36f4007a..d105c787510 100644
--- a/app/src/main/res/layout/fragment_new_conversation_home.xml
+++ b/app/src/main/res/layout/fragment_new_conversation_home.xml
@@ -59,6 +59,7 @@
 
         <TextView
             android:id="@+id/createPrivateChatButton"
+            android:contentDescription="@string/AccessibilityId_new_direct_message"
             android:layout_width="match_parent"
             android:layout_height="@dimen/setting_button_height"
             android:drawablePadding="@dimen/large_spacing"
@@ -84,6 +85,7 @@
 
         <TextView
             android:id="@+id/createClosedGroupButton"
+            android:contentDescription="@string/AccessibilityId_create_group"
             android:layout_width="match_parent"
             android:layout_height="@dimen/setting_button_height"
             android:drawablePadding="@dimen/large_spacing"
@@ -109,6 +111,7 @@
 
         <TextView
             android:id="@+id/joinCommunityButton"
+            android:contentDescription="@string/AccessibilityId_join_community"
             android:layout_width="match_parent"
             android:layout_height="@dimen/setting_button_height"
             android:drawablePadding="@dimen/large_spacing"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98c11543428..372feced365 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,9 +11,9 @@
     <string name="version_s">Version %s</string>
 <!--Accessibility ID's-->
     <!-- Landing Page -->
-    <string name="AccessibilityId_create_session_id">Create Session ID</string>
+    <string name="AccessibilityId_create_session_id">Create session ID</string>
     <string name="AccessibilityId_restore_your_session">Restore Your Session</string>
-    <string name="AccessibilityId_link_a_device">Link a Device</string>
+    <string name="AccessibilityId_link_a_device">Link a device</string>
     <string name="AccessibilityId_link_device">Link Device</string>
     <!-- Session ID Page-->
     <string name="AccessibilityId_session_id">Session ID</string>
@@ -28,6 +28,7 @@
     <!--Create Display Name    -->
     <string name="AccessibilityId_enter_display_name">Enter display name</string>
     <!--Message Notifications Options-->
+    <string name="AccessibilityId_message_notifications">Message Notifications</string>
     <string name="AccessibilityId_fast_mode_notifications_option">Fast mode notifications option</string>
     <string name="AccessibilityId_slow_mode_notifications_option">Slow mode notifications option</string>
     <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
@@ -35,7 +36,7 @@
     <string name="AccessibilityId_recovery_phrase">Recovery Phrase</string>
     <string name="AccessibilityId_copy_recovery_phrase">Copy Recovery Phrase</string>
     <!--Home Page-->
-    <string name="AccessibilityId_profile_picture">Profile picture</string>
+    <string name="AccessibilityId_profile_picture">User settings</string>
     <string name="AccessibilityId_search_icon">Search icon</string>
     <string name="AccessibilityId_conversation_list_item">Conversation list item</string>
     <string name="AccessibilityId_details">Details</string>
@@ -77,8 +78,8 @@
     <string name="AccessibilityId_decline_message_request_button">Decline message request</string>
     <string name="AccessibilityId_block_message_request_button">Block message request</string>
     <string name="AccessibilityId_timer_icon">Timer icon</string>
-<!--    Control messages -->
-    <string name="AccessibilityId_control_message">Control message</string>
+<!--    Configuration messages -->
+    <string name="AccessibilityId_control_message">Configuration message</string>
     <string name="AccessibilityId_blocked_banner">Blocked banner</string>
     <string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
     <!--New Session -->
@@ -89,6 +90,7 @@
     <string name="AccessibilityId_continue_group_creation">Continue group creation</string>
     <string name="AccessibilityId_contact">Contact</string>
     <string name="AccessibilityId_select_contact">Select contact</string>
+
     <!--Conversation screen -->
     <string name="AccessibilityId_message_input">Message input box</string>
     <string name="AccessibilityId_microphone_button">Microphone button</string>
@@ -127,6 +129,7 @@
     <string name="AccessibilityId_apply">Apply</string>
     <string name="AccessibilityId_cancel">Cancel</string>
     <string name="AccessibilityId_message_user">Message user</string>
+
 <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
 

From 7f858b70d364b30882eeb41c6c4f314d2865e85c Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Wed, 25 Jan 2023 16:12:24 +1100
Subject: [PATCH 23/31] fix: content descriptions in their correct places and
 prevent a crash

---
 .../securesms/conversation/v2/menus/ConversationMenuHelper.kt | 4 ++--
 .../securesms/conversation/v2/messages/VisibleMessageView.kt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index e00595d9c8d..f8ed8261df0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -191,8 +191,8 @@ object ConversationMenuHelper {
                 .setNeutralButton(R.string.cancel) { d, _ ->
                     d.dismiss()
                 }.create()
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE).contentDescription = context.getString(R.string.AccessibilityId_settings)
-            dialog.getButton(DialogInterface.BUTTON_NEGATIVE).contentDescription = context.getString(R.string.AccessibilityId_cancel_button)
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE)?.contentDescription = context.getString(R.string.AccessibilityId_settings)
+            dialog.getButton(DialogInterface.BUTTON_NEGATIVE)?.contentDescription = context.getString(R.string.AccessibilityId_cancel_button)
             dialog.show()
             return
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 8300fb82d5f..26b8333446c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -196,7 +196,7 @@ class VisibleMessageView : LinearLayout {
         binding.dateBreakTextView.isVisible = showDateBreak
         // Message status indicator
         if (message.isOutgoing) {
-            val (iconID, iconColor, textId) = getMessageStatusImage(message)
+            val (iconID, iconColor, textId, contentDescription) = getMessageStatusImage(message)
             if (textId != null) {
                 binding.messageStatusTextView.setText(textId)
 

From 4e38b75f57147668eac6629bf19d398927de69b1 Mon Sep 17 00:00:00 2001
From: hjubb <hjubb@users.noreply.github.com>
Date: Mon, 30 Jan 2023 16:49:41 +1100
Subject: [PATCH 24/31] build: update build number

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3dcc197263a..fdb064f3011 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -159,8 +159,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 323
-def canonicalVersionName = "1.16.3"
+def canonicalVersionCode = 331
+def canonicalVersionName = "1.16.4"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From 48799db21cc40893a0134ff9dc4e04391c089aca Mon Sep 17 00:00:00 2001
From: hjubb <hjubb@users.noreply.github.com>
Date: Mon, 6 Feb 2023 16:03:49 +1100
Subject: [PATCH 25/31] build: update build number

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fdb064f3011..4c6bb964887 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -159,8 +159,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 331
-def canonicalVersionName = "1.16.4"
+def canonicalVersionCode = 333
+def canonicalVersionName = "1.16.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From eeeb91bd99bc9f8e0cdc6dc34bf95ec2414b745d Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Tue, 14 Feb 2023 13:57:42 +1100
Subject: [PATCH 26/31] Adding back in FrameLayout, making changes as request

---
 .../activity_recovery_phrase_restore.xml      |  2 +-
 .../fragment_recovery_phrase.xml              |  2 +-
 .../main/res/layout/activity_link_device.xml  | 40 ++++++++++---------
 .../activity_recovery_phrase_restore.xml      |  2 +-
 .../fragment_user_details_bottom_sheet.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  7 ++--
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
index 918cb3c2cb4..88d90f5aaf9 100644
--- a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
@@ -34,7 +34,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
-        android:contentDescription="@string/AccessibilityId_recovery_phrase_input"
+        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
diff --git a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
index 86410744840..7b220207e29 100644
--- a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
@@ -33,7 +33,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
-        android:contentDescription="@string/AccessibilityId_recovery_phrase_input"
+        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
diff --git a/app/src/main/res/layout/activity_link_device.xml b/app/src/main/res/layout/activity_link_device.xml
index 2a3a9d1dd9c..a9a31850d5b 100644
--- a/app/src/main/res/layout/activity_link_device.xml
+++ b/app/src/main/res/layout/activity_link_device.xml
@@ -12,34 +12,36 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabLayout"
             style="@style/Widget.Session.TabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_bar_height" />
+            android:id="@+id/tabLayout"
 
-        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:animateLayoutChanges="true">
+            android:layout_height="@dimen/tab_bar_height" />
 
-            <RelativeLayout
-                android:id="@+id/loader"
+        </androidx.viewpager.widget.ViewPager>
+            <FrameLayout
+                android:animateLayoutChanges="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="#A4000000"
-                android:visibility="gone">
 
-                <com.github.ybq.android.spinkit.SpinKitView
-                    style="@style/SpinKitView.Large.ThreeBounce"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_marginTop="8dp"
-                    app:SpinKit_Color="@android:color/white" />
+                <RelativeLayout
+                    android:id="@+id/loader"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#A4000000"
+                    android:visibility="gone">
+
+                    <com.github.ybq.android.spinkit.SpinKitView
+                        style="@style/SpinKitView.Large.ThreeBounce"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_centerInParent="true"
+                        app:SpinKit_Color="@android:color/white" />
 
-            </RelativeLayout>
+                </RelativeLayout>
 
-        </FrameLayout>
+            </FrameLayout>
 
     </androidx.viewpager.widget.ViewPager>
 
diff --git a/app/src/main/res/layout/activity_recovery_phrase_restore.xml b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
index a76121ba3cc..5f2012e9c1e 100644
--- a/app/src/main/res/layout/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
@@ -54,7 +54,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
+        android:contentDescription="@string/AccessibilityId_continue"
         android:id="@+id/restoreButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 20ac0653270..98c87331a69 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -72,7 +72,7 @@
                 android:id="@+id/cancelNicknameEditingButton"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:contentDescription="@string/AccessibilityId_apply"
+                android:contentDescription="@string/AccessibilityId_cancel"
                 android:src="@drawable/ic_baseline_clear_24" />
 
             <EditText
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ee8a009659..1ab1dda4205 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,6 @@
     <string name="AccessibilityId_recovery_phrase_reminder">Recovery phrase reminder</string>
     <string name="AccessibilityId_continue">Continue</string>
     <!-- Recovery phrase input -->
-    <string name="AccessibilityId_recovery_phrase_input">Recovery phrase input</string>
 
     <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
@@ -93,7 +92,7 @@
 
     <!--Conversation screen -->
     <string name="AccessibilityId_message_input">Message input box</string>
-    <string name="AccessibilityId_microphone_button">Microphone button</string>
+    <string name="AccessibilityId_microphone_button">New voice message</string>
     <string name="AccessibilityId_send_message_button">Send message button</string>
     <string name="AccessibilityId_attachments_button">Attachments button</string>
     <string name="AccessibilityId_select_camera_button">Select camera button</string>
@@ -104,13 +103,13 @@
     <string name="AccessibilityId_download_media">Download media</string>
     <string name="AccessibilityId_dont_download_media">Don\'t download media</string>
     <!-- Conversation View-->
-    <string name="AccessibilityId_message_sent_status_tick">Message sent status tick</string>
+    <string name="AccessibilityId_message_sent_status_tick">Message sent status: Sent</string>
     <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
     <string name="AccessibilityId_message_body">Message Body</string>
     <string name="AccessibilityId_deleted_message">Deleted message</string>
     <string name="AccessibilityId_delete_message">Delete message</string>
-    <string name="AccessibilityId_reply_message">Reply</string>
+    <string name="AccessibilityId_reply_message">Reply to message</string>
     <string name="AccessibilityId_select">Select</string>
     <string name="AccessibilityId_save_attachment">Save attachment</string>
 

From 612b0c1546f4cc9691373d0174a4dd9cb951865a Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Tue, 14 Feb 2023 14:27:23 +1100
Subject: [PATCH 27/31] Fixed viewPager move

---
 .../main/res/layout/activity_link_device.xml  | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout/activity_link_device.xml b/app/src/main/res/layout/activity_link_device.xml
index a9a31850d5b..4c5df3b6f2e 100644
--- a/app/src/main/res/layout/activity_link_device.xml
+++ b/app/src/main/res/layout/activity_link_device.xml
@@ -9,40 +9,38 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent" >
 
         <com.google.android.material.tabs.TabLayout
             style="@style/Widget.Session.TabLayout"
             android:id="@+id/tabLayout"
-
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_bar_height" />
 
-        </androidx.viewpager.widget.ViewPager>
-            <FrameLayout
-                android:animateLayoutChanges="true"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+    </androidx.viewpager.widget.ViewPager>
 
-                <RelativeLayout
-                    android:id="@+id/loader"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="#A4000000"
-                    android:visibility="gone">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
 
-                    <com.github.ybq.android.spinkit.SpinKitView
-                        style="@style/SpinKitView.Large.ThreeBounce"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_centerInParent="true"
-                        app:SpinKit_Color="@android:color/white" />
+        <RelativeLayout
+            android:id="@+id/loader"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#A4000000"
+            android:visibility="gone">
 
-                </RelativeLayout>
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/SpinKitView.Large.ThreeBounce"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="8dp"
+                app:SpinKit_Color="@android:color/white" />
 
-            </FrameLayout>
+        </RelativeLayout>
 
-    </androidx.viewpager.widget.ViewPager>
+    </FrameLayout>
 
 </RelativeLayout>
\ No newline at end of file

From 069ef6bd46d1fe1958999d04d135874253183482 Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Thu, 16 Feb 2023 09:48:38 +1100
Subject: [PATCH 28/31] Fixing changes as requested by Jubb

---
 .../org/thoughtcrime/securesms/permissions/Permissions.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index 8e8666ee82d..0b08a8ac178 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -13,6 +13,7 @@
 import android.view.Display;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.Button;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -360,7 +361,10 @@ public void run() {
             .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
             .setNegativeButton(android.R.string.cancel, null)
             .create();
-        alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setContentDescription(context.getString(R.string.AccessibilityId_continue));
+        Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        if (positiveButton != null) {
+          positiveButton.setContentDescription(context.getString(R.string.AccessibilityId_continue));
+        }
         alertDialog.show();
       }
     }

From cdbbd6be78d745a374198ffb50082a2ca46a0156 Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Tue, 7 Mar 2023 11:58:45 +1100
Subject: [PATCH 29/31] Adding content descriptions to mentions list, voice
 message settings, link preview permissions, closed group menu and slow mode
 notifications option

---
 .../conversation/v2/ConversationActivityV2.kt |  4 ++-
 .../securesms/permissions/Permissions.java    | 13 +++++----
 .../PrivacySettingsPreferenceFragment.java    |  8 ++++--
 .../res/layout-sw400dp/activity_pn_mode.xml   |  6 +++-
 .../res/layout/activity_edit_closed_group.xml |  1 +
 app/src/main/res/layout/activity_settings.xml | 28 +++++++++++++------
 .../main/res/layout/dialog_link_preview.xml   |  8 ++++--
 app/src/main/res/layout/view_document.xml     |  3 +-
 .../res/layout/view_mention_candidate_v2.xml  |  4 ++-
 .../main/res/layout/view_voice_message.xml    |  1 +
 app/src/main/res/values/strings.xml           | 19 ++++++++++---
 11 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 4b33a41171a..238f106384a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -945,7 +945,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     override fun block(deleteThread: Boolean) {
         val title = R.string.RecipientPreferenceActivity_block_this_contact_question
         val message = R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact
-        AlertDialog.Builder(this)
+        val dialog = AlertDialog.Builder(this)
             .setTitle(title)
             .setMessage(message)
             .setNegativeButton(android.R.string.cancel, null)
@@ -956,6 +956,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     finish()
                 }
             }.show()
+        val button = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
+        button.setContentDescription("Confirm block")
     }
 
     override fun copySessionID(sessionId: String) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index 0b08a8ac178..2d7e6dae593 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -164,12 +164,13 @@ private void executePreGrantedPermissionsRequest(PermissionsRequest request) {
 
     @SuppressWarnings("ConstantConditions")
     private void executePermissionsRequestWithRationale(PermissionsRequest request) {
-      RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
-                     .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
-                     .setNegativeButton(R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
-                     .show()
-                     .getWindow()
-                     .setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
+      AlertDialog dialog = RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
+              .setPositiveButton(R.string.Permissions_continue, (d, which) -> executePermissionsRequest(request))
+              .setNegativeButton(R.string.Permissions_not_now, (d, which) -> executeNoPermissionsRequest(request))
+              .show();
+      dialog.getWindow().setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
+      Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+      positiveButton.setContentDescription("Continue");
     }
 
     private void executePermissionsRequest(PermissionsRequest request) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
index b5774447ee8..ac03efa362d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
@@ -5,10 +5,12 @@
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -179,7 +181,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
       boolean val = (boolean) newValue;
       if (val) {
         // check if we've shown the info dialog and check for microphone permissions
-        new AlertDialog.Builder(new ContextThemeWrapper(context.requireContext(), R.style.ThemeOverlay_Session_AlertDialog))
+        AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(context.requireContext(), R.style.ThemeOverlay_Session_AlertDialog))
                 .setTitle(R.string.dialog_voice_video_title)
                 .setMessage(R.string.dialog_voice_video_message)
                 .setPositiveButton(R.string.dialog_link_preview_enable_button_title, (d, w) -> {
@@ -189,7 +191,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 
                 })
                 .show();
-        return false;
+          Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+          positiveButton.setContentDescription("Enable");
+      return false;
       } else {
         return true;
       }
diff --git a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
index c8e0aea22de..b55b35f149e 100644
--- a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
+++ b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
@@ -19,6 +19,7 @@
             android:textSize="@dimen/very_large_font_size"
             android:textStyle="bold"
             android:textColor="?android:textColorPrimary"
+            android:contentDescription="@string/AccessibilityId_message_notifications"
             android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
@@ -32,6 +33,7 @@
             android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.util.PNModeView
+            android:contentDescription="@string/AccessibilityId_fast_mode_notifications_option"
             android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,6 +72,7 @@
         </org.thoughtcrime.securesms.util.PNModeView>
 
         <org.thoughtcrime.securesms.util.PNModeView
+            android:contentDescription="@string/AccessibilityId_slow_mode_notifications_option"
             android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -86,7 +89,8 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"
-                android:text="@string/activity_pn_mode_slow_mode" />
+                android:text="@string/activity_pn_mode_slow_mode"
+                />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml
index 9bbf206a873..e8a892f1847 100644
--- a/app/src/main/res/layout/activity_edit_closed_group.xml
+++ b/app/src/main/res/layout/activity_edit_closed_group.xml
@@ -49,6 +49,7 @@
                     android:inputType="text"
                     android:singleLine="true"
                     android:imeOptions="actionDone"
+                    android:contentDescription="@string/AccessibilityId_group_name"
                     android:hint="@string/activity_edit_closed_group_edit_text_hint" />
 
                 <ImageView
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1d436991efc..606f3c45273 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -192,7 +192,8 @@
                     android:id="@+id/notificationsButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_notifications">
                     <ImageView
                         android:id="@+id/notificationsContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -212,7 +213,8 @@
                         android:textStyle="bold"
                         android:gravity="center"
                         android:layout_toEndOf="@+id/notificationsContainer"
-                        android:text="@string/activity_settings_notifications_button_title" />
+                        android:text="@string/activity_settings_notifications_button_title"
+                        />
                 </RelativeLayout>
 
 
@@ -226,7 +228,9 @@
                     android:id="@+id/chatsButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_conversations">
+
                     <ImageView
                         android:id="@+id/chatsContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -259,7 +263,8 @@
                     android:id="@+id/messageRequestsButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_message_requests">
                     <ImageView
                         android:id="@+id/messageRequestsContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -292,7 +297,8 @@
                     android:id="@+id/appearanceButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_appearance">
                     <ImageView
                         android:id="@+id/appearanceContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -325,7 +331,8 @@
                     android:id="@+id/inviteFriendButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_invite_friend">
                     <ImageView
                         android:id="@+id/inviteFriendContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -358,7 +365,8 @@
                     android:id="@+id/seedButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_recovery_phrase">
                     <ImageView
                         android:id="@+id/seedContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -391,7 +399,8 @@
                     android:id="@+id/helpButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_help">
                     <ImageView
                         android:id="@+id/helpContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
@@ -424,7 +433,8 @@
                     android:id="@+id/clearAllDataButton"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/setting_button_height">
+                    android:layout_height="@dimen/setting_button_height"
+                    android:contentDescription="@string/AccessibilityId_clear_data">
                     <ImageView
                         android:id="@+id/clearContainer"
                         android:layout_width="@dimen/small_profile_picture_size"
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index f194ad0f2e5..6d4b29ea73e 100644
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -40,7 +40,8 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
             android:layout_weight="1"
-            android:text="@string/cancel" />
+            android:text="@string/cancel"
+            android:contentDescription="@string/AccessibilityId_cancel_link_preview_button"/>
 
         <Button
             style="@style/Widget.Session.Button.Dialog.Unimportant"
@@ -49,7 +50,10 @@
             android:layout_height="@dimen/small_button_height"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/dialog_link_preview_enable_button_title" />
+            android:text="@string/dialog_link_preview_enable_button_title"
+            android:contentDescription="@string/AccessibilityId_enable_link_preview_button"
+            />
+
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_document.xml b/app/src/main/res/layout/view_document.xml
index f1f57a6398d..713b0796017 100644
--- a/app/src/main/res/layout/view_document.xml
+++ b/app/src/main/res/layout/view_document.xml
@@ -7,7 +7,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:padding="@dimen/medium_spacing"
-    android:gravity="center">
+    android:gravity="center"
+    android:contentDescription="@string/AccessibilityId_document">
 
     <ImageView
         android:id="@+id/documentViewIconImageView"
diff --git a/app/src/main/res/layout/view_mention_candidate_v2.xml b/app/src/main/res/layout/view_mention_candidate_v2.xml
index 31ade71b2e1..356681913af 100644
--- a/app/src/main/res/layout/view_mention_candidate_v2.xml
+++ b/app/src/main/res/layout/view_mention_candidate_v2.xml
@@ -29,7 +29,8 @@
                 android:layout_height="16dp"
                 android:src="@drawable/ic_crown"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true" />
+                android:layout_alignParentBottom="true"
+                android:contentDescription="@string/AccessibilityId_contact_mentions"/>
 
         </RelativeLayout>
 
@@ -41,6 +42,7 @@
             android:textSize="@dimen/small_font_size"
             android:textColor="?android:textColorPrimary"
             android:maxLines="1"
+            android:contentDescription="@string/AccessibilityId_contact_mentions"
             android:ellipsize="end" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/view_voice_message.xml b/app/src/main/res/layout/view_voice_message.xml
index 9895ad95a4f..2953695f692 100644
--- a/app/src/main/res/layout/view_voice_message.xml
+++ b/app/src/main/res/layout/view_voice_message.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainVoiceMessageViewContainer"
+    android:contentDescription="@string/AccessibilityId_voice_message"
     android:layout_width="160dp"
     android:layout_height="36dp">
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ab1dda4205..fbe0a0e2225 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,6 +58,7 @@
     <string name="AccessibilityId_notification_settings">Notification settings</string>
     <string name="AccessibilityId_mute_notifications">Mute notifications</string>
     <string name="AccessibilityId_delete">Delete</string>
+    <string name="AccessibilityId_enable">Enable</string>
     <!--  Conversation options for closed group-->
     <string name="AccessibilityId_edit_group">Edit group</string>
     <string name="AccessibilityId_leave_group">Leave group</string>
@@ -68,6 +69,7 @@
     <string name="AccessibilityId_add_members">Add members</string>
     <string name="AccessibilityId_done">Done</string>
     <string name="AccessibilityId_mentions_list">Mentions list</string>
+    <string name="AccessibilityId_contact_mentions">Contact mentions</string>
     <!--  Conversation icons -->
     <string name="AccessibilityId_call_button">Call button</string>
     <string name="AccessibilityId_settings">Settings</string>
@@ -107,12 +109,13 @@
     <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
     <string name="AccessibilityId_message_body">Message Body</string>
+    <string name="AccessibilityId_voice_message">Voice message</string>
+    <string name="AccessibilityId_document">Document</string>
     <string name="AccessibilityId_deleted_message">Deleted message</string>
     <string name="AccessibilityId_delete_message">Delete message</string>
     <string name="AccessibilityId_reply_message">Reply to message</string>
     <string name="AccessibilityId_select">Select</string>
     <string name="AccessibilityId_save_attachment">Save attachment</string>
-
     <!-- Delete message modal-->
     <string name="AccessibilityId_delete_just_for_me">Delete just for me</string>
     <string name="AccessibilityId_delete_for_everyone">Delete for everyone</string>
@@ -128,10 +131,18 @@
     <string name="AccessibilityId_apply">Apply</string>
     <string name="AccessibilityId_cancel">Cancel</string>
     <string name="AccessibilityId_message_user">Message user</string>
-
-<!--    Recovery Phrase Dialog-->
+    <string name="AccessibilityId_notifications">Notifications</string>
+    <string name="AccessibilityId_conversations">Conversations</string>
+    <string name="AccessibilityId_message_requests">Message requests</string>
+    <string name="AccessibilityId_appearance">Appearance</string>
+    <string name="AccessibilityId_invite_friend">Invite a friend</string>
+    <string name="AccessibilityId_help">Help</string>
+    <string name="AccessibilityId_clear_data">Clear data</string>
+    <!--    Recovery Phrase Dialog-->
     <string name="AccessibilityId_cancel_button">Cancel</string>
-
+    <!--    Link preview Dialog-->
+    <string name="AccessibilityId_enable_link_preview_button">Enable</string>
+    <string name="AccessibilityId_cancel_link_preview_button">Cancel</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
     <!-- AlbumThumbnailView -->

From ba71c7367d7f9ffe06ceeaf79c16e89efc5eac77 Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:15:18 +1100
Subject: [PATCH 30/31] Adds content descriptions to blocked contacts heading
 in conversations settings, individual contacts in blocked contacts page and
 to empty message requests folder

---
 app/src/main/res/layout/activity_message_requests.xml   | 1 +
 app/src/main/res/layout/blocked_contact_layout.xml      | 1 +
 app/src/main/res/layout/blocked_contacts_preference.xml | 1 +
 app/src/main/res/values/strings.xml                     | 4 ++++
 4 files changed, 7 insertions(+)

diff --git a/app/src/main/res/layout/activity_message_requests.xml b/app/src/main/res/layout/activity_message_requests.xml
index 4cb996cabf5..4e29bddc8f6 100644
--- a/app/src/main/res/layout/activity_message_requests.xml
+++ b/app/src/main/res/layout/activity_message_requests.xml
@@ -39,6 +39,7 @@
             android:visibility="gone">
 
             <TextView
+                android:contentDescription="@string/AccessibilityId_empty_message_request_folder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/message_request_empty_state_message"
diff --git a/app/src/main/res/layout/blocked_contact_layout.xml b/app/src/main/res/layout/blocked_contact_layout.xml
index b454a0776eb..40d7f40dd34 100644
--- a/app/src/main/res/layout/blocked_contact_layout.xml
+++ b/app/src/main/res/layout/blocked_contact_layout.xml
@@ -16,6 +16,7 @@
         />
 
     <TextView
+        android:contentDescription="@string/AccessibilityId_contact"
         android:textSize="@dimen/text_size"
         android:textStyle="bold"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index bc49ce3fae1..e7aed74700f 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -5,6 +5,7 @@
     android:layout_marginVertical="@dimen/medium_spacing"
     android:layout_height="wrap_content">
     <TextView
+        android:contentDescription="@string/AccessibilityId_blocked_contacts"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/medium_spacing"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fbe0a0e2225..680cd5e2f11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,9 +40,13 @@
     <string name="AccessibilityId_conversation_list_item">Conversation list item</string>
     <string name="AccessibilityId_details">Details</string>
     <string name="AccessibilityId_pin">Pin</string>
+    <!--Settings Page -->
+    <string name="AccessibilityId_blocked_contacts">Blocked contacts</string>
 
+    <!--Message requests-->
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
+    <string name="AccessibilityId_empty_message_request_folder">No pending message requests</string>
     <!--New conversation pop up-->
     <string name="AccessibilityId_new_conversation_button">New conversation button</string>
     <string name="AccessibilityId_new_direct_message">New direct message</string>

From 48a95c81104c352b19075a60fe4a5c24470c4bbe Mon Sep 17 00:00:00 2001
From: Emily <92288602+burtonemily@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:04:01 +1000
Subject: [PATCH 31/31] Adds content descriptions to empty message request
 folder and text input box for username on settings page

---
 app/src/main/res/layout/activity_message_requests.xml | 1 +
 app/src/main/res/layout/activity_settings.xml         | 2 +-
 app/src/main/res/values/strings.xml                   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_message_requests.xml b/app/src/main/res/layout/activity_message_requests.xml
index 4e29bddc8f6..083b5b9c443 100644
--- a/app/src/main/res/layout/activity_message_requests.xml
+++ b/app/src/main/res/layout/activity_message_requests.xml
@@ -49,6 +49,7 @@
         </LinearLayout>
 
         <Button
+            android:contentDescription="@string/AccessibilityId_clear_all_message_requests"
             android:id="@+id/clearAllMessageRequestsButton"
             style="@style/Widget.Session.Button.Common.DestructiveOutline"
             android:layout_width="196dp"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 606f3c45273..72c7e655fdb 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -54,7 +54,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:contentDescription="@string/AccessibilityId_username_text"
+                    android:contentDescription="@string/AccessibilityId_username"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/very_large_font_size"
                     android:textStyle="bold" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 680cd5e2f11..c4a91635a95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <string name="AccessibilityId_message_request_banner">Message requests banner</string>
     <string name="AccessibilityId_message_request">Message request</string>
     <string name="AccessibilityId_empty_message_request_folder">No pending message requests</string>
+    <string name="AccessibilityId_clear_all_message_requests">Clear all</string>
     <!--New conversation pop up-->
     <string name="AccessibilityId_new_conversation_button">New conversation button</string>
     <string name="AccessibilityId_new_direct_message">New direct message</string>