From e57e1c01a52a326343122d458ad3bd330fc9d347 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:40:29 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/activity_home_login.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 671c39f..df142a4 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -160,7 +160,7 @@
android:layout_height="0.5dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="#FF5A5A5A"
+ android:background="@color/text_1AFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" />
@@ -212,7 +212,7 @@
android:id="@+id/home_login_line2_v"
android:layout_width="0dp"
android:layout_height="0.5dp"
- android:background="#FF5A5A5A"
+ android:background="@color/text_1AFFFFFF"
app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line1_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" />
@@ -260,7 +260,7 @@
android:gravity="center"
android:text="@string/home_login_logoin"
android:textColor="@color/text_66FFFFFF"
- android:textSize="18sp"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
@@ -283,13 +283,16 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_32"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/home_login_tv"
+ app:layout_constraintVertical_bias="1">
<ImageView
android:id="@+id/home_login_privacy_check_iv"
@@ -298,7 +301,7 @@
android:background="@drawable/yesandnoselected" />
<View
- android:layout_width="@dimen/dp_6"
+ android:layout_width="@dimen/dp_8"
android:layout_height="match_parent" />
<TextView
@@ -306,12 +309,13 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_6"
- android:gravity="start|center"
+ android:gravity="center"
+ android:padding="@dimen/dp_0"
android:singleLine="false"
android:tag="click"
android:text="@string/home_login_consent_service_agreement"
android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:textSize="@dimen/text_12" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
--
Gitblit v1.8.0