From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/activity_change_password.xml | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index da39cf5..ac99d35 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -4,14 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/login"
tools:context=".ui.account.ChangePassword">
<TextView
android:id="@+id/change_back_tv"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="@dimen/dp_30"
+ android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_37"
+ android:layout_marginTop="@dimen/dp_38"
android:background="@drawable/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -21,12 +22,11 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_39"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_42"
+ android:layout_marginTop="@dimen/dp_39"
android:text="@string/home_login_change_password"
android:textAlignment="center"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_28"
- android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
<!--鎵嬫満鍙�-->
@@ -34,8 +34,8 @@
android:id="@+id/change_phone_ic"
layout="@layout/text_underline"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_31"
- android:layout_marginTop="@dimen/dp_52"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_43"
app:layout_constraintStart_toStartOf="@+id/change_title_tv"
app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
<!--閭-->
@@ -43,9 +43,9 @@
android:id="@+id/change_mail_rl"
layout="@layout/text_underline"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_31"
+ android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
- android:layout_marginTop="@dimen/dp_52"
+ android:layout_marginTop="@dimen/dp_43"
app:layout_constraintStart_toEndOf="@+id/change_phone_ic"
app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
@@ -69,9 +69,9 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<View
android:layout_width="match_parent"
@@ -79,7 +79,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
<!--鎵嬫満鑾峰彇楠岃瘉鐮�-->
@@ -101,7 +101,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_245EC3"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<View
@@ -110,7 +110,7 @@
android:layout_height="20dp"
android:layout_alignStart="@+id/change_phone_verification_tv"
android:layout_centerInParent="true"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
<EditText
android:id="@+id/change_phone_verification_et"
@@ -124,9 +124,9 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -136,7 +136,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -159,7 +159,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_245EC3"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<View
@@ -168,7 +168,7 @@
android:layout_height="20dp"
android:layout_alignStart="@+id/change_mail_verification_tv"
android:layout_centerInParent="true"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
<EditText
android:id="@+id/change_mail_verification_et"
@@ -182,9 +182,9 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -194,7 +194,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -219,9 +219,9 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/change_psw_hide_iv"
@@ -238,7 +238,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -261,9 +261,9 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/change_confirm_psw_hide_iv"
@@ -280,7 +280,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -302,12 +302,12 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_42"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ccffff_13"
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_confirm_reset"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
--
Gitblit v1.8.0