From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'

---
 app/src/main/res/layout/activity_change_password.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 169d16e..da39cf5 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -11,7 +11,7 @@
         android:layout_width="@dimen/dp_24"
         android:layout_height="@dimen/dp_24"
         android:layout_marginStart="@dimen/dp_16"
-        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_37"
         android:background="@drawable/back"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -158,7 +158,7 @@
             android:layout_marginEnd="@dimen/dp_20"
             android:gravity="center"
             android:padding="@dimen/dp_16"
-            android:text="@string/home_login_send_mail"
+            android:text="@string/home_login_verification_code"
             android:textColor="@color/text_245EC3"
             android:textSize="@dimen/text_14" />
 

--
Gitblit v1.8.0