From 5b06b2b9917fbe0c35d21d1b2b54a7de1ec3da29 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:06:44 +0800
Subject: [PATCH] Merge branch '1.4.4'
---
app/src/main/res/layout/activity_register_account.xml | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index dbc1948..57bafe9 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -47,7 +47,7 @@
android:layout_marginTop="@dimen/dp_39"
android:text="@string/home_login_register"
android:textAlignment="center"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
@@ -71,11 +71,11 @@
app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic"
app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
-
+ <!--2025骞�09鏈�02鏃�10:09:54 闅愯棌鏈嶅姟鍣ㄩ�夐」锛屾斁寮�鎵嬬殑璁剧疆楂樺害涓�60鍗冲彲-->
<RelativeLayout
android:id="@+id/register_region_server_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
+ android:layout_height="0.5dp"
android:layout_marginTop="102.5dp"
app:layout_constraintStart_toStartOf="@+id/register_title_tv"
app:layout_constraintTop_toBottomOf="@+id/register_title_tv">
@@ -86,7 +86,8 @@
android:layout_height="@dimen/dp_13"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_20"
- android:src="@drawable/l" />
+ android:src="@drawable/l"
+ android:visibility="gone" />
<TextView
@@ -98,8 +99,9 @@
android:layout_toEndOf="@+id/region_iv"
android:gravity="center_vertical"
android:text="HDL China"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
+ android:visibility="gone" />
<ImageView
android:id="@+id/region_next_iv"
@@ -108,7 +110,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_26"
- android:src="@drawable/next" />
+ android:src="@drawable/next"
+ android:visibility="gone" />
<View
android:layout_width="match_parent"
@@ -116,7 +119,8 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_1AFFFFFF" />
+ android:background="@color/text_1AFFFFFF"
+ android:visibility="gone" />
</RelativeLayout>
@@ -136,7 +140,7 @@
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -145,10 +149,10 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_58"
+ android:layout_marginEnd="@dimen/dp_50"
android:gravity="center_vertical|end"
- android:text="+86"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="+964"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -191,8 +195,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<View
@@ -224,8 +228,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -266,8 +270,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -308,7 +312,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -331,8 +335,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -368,7 +372,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_send_mail"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -391,8 +395,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -430,7 +434,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_register"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
--
Gitblit v1.8.0