From 9a43cb504ed11563713bf633148bc2864768c475 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 4 Jan 2024 16:35:11 +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=E6=9C=8D=E5=8A=A1=E7=AB=AF/=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E9=BB=98=E8=AE=A4=E9=9A=90=E8=97=8F=E5=AF=86?=
 =?UTF-8?q?=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter_frpcs_card_view_list_item.xml     |  3 ++-
 app/src/main/res/layout/fragment_client.xml   | 14 +++++--------
 app/src/main/res/layout/fragment_server.xml   | 20 +++++++++++--------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml b/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
index 94854a9c..8117317e 100644
--- a/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
@@ -121,7 +121,8 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:lines="1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textSize="@dimen/text_size_small"
                     tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layout/fragment_client.xml b/app/src/main/res/layout/fragment_client.xml
index ace6a2aa..60f10944 100644
--- a/app/src/main/res/layout/fragment_client.xml
+++ b/app/src/main/res/layout/fragment_client.xml
@@ -1,5 +1,6 @@
 <?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"
@@ -127,6 +128,7 @@
                 style="@style/BarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 tools:ignore="RtlSymmetry">
 
                 <TextView
@@ -136,20 +138,14 @@
                     android:text="@string/sign_key"
                     android:textStyle="bold" />
 
-                <EditText
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
                     android:id="@+id/et_sign_key"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:layout_weight="1"
-                    android:gravity="top"
-                    android:importantForAutofill="no"
-                    android:inputType="textMultiLine"
-                    android:maxLines="5"
-                    android:minLines="1"
-                    android:scrollbars="vertical"
-                    android:textSize="@dimen/text_size_mini"
-                    tools:ignore="LabelFor,SmallSp" />
+                    android:singleLine="true"
+                    app:met_passWordButton="true" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_server.xml b/app/src/main/res/layout/fragment_server.xml
index 395db3ed..205da718 100644
--- a/app/src/main/res/layout/fragment_server.xml
+++ b/app/src/main/res/layout/fragment_server.xml
@@ -206,12 +206,14 @@
                     android:text="@string/sign_key"
                     android:textStyle="bold" />
 
-                <com.xuexiang.xui.widget.edittext.ClearEditText
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
                     android:id="@+id/et_sign_key"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    app:met_passWordButton="true" />
 
                 <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
                     android:id="@+id/btn_sign_key"
@@ -293,7 +295,7 @@
                     android:text="@string/private_key"
                     android:textStyle="bold" />
 
-                <EditText
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
                     android:id="@+id/et_private_key"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -307,7 +309,7 @@
                     android:minLines="2"
                     android:scrollbars="vertical"
                     android:textSize="@dimen/text_size_mini"
-                    tools:ignore="SmallSp" />
+                    app:met_passWordButton="true" />
 
                 <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
                     android:id="@+id/btn_generate_key"
@@ -341,7 +343,7 @@
                     android:text="@string/public_key"
                     android:textStyle="bold" />
 
-                <EditText
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
                     android:id="@+id/et_public_key"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -355,7 +357,7 @@
                     android:minLines="2"
                     android:scrollbars="vertical"
                     android:textSize="@dimen/text_size_mini"
-                    tools:ignore="SmallSp" />
+                    app:met_passWordButton="true" />
 
                 <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
                     android:id="@+id/btn_copy_public_key"
@@ -389,13 +391,15 @@
                     android:text="@string/sm4_key"
                     android:textStyle="bold" />
 
-                <com.xuexiang.xui.widget.edittext.ClearEditText
+                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
                     android:id="@+id/et_sm4_key"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:layout_weight="1"
-                    android:hint="@string/sm4_key_tips" />
+                    android:hint="@string/sm4_key_tips"
+                    android:textSize="@dimen/text_size_mini"
+                    app:met_passWordButton="true" />
 
                 <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
                     android:id="@+id/btn_sm4_key"