From f9e5063ce6a21035f4d7d7ddbef48c2d7d112370 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Wed, 20 Sep 2023 16:24:49 +0200
Subject: [PATCH] fix: Label the header and avatar on the account screen

---
 app/lint-baseline.xml                        | 40 +++++---------------
 app/src/main/res/layout/activity_account.xml |  2 +
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 5b0377b64..ce7b4ace0 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -3926,7 +3926,7 @@
         errorLine2="                     ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="116"
+            line="117"
             column="22"/>
     </issue>
 
@@ -3937,7 +3937,7 @@
         errorLine2="                     ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="130"
+            line="131"
             column="22"/>
     </issue>
 
@@ -3948,7 +3948,7 @@
         errorLine2="                     ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="245"
+            line="246"
             column="22"/>
     </issue>
 
@@ -3959,7 +3959,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="281"
+            line="282"
             column="26"/>
     </issue>
 
@@ -3970,7 +3970,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="308"
+            line="309"
             column="26"/>
     </issue>
 
@@ -3981,7 +3981,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="323"
+            line="324"
             column="26"/>
     </issue>
 
@@ -3992,7 +3992,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="350"
+            line="351"
             column="26"/>
     </issue>
 
@@ -4003,7 +4003,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="381"
+            line="382"
             column="26"/>
     </issue>
 
@@ -4014,7 +4014,7 @@
         errorLine2="                         ~~~~~~~~">
         <location
             file="src/main/res/layout/activity_account.xml"
-            line="411"
+            line="412"
             column="26"/>
     </issue>
 
@@ -5228,28 +5228,6 @@
             column="50"/>
     </issue>
 
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="                &lt;ImageView"
-        errorLine2="                 ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_account.xml"
-            line="31"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_account.xml"
-            line="473"
-            column="10"/>
-    </issue>
-
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 00483c192..889f0e81e 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -35,6 +35,7 @@
                     android:layout_alignTop="@+id/account_header_info"
                     android:background="?colorSurface"
                     android:scaleType="centerCrop"
+                    android:contentDescription="@string/label_header"
                     app:layout_collapseMode="parallax"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -476,6 +477,7 @@
             android:layout_height="@dimen/account_activity_avatar_size"
             android:layout_marginStart="16dp"
             android:padding="3dp"
+            android:contentDescription="@string/label_avatar"
             app:layout_anchor="@+id/accountHeaderInfoContainer"
             app:layout_anchorGravity="top"
             app:layout_scrollFlags="scroll"