From f7a2507e797d4da5c1093a25ad59db0f5f935410 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 10 Jul 2021 20:37:33 -0400
Subject: [PATCH] Add section headers to wifi ap config dialog

---
 mobile/build.gradle.kts                       |   2 +-
 .../net/wifi/WifiApDialogFragment.kt          |  31 +-
 mobile/src/main/res/layout/dialog_wifi_ap.xml | 320 ++++++++++--------
 mobile/src/main/res/values-zh-rCN/strings.xml |   2 +
 mobile/src/main/res/values/strings.xml        |   2 +
 mobile/src/main/res/values/styles.xml         |  11 +
 6 files changed, 206 insertions(+), 162 deletions(-)

diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 836bce8e..ac996760 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -83,7 +83,7 @@ dependencies {
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("com.android.billingclient:billing-ktx:4.0.0")
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
-    implementation("com.google.android.material:material:1.4.0")
+    implementation("com.google.android.material:material:1.5.0-alpha01")
     implementation("com.google.firebase:firebase-analytics-ktx:19.0.0")
     implementation("com.google.firebase:firebase-crashlytics:18.1.0")
     implementation("com.google.zxing:core:3.4.1")
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
index 2307253c..4a280766 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
@@ -177,31 +177,24 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
         if (Build.VERSION.SDK_INT >= 23 || arg.p2pMode) {
             dialogView.band2G.configure(channels2G)
             dialogView.band5G.configure(currentChannels5G)
-        } else {
-            dialogView.bandWrapper2G.isGone = true
-            dialogView.bandWrapper5G.isGone = true
-        }
-        if (Build.VERSION.SDK_INT >= 30 && !arg.p2pMode) dialogView.band6G.configure(channels6G)
-        else dialogView.bandWrapper6G.isGone = true
-        if (BuildCompat.isAtLeastS() && !arg.p2pMode) dialogView.band60G.configure(channels60G)
-        else dialogView.bandWrapper60G.isGone = true
-        dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
-        if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
-        if (arg.p2pMode || Build.VERSION.SDK_INT < 30) {
-            dialogView.maxClientWrapper.isGone = true
-            dialogView.clientUserControl.isGone = true
-            dialogView.blockedListWrapper.isGone = true
-            dialogView.allowedListWrapper.isGone = true
-        } else {
+            if (Build.VERSION.SDK_INT >= 30 && !arg.p2pMode) dialogView.band6G.configure(channels6G)
+            else dialogView.bandWrapper6G.isGone = true
+            if (BuildCompat.isAtLeastS() && !arg.p2pMode) dialogView.band60G.configure(channels60G) else {
+                dialogView.bandWrapper60G.isGone = true
+                dialogView.bridgedMode.isGone = true
+                dialogView.bridgedModeOpportunisticShutdown.isGone = true
+            }
+        } else dialogView.bandGroup.isGone = true
+        if (!arg.p2pMode && Build.VERSION.SDK_INT >= 30) {
             dialogView.maxClient.addTextChangedListener(this@WifiApDialogFragment)
             dialogView.blockedList.addTextChangedListener(this@WifiApDialogFragment)
             dialogView.allowedList.addTextChangedListener(this@WifiApDialogFragment)
-        }
+        } else dialogView.accessControlGroup.isGone = true
+        dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
+        if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
         if (arg.p2pMode && Build.VERSION.SDK_INT >= 29) dialogView.macRandomization.isEnabled = false
         else if (arg.p2pMode || !BuildCompat.isAtLeastS()) dialogView.macRandomization.isGone = true
         if (arg.p2pMode || !BuildCompat.isAtLeastS()) {
-            dialogView.bridgedMode.isGone = true
-            dialogView.bridgedModeOpportunisticShutdown.isGone = true
             dialogView.ieee80211ax.isGone = true
             dialogView.userConfig.isGone = true
         }
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index 650b82a5..cff941e6 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -121,15 +121,25 @@
                     android:inputType="number"
                     android:maxLength="19" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <LinearLayout
