From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 二月 2024 18:05:24 +0800
Subject: [PATCH] 2024年02月02日18:04:36
---
app/src/main/res/layout/activity_register_account.xml | 108 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 90 insertions(+), 18 deletions(-)
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 4f9aae0..7ee2623 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -23,7 +23,7 @@
android:layout_height="@dimen/dp_39"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_42"
- android:text="@string/home_login_娉ㄥ唽"
+ android:text="@string/home_login_register"
android:textAlignment="center"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_28"
@@ -67,18 +67,18 @@
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/region" />
+
<TextView
android:id="@+id/region_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_10"
+ android:layout_marginStart="9dp"
android:layout_marginEnd="@dimen/dp_20"
android:layout_toEndOf="@+id/region_iv"
android:gravity="center_vertical"
android:text="HDL China"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_16" />
-
<ImageView
android:id="@+id/region_next_iv"
@@ -114,7 +114,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
- android:text="涓浗澶ч檰"
+ android:text="@string/home_chinese_mainland"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_16" />
@@ -166,7 +166,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
- android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿"
+ android:hint="@string/home_login_input_phone"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -268,8 +268,9 @@
</RelativeLayout>
+ <!--鎵嬫満鍙烽獙璇佺爜-->
<RelativeLayout
- android:id="@+id/register_verification_code_rl"
+ android:id="@+id/register_phone_verification_code_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_60"
app:layout_constraintEnd_toEndOf="parent"
@@ -278,34 +279,34 @@
<TextView
- android:id="@+id/register_verification_tv"
+ android:id="@+id/register_phone_verification_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:padding="@dimen/dp_16"
- android:text="@string/home_login_楠岃瘉鐮�"
+ android:text="@string/home_login_verification_code"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14" />
<View
- android:id="@+id/register_verification_v"
+ android:id="@+id/register_phone_verification_v"
android:layout_width="0.5dp"
android:layout_height="20dp"
- android:layout_alignStart="@+id/register_verification_tv"
+ android:layout_alignStart="@+id/register_phone_verification_tv"
android:layout_centerInParent="true"
android:background="@color/text_E1E1E1" />
<EditText
- android:id="@+id/register_verification_et"
- android:layout_width="match_parent"
+ android:id="@+id/register_phone_verification_et"
+ android:layout_width="@dimen/dp_150"
android:layout_height="match_parent"
- android:layout_alignStart="@+id/register_verification_v"
+ android:layout_alignStart="@+id/register_phone_verification_v"
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -326,22 +327,93 @@
</RelativeLayout>
+ <!--閭楠岃瘉鐮�-->
+ <RelativeLayout
+ android:id="@+id/register_mail_verification_code_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl">
+
+
+ <TextView
+ android:id="@+id/register_mail_verification_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:gravity="center"
+ android:padding="@dimen/dp_16"
+ android:text="@string/home_login_send_mail"
+ android:textColor="@color/text_245EC3"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:id="@+id/register_mail_verification_v"
+ android:layout_width="0.5dp"
+ android:layout_height="20dp"
+ android:layout_alignStart="@+id/register_mail_verification_tv"
+ android:layout_centerInParent="true"
+ android:background="@color/text_E1E1E1" />
+
+ <EditText
+ android:id="@+id/register_mail_verification_et"
+ android:layout_width="@dimen/dp_150"
+ android:layout_height="match_parent"
+ android:layout_alignStart="@+id/register_mail_verification_v"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="@dimen/dp_20"
+ android:background="@null"
+ android:hint="@string/home_login_input_verification_code"
+ android:inputType="text"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_FF000000"
+ android:textColorHint="@color/text_25000000"
+ android:textSize="@dimen/text_16"
+
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_alignParentBottom="true"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:background="@color/text_E1E1E1" />
+
+
+ </RelativeLayout>
+ <!--閿欒鎻愮ず-->
<TextView
- android:id="@+id/account_title_tv"
+ android:id="@+id/text_error_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_60"
+ android:textColor="@color/text_D34545"
+ android:textSize="12sp"
+ app:layout_constraintStart_toStartOf="@+id/register_confirm_psw_rl"
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
+
+ <TextView
+ android:id="@+id/register_complete_tv"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_42"
+ android:layout_marginTop="102dp"
android:layout_marginEnd="@dimen/dp_20"
android:background="@drawable/yesandnocheck"
android:enabled="false"
android:gravity="center"
- android:text="@string/home_login_娉ㄥ唽"
+ android:text="@string/home_login_register"
android:textColor="@color/text_FFFFFFFF"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_verification_code_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0