From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
app/src/main/res/layout/activity_home_login.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index b9c52ce..c355aad 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -189,8 +189,8 @@
<TextView
android:id="@+id/home_login_register_tv"
- android:layout_width="32dp"
- android:layout_height="17dp"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_register"
android:textColor="@color/text_245EC3"
@@ -202,12 +202,11 @@
android:id="@+id/home_login_forget_password_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_forget_password"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
- app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
+ app:layout_constraintTop_toTopOf="@+id/home_login_register_tv" />
<!--鐧诲綍-->
<TextView
@@ -234,6 +233,7 @@
android:text="@string/home_login_power_station"
android:textColor="@color/text_245EC3"
android:textSize="18sp"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
@@ -251,12 +251,14 @@
<TextView
android:id="@+id/home_login_privacy_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
+ android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_16"
+ android:gravity="start|center"
+ android:singleLine="false"
+ android:tag="click"
android:text="@string/home_login_consent_service_agreement"
android:textColor="@color/text_FF000000"
android:textSize="@dimen/text_14"
- android:tag="click"
app:layout_constraintBottom_toBottomOf="@+id/home_login_privacy_check_iv"
app:layout_constraintStart_toEndOf="@+id/home_login_privacy_check_iv"
app:layout_constraintTop_toTopOf="@+id/home_login_privacy_check_iv" />
--
Gitblit v1.8.0