-                android:id="@+id/band_wrapper_2G"
+                android:id="@+id/band_group"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
                 android:orientation="vertical">
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item_divider" />
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    style="@style/wifi_item_subhead"
+                    android:text="@string/wifi_hotspot_ap_band_title" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
                     style="@style/wifi_item_label"
                     android:text="@string/wifi_ap_choose_2G" />
                 <Spinner
@@ -139,16 +149,10 @@
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/touch_target_min"
                     android:prompt="@string/wifi_ap_choose_2G" />
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/band_wrapper_5G"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:orientation="vertical">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
                     style="@style/wifi_item_label"
                     android:text="@string/wifi_ap_choose_5G" />
                 <Spinner
@@ -158,163 +162,195 @@
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/touch_target_min"
                     android:prompt="@string/wifi_ap_choose_5G" />
+                <LinearLayout
+                    android:id="@+id/band_wrapper_6G"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_ap_choose_6G" />
+                    <Spinner
+                        android:id="@+id/band_6G"
+                        style="@style/wifi_item_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="@dimen/touch_target_min"
+                        android:prompt="@string/wifi_ap_choose_6G" />
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/band_wrapper_60G"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_ap_choose_60G" />
+                    <Spinner
+                        android:id="@+id/band_60G"
+                        style="@style/wifi_item_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="@dimen/touch_target_min"
+                        android:prompt="@string/wifi_ap_choose_60G" />
+                </LinearLayout>
+                <Switch
+                    android:id="@+id/bridged_mode"
+                    style="@style/wifi_item_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_bridged_mode" />
+                <Switch
+                    android:id="@+id/bridged_mode_opportunistic_shutdown"
+                    style="@style/wifi_item_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_bridged_mode_opportunistic_shutdown" />
             </LinearLayout>
+
             <LinearLayout
-                android:id="@+id/band_wrapper_6G"
+                android:id="@+id/access_control_group"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
                 android:orientation="vertical">
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item_divider" />
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:text="@string/wifi_ap_choose_6G" />
-                <Spinner
-                    android:id="@+id/band_6G"
-                    style="@style/wifi_item_content"
+                    style="@style/wifi_item_subhead"
+                    android:text="@string/wifi_hotspot_access_control_title" />
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/max_client_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    app:counterEnabled="true"
+                    app:counterMaxLength="10"
+                    app:errorEnabled="true"
+                    android:hint="@string/wifi_max_clients">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/max_client"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:inputType="number"
+                        android:maxLength="10" />
+                </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"
                     android:minHeight="@dimen/touch_target_min"
-                    android:prompt="@string/wifi_ap_choose_6G" />
+                    android:text="@string/wifi_client_user_control" />
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/blocked_list_wrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:hint="@string/wifi_blocked_list"
+                    app:errorEnabled="true">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/blocked_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:inputType="textMultiLine|textNoSuggestions" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/allowed_list_wrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:hint="@string/wifi_allowed_list"
+                    app:errorEnabled="true">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/allowed_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:inputType="textMultiLine|textNoSuggestions" />
+                </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
+
             <LinearLayout
-                android:id="@+id/band_wrapper_60G"
+                android:id="@+id/advanced_ap_group"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
                 android:orientation="vertical">
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item_divider" />
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    style="@style/wifi_item_subhead"
+                    android:text="@string/wifi_hotspot_ap_advanced_title" />
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/bssid_wrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    app:counterEnabled="true"
+                    app:counterMaxLength="17"
+                    app:errorEnabled="true"
+                    android:hint="@string/wifi_advanced_mac_address_title">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/bssid"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:inputType="textNoSuggestions"
+                        android:maxLength="17" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <Switch
+                    android:id="@+id/mac_randomization"
                     style="@style/wifi_item_label"
