From 956ad9795c5ecbaa86e4d4851d42043fc8155e70 Mon Sep 17 00:00:00 2001
From: Luke Wass <wassupluke@gmail.com>
Date: Wed, 28 May 2025 22:40:05 -0500
Subject: [PATCH] add contentDescriptions, ignore unspeakable sections, minor
 code reorganization

---
 .../layout/activity_manage_widget_panels.xml  |  2 ++
 .../res/layout/activity_manage_widgets.xml    |  1 +
 .../main/res/layout/activity_pin_shortcut.xml |  1 +
 .../res/layout/activity_select_widget.xml     |  1 +
 app/src/main/res/layout/list.xml              |  8 +++--
 app/src/main/res/layout/list_other_row.xml    |  1 +
 app/src/main/res/layout/settings.xml          | 35 ++++++++++---------
 .../main/res/layout/settings_actions_row.xml  |  1 +
 app/src/main/res/layout/tutorial.xml          |  5 ++-
 app/src/main/res/values/strings.xml           | 12 +++++++
 10 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/activity_manage_widget_panels.xml b/app/src/main/res/layout/activity_manage_widget_panels.xml
index 60413a3..6c049e7 100644
--- a/app/src/main/res/layout/activity_manage_widget_panels.xml
+++ b/app/src/main/res/layout/activity_manage_widget_panels.xml
@@ -40,6 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:contentDescription="@string/close"
                 android:gravity="center"
                 android:includeFontPadding="true"
                 android:paddingLeft="16sp"
@@ -64,6 +65,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
+        android:contentDescription="@string/add_widget_panel"
         android:src="@drawable/baseline_add_24"
         app:layout_anchor="@+id/manage_widget_panels_recycler"
         app:layout_anchorGravity="end|bottom"
diff --git a/app/src/main/res/layout/activity_manage_widgets.xml b/app/src/main/res/layout/activity_manage_widgets.xml
index 66404ee..e7fe83a 100644
--- a/app/src/main/res/layout/activity_manage_widgets.xml
+++ b/app/src/main/res/layout/activity_manage_widgets.xml
@@ -20,6 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:clickable="true"
+        android:contentDescription="@string/add_widget"
         android:focusable="true"
         android:src="@drawable/baseline_add_24"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_pin_shortcut.xml b/app/src/main/res/layout/activity_pin_shortcut.xml
index 2519374..2c459f3 100644
--- a/app/src/main/res/layout/activity_pin_shortcut.xml
+++ b/app/src/main/res/layout/activity_pin_shortcut.xml
@@ -44,6 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:contentDescription="@string/close"
                 android:gravity="center"
                 android:includeFontPadding="true"
                 android:paddingLeft="16sp"
diff --git a/app/src/main/res/layout/activity_select_widget.xml b/app/src/main/res/layout/activity_select_widget.xml
index 82db94d..c8ee13b 100644
--- a/app/src/main/res/layout/activity_select_widget.xml
+++ b/app/src/main/res/layout/activity_select_widget.xml
@@ -45,6 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
+            android:contentDescription="@string/close"
             android:gravity="center"
             android:includeFontPadding="true"
             android:paddingLeft="16sp"
diff --git a/app/src/main/res/layout/list.xml b/app/src/main/res/layout/list.xml
index 8a3b5d9..50e85f3 100644
--- a/app/src/main/res/layout/list.xml
+++ b/app/src/main/res/layout/list.xml
@@ -62,6 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginStart="8dp"
+                android:contentDescription="@string/close"
                 android:gravity="center"
                 android:includeFontPadding="true"
                 android:paddingLeft="16sp"
@@ -72,6 +73,7 @@
                 app:layout_constraintTop_toTopOf="parent" />
             <ImageView
                 android:id="@+id/list_lock"
+                android:contentDescription="@string/lock"
                 android:visibility="gone"
                 tools:visibility="visible"
                 android:layout_width="wrap_content"
@@ -91,7 +93,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabIndicatorColor="?attr/colorAccent"
-            custom:tabTextColor="?attr/android:textColor" />
+            custom:tabTextColor="?attr/android:textColor"
+            tools:ignore="SpeakableTextPresentCheck" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -110,6 +113,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/list_appbar"
         app:layout_constraintVertical_bias="0.0"
