From f309a1bb62ffee967b4cc7437372ce4d6518c6da Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 11 Nov 2022 11:44:51 +0100
Subject: [PATCH] Added accessibility labels

---
 app/src/main/res/layout/include_nav.xml | 10 +++++-----
 app/src/main/res/values/strings.xml     | 24 ++++++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index ed97d0e5e3..8088230473 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -103,7 +103,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/title_legend_expander"
+        android:contentDescription="@string/title_accessibility_accounts"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorOptions"
@@ -133,7 +133,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/title_legend_expander"
+        android:contentDescription="@string/title_accessibility_folders"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount"
@@ -163,7 +163,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/title_legend_expander"
+        android:contentDescription="@string/title_accessibility_searches"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorUnified"
@@ -193,7 +193,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/title_legend_expander"
+        android:contentDescription="@string/title_accessibility_menus"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorSearch"
@@ -223,7 +223,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/title_legend_expander"
+        android:contentDescription="@string/title_accessibility_extras"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorMenu"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7aa20408d4..0fd0298248 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2084,16 +2084,6 @@
 
     <string name="title_compat_dark">Google removed dark mode for Android versions before version 10</string>
 
-    <string name="title_accessibility_collapsed">Collapsed</string>
-    <string name="title_accessibility_expanded">Expanded</string>
-    <string name="title_accessibility_seen">Read</string>
-    <string name="title_accessibility_unseen">Unread</string>
-
-    <plurals name="title_accessibility_messages">
-        <item quantity="one">%1$d message</item>
-        <item quantity="other">%1$d messages</item>
-    </plurals>
-
     <!-- Thunderbird -->
     <string name="title_keyword_label1">Important</string>
     <string name="title_keyword_label2">Work</string>
@@ -2101,6 +2091,20 @@
     <string name="title_keyword_label4">To do</string>
     <string name="title_keyword_label5">Later</string>
 
+    <plurals name="title_accessibility_messages">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+
+    <string name="title_accessibility_accounts">Accounts</string>
+    <string name="title_accessibility_folders">Folders</string>
+    <string name="title_accessibility_searches">Searches</string>
+    <string name="title_accessibility_menus">Menus</string>
+    <string name="title_accessibility_extras">Extras</string>
+    <string name="title_accessibility_collapsed">Collapsed</string>
+    <string name="title_accessibility_expanded">Expanded</string>
+    <string name="title_accessibility_seen">Read</string>
+    <string name="title_accessibility_unseen">Unread</string>
     <string name="title_accessibility_flagged">Starred</string>
     <string name="title_accessibility_unflagged">Unstarred</string>
     <string name="title_accessibility_collapse">Collapse</string>