From 565175adea91f69d5df5c47e4c0cd3c66d4acf44 Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Wed, 6 Apr 2022 14:14:07 +0200
Subject: [PATCH] a11y: fix dropdown accesibility and style

---
 .../main/res/layout/dialog_profileswitch.xml   |  9 +++------
 app/src/main/res/layout/dialog_wizard.xml      | 11 ++++-------
 app/src/main/res/layout/food_fragment.xml      | 18 ++++++------------
 .../main/res/layout/localprofile_fragment.xml  |  9 +++------
 .../main/res/layout/danar_history_activity.xml |  9 +++------
 .../res/layout/diaconn_g8_history_activity.xml | 13 +++++--------
 6 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 7be36c1592..5edc52abe7 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -51,16 +51,13 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="5dp"
-            android:hint="@string/profile"
-            app:boxStrokeColor="@color/list_delimiter">
+            android:hint="@string/profile">
 
-            <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+            <com.google.android.material.textfield.MaterialAutoCompleteTextView
                 android:id="@+id/profileList"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:clickable="true"
-                android:enabled="false"
-                tools:ignore="KeyboardInaccessibleWidget" />
+                android:inputType="none" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index cc6e9e4d0e..91b2bd2a4d 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -407,18 +407,15 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:layout_marginEnd="5dp"
-                    android:hint="@string/profile"
-                    android:paddingStart="7dp"
                     android:layout_weight="0.5"
-                    app:boxStrokeColor="@color/list_delimiter">
+                    android:hint="@string/profile"
+                    android:paddingStart="7dp">
 
-                    <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView
                         android:id="@+id/profileList"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:clickable="true"
-                        android:enabled="false"
-                        tools:ignore="KeyboardInaccessibleWidget" />
+                        android:inputType="none" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/food_fragment.xml b/app/src/main/res/layout/food_fragment.xml
index b27b57f88d..9c6ac6a171 100644
--- a/app/src/main/res/layout/food_fragment.xml
+++ b/app/src/main/res/layout/food_fragment.xml
@@ -49,16 +49,13 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
-        android:hint="@string/category"
-        app:boxStrokeColor="@color/list_delimiter">
+        android:hint="@string/category">
 
-        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/categoryList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:enabled="false"
-            tools:ignore="KeyboardInaccessibleWidget" />
+            android:inputType="none" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -68,16 +65,13 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
-        android:hint="@string/subcategory"
-        app:boxStrokeColor="@color/list_delimiter">
+        android:hint="@string/subcategory">
 
-        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/subcategoryList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:enabled="false"
-            tools:ignore="KeyboardInaccessibleWidget" />
+            android:inputType="none" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 97f427bb1a..b1ae2ca816 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -30,16 +30,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
-                android:hint="@string/select_profile"
-                app:boxStrokeColor="@color/list_delimiter">
+                android:hint="@string/select_profile">
 
-                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView
                     android:id="@+id/profileList"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:enabled="false"
-                    tools:ignore="KeyboardInaccessibleWidget" />
+                    android:inputType="none" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/dana/src/main/res/layout/danar_history_activity.xml
index e558510bb4..7ad697e463 100644
--- a/dana/src/main/res/layout/danar_history_activity.xml
+++ b/dana/src/main/res/layout/danar_history_activity.xml
@@ -51,26 +51,23 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:id="@+id/typeListLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:hint="@string/eventtype"
-        app:boxStrokeColor="@color/list_delimiter"
         app:layout_constraintBottom_toTopOf="@+id/status"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/header">
 
-        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/typeList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:enabled="false"
-            tools:ignore="KeyboardInaccessibleWidget" />
+            android:inputType="none" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
index 2e5280bcb5..f6af405c5b 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -45,23 +45,20 @@
         android:padding="5dp" />
 
     <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:id="@+id/typeListLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/spacer"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
-        android:hint="@string/eventtype"
-        android:layout_below="@+id/spacer"
-        app:boxStrokeColor="@color/list_delimiter" >
+        android:hint="@string/eventtype">
 
-        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/typeList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:enabled="false"
-            tools:ignore="KeyboardInaccessibleWidget" />
+            android:inputType="none" />
 
     </com.google.android.material.textfield.TextInputLayout>