From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/activity_bind_mail.xml | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index bfd139c..1c68711 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -4,35 +4,43 @@
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.BindMailActivity">
+
<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" />
+
<RelativeLayout
android:id="@+id/bind_mail_parent_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100"
- android:layout_marginTop="@dimen/dp_20"
+ android:layout_height="78dp"
+ android:layout_marginTop="@dimen/dp_10"
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">
<TextView
android:id="@+id/bind_mail_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_email"
- android:textColor="@color/text_65000000"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:id="@+id/bind_mail_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_50"
android:layout_below="@+id/bind_mail_title_tv"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_8"
@@ -53,9 +61,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_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/bind_mail_clear_iv"
@@ -84,8 +92,8 @@
<RelativeLayout
android:id="@+id/bind_phone_verification_parent_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_height="78dp"
+ android:layout_marginTop="@dimen/dp_25"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bind_mail_parent_rl">
@@ -96,14 +104,14 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/verification"
- android:textColor="@color/text_65000000"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<!--閭鑾峰彇楠岃瘉鐮�-->
<RelativeLayout
android:id="@+id/bind_mail_verification_code_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_50"
android:layout_below="@+id/bind_mail_verification_title_tv"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_8"
@@ -119,8 +127,8 @@
android:gravity="center"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_0"
- android:text="@string/home_login_send_mail"
- android:textColor="@color/text_245EC3"
+ android:text="@string/home_login_verification_code"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -129,7 +137,7 @@
android:layout_height="20dp"
android:layout_alignStart="@+id/bind_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"
@@ -143,9 +151,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_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
/>
@@ -171,13 +179,14 @@
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="73dp"
+ android:layout_marginTop="50dp"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/home_login_affirm"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:enabled="false"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bind_phone_verification_parent_rl" />
--
Gitblit v1.8.0