From 522d6796a6e411ad76c73e345a9288d929813327 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 19 May 2021 23:10:59 -0400
Subject: [PATCH] Refine accessibility

---
 ...ompleteEditTextPreferenceDialogFragment.kt |  6 +++++-
 mobile/src/main/res/layout/dialog_wifi_ap.xml | 20 +++++++++++--------
 mobile/src/main/res/layout/dialog_wps.xml     |  7 +++++--
 .../src/main/res/layout/fragment_clients.xml  |  1 +
 mobile/src/main/res/layout/fragment_ebeg.xml  |  2 ++
 mobile/src/main/res/values/dimen.xml          |  1 +
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/preference/AlwaysAutoCompleteEditTextPreferenceDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/preference/AlwaysAutoCompleteEditTextPreferenceDialogFragment.kt
index 74947d35..c1fce475 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/preference/AlwaysAutoCompleteEditTextPreferenceDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/preference/AlwaysAutoCompleteEditTextPreferenceDialogFragment.kt
@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.core.os.bundleOf
 import androidx.preference.EditTextPreferenceDialogFragmentCompat
+import be.mygod.vpnhotspot.R
 import be.mygod.vpnhotspot.widget.AlwaysAutoCompleteEditText
 
 class AlwaysAutoCompleteEditTextPreferenceDialogFragment : EditTextPreferenceDialogFragmentCompat() {
@@ -20,7 +21,10 @@ class AlwaysAutoCompleteEditTextPreferenceDialogFragment : EditTextPreferenceDia
     private lateinit var editText: AlwaysAutoCompleteEditText
 
     override fun onCreateDialogView(context: Context) = super.onCreateDialogView(context).apply {
-        editText = AlwaysAutoCompleteEditText(context).apply { id = android.R.id.edit }
+        editText = AlwaysAutoCompleteEditText(context).apply {
+            id = android.R.id.edit
+            minHeight = resources.getDimensionPixelSize(R.dimen.touch_target_min)
+        }
         val oldEditText = findViewById<View>(android.R.id.edit)!!
         val container = oldEditText.parent as ViewGroup
         container.removeView(oldEditText)
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index bd01d2c8..9d44a04a 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -21,7 +21,6 @@
               android:layout_width="300sp"
               android:layout_height="wrap_content"
               android:orientation="vertical">
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -67,9 +66,10 @@
                     android:text="@string/wifi_security" />
                 <Spinner
                     android:id="@+id/security"
+                    style="@style/wifi_item_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
+                    android:minHeight="@dimen/touch_target_min"
                     android:prompt="@string/wifi_security" />
             </LinearLayout>
             <com.google.android.material.textfield.TextInputLayout
@@ -95,10 +95,11 @@
             </com.google.android.material.textfield.TextInputLayout>
             <Switch
                 android:id="@+id/auto_shutdown"
+                style="@style/wifi_item_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
-                style="@style/wifi_item_label"
+                android:minHeight="@dimen/touch_target_min"
                 android:text="@string/wifi_hotspot_auto_off"/>
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/timeout_wrapper"
@@ -131,9 +132,10 @@
                     android:text="@string/wifi_hotspot_ap_band_title" />
                 <Spinner
                     android:id="@+id/band"
+                    style="@style/wifi_item_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
+                    android:minHeight="@dimen/touch_target_min"
                     android:prompt="@string/wifi_hotspot_ap_band_title" />
             </LinearLayout>
             <com.google.android.material.textfield.TextInputLayout
@@ -155,11 +157,12 @@
             </com.google.android.material.textfield.TextInputLayout>
             <Switch
                 android:id="@+id/hidden_ssid"
+                style="@style/wifi_item_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
-                style="@style/wifi_item_label"
-                android:text="@string/wifi_hidden_network"/>
+                android:minHeight="@dimen/touch_target_min"
+                android:text="@string/wifi_hidden_network" />
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/max_client_wrapper"
                 android:layout_width="match_parent"
@@ -179,11 +182,12 @@
             </com.google.android.material.textfield.TextInputLayout>
             <Switch
                 android:id="@+id/client_user_control"
+                style="@style/wifi_item_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
-                style="@style/wifi_item_label"
-                android:text="@string/wifi_client_user_control"/>
+                android:minHeight="@dimen/touch_target_min"
+                android:text="@string/wifi_client_user_control" />
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/blocked_list_wrapper"
                 android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/dialog_wps.xml b/mobile/src/main/res/layout/dialog_wps.xml
index e52ffe91..0ec188b3 100644
--- a/mobile/src/main/res/layout/dialog_wps.xml
+++ b/mobile/src/main/res/layout/dialog_wps.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:viewBindingIgnore="true">
+
     <EditText
         android:id="@android:id/edit"
         android:layout_width="match_parent"
@@ -12,10 +13,12 @@
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
         android:hint="@null"
-        android:inputType="number"
         android:imeOptions="flagNoExtractUi"
         android:importantForAutofill="no"
+        android:inputType="number"
+        android:minHeight="@dimen/touch_target_min"
         tools:text="12345678">
-        <requestFocus/>
+
+        <requestFocus />
     </EditText>
 </FrameLayout>
diff --git a/mobile/src/main/res/layout/fragment_clients.xml b/mobile/src/main/res/layout/fragment_clients.xml
index e8b369e3..0863c13b 100644
--- a/mobile/src/main/res/layout/fragment_clients.xml
+++ b/mobile/src/main/res/layout/fragment_clients.xml
@@ -12,5 +12,6 @@
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:scrollbars="vertical"
+        android:contentDescription="@string/title_clients"
         tools:listitem="@layout/listitem_client"/>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/mobile/src/main/res/layout/fragment_ebeg.xml b/mobile/src/main/res/layout/fragment_ebeg.xml
index ef6dffde..deb5090a 100644
--- a/mobile/src/main/res/layout/fragment_ebeg.xml
+++ b/mobile/src/main/res/layout/fragment_ebeg.xml
@@ -56,6 +56,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:contentDescription="@string/donations__google_android_market_text"
                     android:prompt="@string/donations__google_android_market_text" />
 
                 <Button
diff --git a/mobile/src/main/res/values/dimen.xml b/mobile/src/main/res/values/dimen.xml
index 85625e72..cf3c51ee 100644
--- a/mobile/src/main/res/values/dimen.xml
+++ b/mobile/src/main/res/values/dimen.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="touch_target_min">48dp</dimen>
     <dimen name="listitem_manage_tether_padding_start">56dp</dimen>
     <dimen name="qrcode_size">264dp</dimen>
 </resources>