From 646a65319cdd7ccb058757b3d6edb2a4d25ff6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvagner@pvagner.tk>
Date: Sat, 28 Dec 2019 19:12:56 +0100
Subject: [PATCH] Label the text views with their title counter parts for a11y
 when viewing message with addresses expanded. This is not well supported by
 all screen readers so perhaps we'll have to workaround this with custom
 contentDescriptions later.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
---
 app/src/main/res/layout/include_message_addresses.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 3aecb33f5a..df8c38d028 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -106,6 +106,7 @@
         android:text="@string/title_from"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvFromEx"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/barrier_action" />
 
@@ -130,6 +131,7 @@
         android:text="@string/title_to"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvTo"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvFromEx" />
 
@@ -154,6 +156,7 @@
         android:text="@string/title_reply_to"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvReplyTo"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
@@ -178,6 +181,7 @@
         android:text="@string/title_cc"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvCc"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
@@ -202,6 +206,7 @@
         android:text="@string/title_bcc"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvBcc"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
@@ -226,6 +231,7 @@
         android:text="@string/title_via_identity"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvIdentity"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
@@ -250,6 +256,7 @@
         android:text="@string/title_sent"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvSent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
@@ -274,6 +281,7 @@
         android:text="@string/title_received"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvReceived"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSent" />
 
@@ -298,6 +306,7 @@
         android:text="@string/title_size"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
+        android:labelFor="@+id/tvSizeEx"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReceived" />
 
@@ -370,4 +379,4 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorAddress,ibExpanderAddress" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>