-                    android:text="@string/wifi_ap_choose_60G" />
-                <Spinner
-                    android:id="@+id/band_60G"
-                    style="@style/wifi_item_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
-                    android:prompt="@string/wifi_ap_choose_60G" />
+                    android:text="@string/wifi_mac_randomization" />
+                <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"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_hidden_network" />
+                <Switch
+                    android:id="@+id/ieee_80211ax"
+                    style="@style/wifi_item_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_ieee_80211ax" />
+                <Switch
+                    android:id="@+id/user_config"
+                    style="@style/wifi_item_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_user_config" />
             </LinearLayout>
-            <Switch
-                android:id="@+id/bridged_mode"
-                style="@style/wifi_item_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:minHeight="@dimen/touch_target_min"
-                android:text="@string/wifi_bridged_mode" />
-            <Switch
-                android:id="@+id/bridged_mode_opportunistic_shutdown"
-                style="@style/wifi_item_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:minHeight="@dimen/touch_target_min"
-                android:text="@string/wifi_bridged_mode_opportunistic_shutdown" />
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/bssid_wrapper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                app:counterEnabled="true"
-                app:counterMaxLength="17"
-                app:errorEnabled="true"
-                android:hint="@string/wifi_advanced_mac_address_title">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/bssid"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:inputType="textNoSuggestions"
-                    android:maxLength="17" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <Switch
-                android:id="@+id/mac_randomization"
-                style="@style/wifi_item_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:minHeight="@dimen/touch_target_min"
-                android:text="@string/wifi_mac_randomization" />
-            <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"
-                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"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                app:counterEnabled="true"
-                app:counterMaxLength="10"
-                app:errorEnabled="true"
-                android:hint="@string/wifi_max_clients">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/max_client"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:inputType="number"
-                    android:maxLength="10" />
-            </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"
-                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"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:hint="@string/wifi_blocked_list"
-                app:errorEnabled="true">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/blocked_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:inputType="textMultiLine|textNoSuggestions" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/allowed_list_wrapper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:hint="@string/wifi_allowed_list"
-                app:errorEnabled="true">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/allowed_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:inputType="textMultiLine|textNoSuggestions" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <Switch
-                android:id="@+id/ieee_80211ax"
-                style="@style/wifi_item_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:minHeight="@dimen/touch_target_min"
-                android:text="@string/wifi_ieee_80211ax" />
-            <Switch
-                android:id="@+id/user_config"
-                style="@style/wifi_item_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:minHeight="@dimen/touch_target_min"
-                android:text="@string/wifi_user_config" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index fb3af0f6..1e7be6c6 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -185,6 +185,8 @@
     <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"5 GHz 频段"</string>
     <string name="wifi_ap_choose_6G">6 GHz 频段</string>
     <string name="wifi_ap_choose_60G">60 GHz 频段</string>
+    <string name="wifi_hotspot_access_control_title">访问控制</string>
+    <string name="wifi_hotspot_ap_advanced_title">高级接入点设置</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
     <string name="wifi_hidden_network" msgid="973162091800925000">"隐藏的网络"</string>
     <string name="wifi_max_clients">允许连接设备数上限</string>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index fe9c1dbd..0fbfb5fc 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -208,6 +208,8 @@
     <string name="wifi_ap_choose_5G">5 GHz Band</string>
     <string name="wifi_ap_choose_6G">6 GHz Band</string>
     <string name="wifi_ap_choose_60G">60 GHz Band</string>
+    <string name="wifi_hotspot_access_control_title">Access Control</string>
+    <string name="wifi_hotspot_ap_advanced_title">Advanced AP Options</string>
     <string name="wifi_advanced_mac_address_title">MAC address</string>
     <string name="wifi_hidden_network">Hidden network</string>
     <string name="wifi_max_clients">Maximum number of clients</string>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 013d57fa..8f249d97 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -43,5 +43,16 @@
         <item name="android:layout_marginStart">4dip</item>
         <item name="android:textSize">18sp</item>
     </style>
+    <style name="wifi_item_divider">
+        <item name="dividerInsetStart">8dip</item>
+        <item name="android:layout_marginTop">8dip</item>
+    </style>
+    <style name="wifi_item_subhead">
+        <item name="android:layout_marginTop">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:textStyle">bold</item>
+    </style>
 
 </resources>