From 404c9040d1dd5f9d3a9da9402a827209071d1d01 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 7 Jul 2022 14:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9AAndroid=204.4=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=EF=BC=88410=E6=A3=92=E5=AD=90?=
 =?UTF-8?q?=EF=BC=89=20#180?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_copy.xml       |  7 ++++---
 app/src/main/res/layout/fragment_server.xml | 23 ++++++++++++++++++---
 app/src/main/res/values-en/strings.xml      |  1 +
 app/src/main/res/values/strings.xml         |  1 +
 versions.gradle                             |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index d0dff183..06f4c9a6 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@android:color/white"
         android:pathData="M18,2H9C7.9,2 7,2.9 7,4v12c0,1.1 0.9,2 2,2h9c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM18,16H9V4h9V16zM3,15v-2h2v2H3zM3,9.5h2v2H3V9.5zM10,20h2v2h-2V20zM3,18.5v-2h2v2H3zM5,22c-1.1,0 -2,-0.9 -2,-2h2V22zM8.5,22h-2v-2h2V22zM13.5,22L13.5,22l0,-2h2v0C15.5,21.1 14.6,22 13.5,22zM5,6L5,6l0,2H3v0C3,6.9 3.9,6 5,6z" />
 </vector>
diff --git a/app/src/main/res/layout/fragment_server.xml b/app/src/main/res/layout/fragment_server.xml
index 3e7f0725..b452baa9 100644
--- a/app/src/main/res/layout/fragment_server.xml
+++ b/app/src/main/res/layout/fragment_server.xml
@@ -44,7 +44,8 @@
                 style="@style/settingBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingEnd="15dp">
+                android:paddingEnd="15dp"
+                tools:ignore="RtlSymmetry">
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -94,7 +95,7 @@
                             android:textSize="10sp"
                             tools:ignore="SmallSp" />
 
-                        <ImageView
+                        <!--<ImageView
                             android:id="@+id/iv_copy"
                             android:layout_width="@dimen/config_margin_16dp"
                             android:layout_height="@dimen/config_margin_16dp"
@@ -102,7 +103,23 @@
                             android:src="@drawable/ic_copy"
                             android:visibility="gone"
                             app:tint="@color/colorStart"
-                            tools:ignore="ContentDescription" />
+                            tools:ignore="ContentDescription" />-->
+
+                        <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
+                            android:id="@+id/iv_copy"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:gravity="center"
+                            android:padding="3dp"
+                            android:text="@string/copy"
+                            android:textColor="@color/white"
+                            android:textSize="10sp"
+                            app:sb_color_unpressed="@color/colorStart"
+                            app:sb_ripple_color="@color/white"
+                            app:sb_ripple_duration="500"
+                            app:sb_shape_type="rectangle"
+                            tools:ignore="SmallSp" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4a93028f..31d96cba 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -762,6 +762,7 @@
     <string name="server_settings_tips">It is recommended to enable signature settings, click "Random" to generate and copy to clipboard</string>
     <string name="sign_key">Sign Key</string>
     <string name="sign_key_tips">Key generated and copied to clipboard</string>
+    <string name="copy">Copy</string>
     <string name="random">Random</string>
     <string name="enable_function">Enable Function</string>
     <string name="enable_function_tips">Select the features you want to enable remote control as needed</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4687d032..72150e17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -761,6 +761,7 @@
     <string name="http_server_stopped">HttpServer已停止</string>
     <string name="server_settings">服务端设置</string>
     <string name="server_settings_tips">建议启用签名设置、点击“随机”自动生成并复制到剪贴板</string>
+    <string name="copy">复制</string>
     <string name="random">随机生成</string>
     <string name="sign_key">签名密钥</string>
     <string name="sign_key_tips">已生成密钥，并复制到剪贴板</string>
diff --git a/versions.gradle b/versions.gradle
index 53cf2bbe..037bf36a 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -31,7 +31,7 @@ versions.rxbinding = "2.2.0"
 versions.butterknife = "10.2.3"
 versions.runner = "1.4.0"
 versions.gson = "2.9.0"
-versions.okhttp3 = "3.14.9" //不可升级，支持 API 19
+versions.okhttp3 = "3.12.13" //不可升级，支持 API 19 3.14.9
 versions.leakcanary = "2.8.1"
 versions.lifecycle = "2.2.0"
 versions.kotlin = '1.6.21'