From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_change_password.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 80edf65..169d16e 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -22,9 +22,9 @@
android:layout_height="@dimen/dp_39"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_42"
- android:text="@string/home_login_淇敼瀵嗙爜"
+ android:text="@string/home_login_change_password"
android:textAlignment="center"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -65,7 +65,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
- android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿"
+ android:hint="@string/home_login_input_phone"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -100,7 +100,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:padding="@dimen/dp_16"
- android:text="@string/home_login_楠岃瘉鐮�"
+ android:text="@string/home_login_verification_code"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14" />
@@ -120,7 +120,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -178,7 +178,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -284,7 +284,7 @@
</RelativeLayout>
-
+ <!--閿欒鎻愮ず-->
<TextView
android:id="@+id/text_error_tv"
android:layout_width="wrap_content"
@@ -305,7 +305,7 @@
android:background="@drawable/yesandnocheck"
android:enabled="false"
android:gravity="center"
- android:text="@string/home_login_纭閲嶇疆"
+ android:text="@string/home_login_confirm_reset"
android:textColor="@color/text_FFFFFFFF"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
--
Gitblit v1.8.0