From 74c461f917709d38c2035282d9d5ff634b425991 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sat, 29 Jul 2023 22:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=C2=B7=E8=BF=9C=E7=A8=8BWOL=E5=94=A4=E9=86=92?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20#328?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/fragment_client_wol_send.xml   | 264 +++++++++---------
 app/src/main/res/values-en/strings.xml        |   3 +-
 app/src/main/res/values/strings.xml           |   5 +-
 3 files changed, 137 insertions(+), 135 deletions(-)

diff --git a/app/src/main/res/layout/fragment_client_wol_send.xml b/app/src/main/res/layout/fragment_client_wol_send.xml
index 74d84a20..e839a457 100644
--- a/app/src/main/res/layout/fragment_client_wol_send.xml
+++ b/app/src/main/res/layout/fragment_client_wol_send.xml
@@ -1,133 +1,133 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/xui_config_color_background"
-    android:orientation="vertical">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:overScrollMode="never">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="250dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:contentDescription="@string/api_wol"
-                app:srcCompat="@drawable/icon_api_wol" />
-
-            <LinearLayout
-                style="@style/senderBarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/mac" />
-
-                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
-                    android:id="@+id/et_mac"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/mac_hint"
-                    android:singleLine="true"
-                    app:met_clearButton="true"
-                    app:met_errorMessage="@string/mac_error"
-                    app:met_regexp="@string/mac_regex"
-                    app:met_validateOnFocusLost="true" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                style="@style/senderBarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ip" />
-
-                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
-                    android:id="@+id/et_ip"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/ip_hint"
-                    android:singleLine="true"
-                    app:met_clearButton="true"
-                    app:met_errorMessage="@string/ip_error"
-                    app:met_regexp="@string/ip_regex"
-                    app:met_validateOnFocusLost="true" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                style="@style/senderBarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/port" />
-
-                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
-                    android:id="@+id/et_port"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/wol_port_hint"
-                    android:singleLine="true"
-                    android:value="9"
-                    app:met_clearButton="true"
-                    app:met_errorMessage="@string/wol_port_error"
-                    app:met_regexp="@string/wol_port_regex"
-                    app:met_validateOnFocusLost="true" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="10dp">
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_server_history"
-            style="@style/SuperButton.Gray.Icon"
-            android:drawableStart="@drawable/ic_restore"
-            android:paddingStart="7dp"
-            android:text="@string/server_history"
-            tools:ignore="RtlSymmetry" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_submit"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="20dp"
-            android:drawableStart="@drawable/ic_send_white"
-            android:paddingStart="20dp"
-            android:text="@string/send"
-            tools:ignore="RtlSymmetry" />
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/xui_config_color_background"
+    android:orientation="vertical">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:overScrollMode="never">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="250dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:contentDescription="@string/api_wol"
+                app:srcCompat="@drawable/icon_api_wol" />
+
+            <LinearLayout
+                style="@style/senderBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/mac" />
+
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
+                    android:id="@+id/et_mac"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/mac_hint"
+                    android:singleLine="true"
+                    app:met_clearButton="true"
+                    app:met_errorMessage="@string/mac_error"
+                    app:met_regexp="@string/mac_regex"
+                    app:met_validateOnFocusLost="true" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/senderBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/broadcast_address" />
+
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
+                    android:id="@+id/et_ip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/ip_hint"
+                    android:singleLine="true"
+                    app:met_clearButton="true"
+                    app:met_errorMessage="@string/ip_error"
+                    app:met_regexp="@string/ip_regex"
+                    app:met_validateOnFocusLost="true" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                style="@style/senderBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/port" />
+
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
+                    android:id="@+id/et_port"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/wol_port_hint"
+                    android:singleLine="true"
+                    android:value="9"
+                    app:met_clearButton="true"
+                    app:met_errorMessage="@string/wol_port_error"
+                    app:met_regexp="@string/wol_port_regex"
+                    app:met_validateOnFocusLost="true" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
+            android:id="@+id/btn_server_history"
+            style="@style/SuperButton.Gray.Icon"
+            android:drawableStart="@drawable/ic_restore"
+            android:paddingStart="7dp"
+            android:text="@string/server_history"
+            tools:ignore="RtlSymmetry" />
+
+        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
+            android:id="@+id/btn_submit"
+            style="@style/SuperButton.Blue.Icon"
+            android:layout_marginStart="20dp"
+            android:drawableStart="@drawable/ic_send_white"
+            android:paddingStart="20dp"
+            android:text="@string/send"
+            tools:ignore="RtlSymmetry" />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index a9725ef8..7bec74a2 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -991,12 +991,13 @@
     <string name="appsecret">AppSecret</string>
     <string name="sampleText">Text</string>
     <string name="sampleMarkdown">Markdown</string>
-    <string name="ip_hint">IP address/broadcast address, eg. 192.168.1.255</string>
+    <string name="ip_hint">Broadcast Address, eg. 192.168.1.255</string>
     <string name="ip_error">Malformed IP address, eg. 192.168.168.168</string>
     <string name="ip_regex" tools:ignore="TypographyDashes">^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])$</string>
     <string name="mac_hint">Network card mac, eg. AA:BB:CC:DD:EE:FF</string>
     <string name="mac_error">The network card mac format is incorrect, eg. AA:BB:CC:DD:EE:FF</string>
     <string name="mac_regex" tools:ignore="TypographyDashes">^((([a-fA-F0-9]{2}:){5})|(([a-fA-F0-9]{2}-){5}))[a-fA-F0-9]{2}$</string>
+    <string name="broadcast_address">Broadcast Address</string>
     <string name="ip">IP</string>
     <string name="mac">MAC</string>
     <string name="no_wol_history">There is no history record, WOL will be added automatically after successful sending</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 119f905a..cd34f449 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -992,13 +992,14 @@
     <string name="appsecret">AppSecret</string>
     <string name="sampleText">文本类型</string>
     <string name="sampleMarkdown">Markdown类型</string>
-    <string name="ip_hint">可选，主机IP/广播地址，例如：192.168.1.255</string>
+    <string name="ip_hint">可选，内网广播地址，例如：192.168.1.255</string>
     <string name="ip_error">IP地址格式错误，例如：192.168.168.168</string>
     <string name="ip_regex" tools:ignore="TypographyDashes">^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])$</string>
     <string name="mac_hint">必填，网卡mac，例如：AA:BB:CC:DD:EE:FF</string>
     <string name="mac_error">网卡mac格式错误，例如：AA:BB:CC:DD:EE:FF</string>
     <string name="mac_regex" tools:ignore="TypographyDashes">^((([a-fA-F0-9]{2}:){5})|(([a-fA-F0-9]{2}-){5}))[a-fA-F0-9]{2}$</string>
-    <string name="ip">主机IP/广播地址</string>
+    <string name="broadcast_address">内网广播地址</string>
+    <string name="ip">IP</string>
     <string name="mac">网卡MAC</string>
     <string name="no_wol_history">暂无历史记录，WOL发送成功后自动加入</string>
     <string name="wol_port_hint">可选，WOL一般透过端口7或端口9进行发送</string>