brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add section headers to wifi ap config dialog

Browse Source
This commit is contained in:
Mygod
2021-07-10 20:37:33 -04:00
parent 26759753dd
commit f7a2507e79
6 changed files with 206 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/build.gradle.kts
View File

@@ -83,7 +83,7 @@ dependencies {
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.android.billingclient:billing-ktx:4.0.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.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-analytics-ktx:19.0.0")
implementation("com.google.firebase:firebase-crashlytics:18.1.0") implementation("com.google.firebase:firebase-crashlytics:18.1.0")
implementation("com.google.zxing:core:3.4.1") implementation("com.google.zxing:core:3.4.1")

27
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
View File

@@ -177,31 +177,24 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
if (Build.VERSION.SDK_INT >= 23 || arg.p2pMode) { if (Build.VERSION.SDK_INT >= 23 || arg.p2pMode) {
dialogView.band2G.configure(channels2G) dialogView.band2G.configure(channels2G)
dialogView.band5G.configure(currentChannels5G) 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) if (Build.VERSION.SDK_INT >= 30 && !arg.p2pMode) dialogView.band6G.configure(channels6G)
else dialogView.bandWrapper6G.isGone = true else dialogView.bandWrapper6G.isGone = true
if (BuildCompat.isAtLeastS() && !arg.p2pMode) dialogView.band60G.configure(channels60G) if (BuildCompat.isAtLeastS() && !arg.p2pMode) dialogView.band60G.configure(channels60G) else {
else dialogView.bandWrapper60G.isGone = true dialogView.bandWrapper60G.isGone = true
dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment) dialogView.bridgedMode.isGone = true
if (arg.p2pMode) dialogView.hiddenSsid.isGone = true dialogView.bridgedModeOpportunisticShutdown.isGone = true
if (arg.p2pMode || Build.VERSION.SDK_INT < 30) { }
dialogView.maxClientWrapper.isGone = true } else dialogView.bandGroup.isGone = true
dialogView.clientUserControl.isGone = true if (!arg.p2pMode && Build.VERSION.SDK_INT >= 30) {
dialogView.blockedListWrapper.isGone = true
dialogView.allowedListWrapper.isGone = true
} else {
dialogView.maxClient.addTextChangedListener(this@WifiApDialogFragment) dialogView.maxClient.addTextChangedListener(this@WifiApDialogFragment)
dialogView.blockedList.addTextChangedListener(this@WifiApDialogFragment) dialogView.blockedList.addTextChangedListener(this@WifiApDialogFragment)
dialogView.allowedList.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 if (arg.p2pMode && Build.VERSION.SDK_INT >= 29) dialogView.macRandomization.isEnabled = false
else if (arg.p2pMode || !BuildCompat.isAtLeastS()) dialogView.macRandomization.isGone = true else if (arg.p2pMode || !BuildCompat.isAtLeastS()) dialogView.macRandomization.isGone = true
if (arg.p2pMode || !BuildCompat.isAtLeastS()) { if (arg.p2pMode || !BuildCompat.isAtLeastS()) {
dialogView.bridgedMode.isGone = true
dialogView.bridgedModeOpportunisticShutdown.isGone = true
dialogView.ieee80211ax.isGone = true dialogView.ieee80211ax.isGone = true
dialogView.userConfig.isGone = true dialogView.userConfig.isGone = true
} }

110
mobile/src/main/res/layout/dialog_wifi_ap.xml
View File

@@ -121,15 +121,25 @@
android:inputType="number" android:inputType="number"
android:maxLength="19" /> android:maxLength="19" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<LinearLayout <LinearLayout
android:id="@+id/band_wrapper_2G" android:id="@+id/band_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:orientation="vertical"> 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 <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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" style="@style/wifi_item_label"
android:text="@string/wifi_ap_choose_2G" /> android:text="@string/wifi_ap_choose_2G" />
<Spinner <Spinner
@@ -139,16 +149,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/touch_target_min" android:minHeight="@dimen/touch_target_min"
android:prompt="@string/wifi_ap_choose_2G" /> 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 <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/wifi_ap_choose_5G" /> android:text="@string/wifi_ap_choose_5G" />
<Spinner <Spinner
@@ -158,7 +162,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/touch_target_min" android:minHeight="@dimen/touch_target_min"
android:prompt="@string/wifi_ap_choose_5G" /> android:prompt="@string/wifi_ap_choose_5G" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/band_wrapper_6G" android:id="@+id/band_wrapper_6G"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -213,39 +216,22 @@
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:minHeight="@dimen/touch_target_min" android:minHeight="@dimen/touch_target_min"
android:text="@string/wifi_bridged_mode_opportunistic_shutdown" /> android:text="@string/wifi_bridged_mode_opportunistic_shutdown" />
<com.google.android.material.textfield.TextInputLayout </LinearLayout>
android:id="@+id/bssid_wrapper"
<LinearLayout
android:id="@+id/access_control_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" android:orientation="vertical">
app:counterEnabled="true" <com.google.android.material.divider.MaterialDivider
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_divider" />
android:inputType="textNoSuggestions" <TextView
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" style="@style/wifi_item_subhead"
android:minHeight="@dimen/touch_target_min" android:text="@string/wifi_hotspot_access_control_title" />
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 <com.google.android.material.textfield.TextInputLayout
android:id="@+id/max_client_wrapper" android:id="@+id/max_client_wrapper"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -299,6 +285,55 @@
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:inputType="textMultiLine|textNoSuggestions" /> android:inputType="textMultiLine|textNoSuggestions" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/advanced_ap_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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: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" />
<Switch <Switch
android:id="@+id/ieee_80211ax" android:id="@+id/ieee_80211ax"
style="@style/wifi_item_label" style="@style/wifi_item_label"
@@ -316,5 +351,6 @@
android:minHeight="@dimen/touch_target_min" android:minHeight="@dimen/touch_target_min"
android:text="@string/wifi_user_config" /> android:text="@string/wifi_user_config" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

2
mobile/src/main/res/values-zh-rCN/strings.xml
View File

@@ -185,6 +185,8 @@
<string name="wifi_ap_choose_5G" msgid="8813128641914385634">"5 GHz 频段"</string> <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_6G">6 GHz 频段</string>
<string name="wifi_ap_choose_60G">60 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_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
<string name="wifi_hidden_network" msgid="973162091800925000">"隐藏的网络"</string> <string name="wifi_hidden_network" msgid="973162091800925000">"隐藏的网络"</string>
<string name="wifi_max_clients">允许连接设备数上限</string> <string name="wifi_max_clients">允许连接设备数上限</string>

2
mobile/src/main/res/values/strings.xml
View File

@@ -208,6 +208,8 @@
<string name="wifi_ap_choose_5G">5 GHz Band</string> <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_6G">6 GHz Band</string>
<string name="wifi_ap_choose_60G">60 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_advanced_mac_address_title">MAC address</string>
<string name="wifi_hidden_network">Hidden network</string> <string name="wifi_hidden_network">Hidden network</string>
<string name="wifi_max_clients">Maximum number of clients</string> <string name="wifi_max_clients">Maximum number of clients</string>

11
mobile/src/main/res/values/styles.xml
View File

@@ -43,5 +43,16 @@
<item name="android:layout_marginStart">4dip</item> <item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </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> </resources>