-        custom:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        custom:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:ignore="SpeakableTextPresentCheck" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_other_row.xml b/app/src/main/res/layout/list_other_row.xml
index 530cc9e..78d92ae 100644
--- a/app/src/main/res/layout/list_other_row.xml
+++ b/app/src/main/res/layout/list_other_row.xml
@@ -11,6 +11,7 @@
         android:id="@+id/list_other_row_icon"
         android:layout_width="35sp"
         android:layout_height="35sp"
+        android:contentDescription="@null"
         android:gravity="center"
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 987e293..8ce1d61 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -20,6 +20,22 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+            <ImageView
+                android:id="@+id/settings_system"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:contentDescription="@string/settings"
+                android:gravity="center"
+                android:includeFontPadding="true"
+                android:paddingLeft="16sp"
+                android:paddingRight="16sp"
+                android:src="@drawable/baseline_settings_applications_24"
+                custom:layout_constraintBottom_toBottomOf="parent"
+                custom:layout_constraintStart_toStartOf="parent"
+                custom:layout_constraintTop_toTopOf="parent" />
+
             <TextView
                 android:id="@+id/settings_heading"
                 android:layout_width="wrap_content"
@@ -40,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:contentDescription="@string/close"
                 android:gravity="center"
                 android:includeFontPadding="true"
                 android:paddingLeft="16sp"
@@ -48,28 +65,14 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/settings_system"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:gravity="center"
-                android:includeFontPadding="true"
-                android:paddingLeft="16sp"
-                android:paddingRight="16sp"
-                android:src="@drawable/baseline_settings_applications_24"
-                custom:layout_constraintBottom_toBottomOf="parent"
-                custom:layout_constraintStart_toStartOf="parent"
-                custom:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/settings_tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabTextColor="?attr/android:textColor" />
+            app:tabTextColor="?attr/android:textColor"
+            tools:ignore="SpeakableTextPresentCheck" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/settings_actions_row.xml b/app/src/main/res/layout/settings_actions_row.xml
index a60a5a4..884e654 100644
--- a/app/src/main/res/layout/settings_actions_row.xml
+++ b/app/src/main/res/layout/settings_actions_row.xml
@@ -68,6 +68,7 @@
         android:id="@+id/settings_actions_row_remove"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:contentDescription="@string/settings_actions_row_button_remove"
         android:padding="8sp"
         android:src="@drawable/baseline_close_24"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml
index 5520aa1..3dc044e 100644
--- a/app/src/main/res/layout/tutorial.xml
+++ b/app/src/main/res/layout/tutorial.xml
@@ -26,6 +26,7 @@
         android:id="@+id/tutorial_button_back"
         android:layout_width="50dp"
         android:layout_height="50dp"
+        android:contentDescription="@string/navigate_back"
         android:gravity="center"
         android:alpha="0.5"
         android:src="@drawable/baseline_navigate_before_24"
@@ -43,12 +44,14 @@
         app:layout_constraintStart_toEndOf="@+id/tutorial_button_back"
         app:tabBackground="@drawable/tutorial_tab_selector"
         app:tabGravity="center"
-        app:tabIndicatorHeight="0dp" />
+        app:tabIndicatorHeight="0dp"
+        tools:ignore="SpeakableTextPresentCheck" />
 
     <ImageView
         android:id="@+id/tutorial_button_next"
         android:layout_width="50dp"
         android:layout_height="50dp"
+        android:contentDescription="@string/navigate_next"
         android:gravity="center"
         android:src="@drawable/baseline_navigate_next_24"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index baf8fea..957d3ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -444,4 +444,16 @@
     <string name="send_email">Send Email</string>
     <string name="notification_channel_crash">Crashes and Debug Information</string>
     <string name="settings_meta_view_docs">Documentation</string>
+    <!--
+      -
+      - Content Descriptions
+      -
+      -->
+    <string name="add_widget">Add widget</string>
+    <string name="add_widget_panel">Add widget panel</string>
+    <string name="close">Close</string>
+    <string name="navigate_back">Navigate back</string>
+    <string name="navigate_next">Navigate next</string>
+    <string name="lock">Lock</string>
+    <string name="settings_actions_row_button_remove">Remove app binding</string>
 </resources>