From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/res/layout/activity_me_change_password.xml | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/activity_me_change_password.xml b/app/src/main/res/layout/activity_me_change_password.xml
index 29f57fc..b19f265 100644
--- a/app/src/main/res/layout/activity_me_change_password.xml
+++ b/app/src/main/res/layout/activity_me_change_password.xml
@@ -4,11 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.MeChangePasswordActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/me_psw_ll"
@@ -17,7 +24,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<include
android:id="@+id/me_change_password_old_ic"
@@ -36,27 +43,36 @@
android:id="@+id/me_psw_error_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_20"
android:text="@string/home_login_least6"
- android:textColor="@color/text_565758"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/me_psw_ll" />
+
+ <ImageView
+ android:id="@+id/tip"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/tip"
+ app:layout_constraintBottom_toBottomOf="@+id/me_psw_error_tv"
+ app:layout_constraintEnd_toStartOf="@+id/me_psw_error_tv"
+ app:layout_constraintTop_toTopOf="@+id/me_psw_error_tv" />
<TextView
android:id="@+id/home_affirm_tv"
android:layout_width="0dp"
android:layout_height="52dp"
- android:layout_marginTop="@dimen/dp_100"
android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ff39383d"
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_affirm"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/me_psw_ll" />
--
Gitblit v1.8.0