From 0b357bcd7c472c91227093239f180a28638c57a4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:33:07 +0800
Subject: [PATCH] Merge branch '1.5.2' into 1.5.1_google
---
app/src/main/res/layout/activity_register_account.xml | 801 +++++++++++++++++++++++++++++----------------------------
1 files changed, 407 insertions(+), 394 deletions(-)
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 0c25e8f..fc466ab 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -8,421 +8,434 @@
android:background="@drawable/login"
tools:context=".ui.account.RegisterAccountActivity">
- <!-- <ImageView-->
- <!-- android:layout_width="0dp"-->
- <!-- android:layout_height="0dp"-->
- <!-- android:background="@drawable/bj"-->
- <!-- app:layout_constraintBottom_toBottomOf="parent"-->
- <!-- app:layout_constraintEnd_toEndOf="parent"-->
- <!-- app:layout_constraintStart_toStartOf="parent"-->
- <!-- app:layout_constraintTop_toTopOf="parent" />-->
-
- <TextView
- android:id="@+id/register_back_tv"
- android:layout_width="@dimen/dp_30"
- android:layout_height="@dimen/dp_30"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_38"
- android:background="@drawable/back"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/register_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_39"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_39"
- android:text="@string/home_login_register"
- android:textAlignment="center"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_28"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
- <!--鎵嬫満鍙�-->
- <include
- android:id="@+id/register_phone_title_ic"
- layout="@layout/text_underline"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_31"
- android:layout_marginTop="@dimen/dp_43"
- app:layout_constraintStart_toStartOf="@+id/register_title_tv"
- app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
- <!--閭-->
- <include
- android:id="@+id/register_mail_title_ic"
- layout="@layout/text_underline"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_31"
- android:layout_marginStart="@dimen/dp_28"
- android:layout_marginTop="@dimen/dp_43"
- app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic"
- app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
-
-
- <RelativeLayout
- android:id="@+id/register_region_server_rl"
+ <androidx.core.widget.NestedScrollView
+ android:id="@+id/parent_nsv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- android:layout_marginTop="102.5dp"
- app:layout_constraintStart_toStartOf="@+id/register_title_tv"
- app:layout_constraintTop_toBottomOf="@+id/register_title_tv">
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:overScrollMode="never">
- <ImageView
- android:id="@+id/region_iv"
- android:layout_width="@dimen/dp_13"
- android:layout_height="@dimen/dp_13"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_20"
- android:src="@drawable/l" />
-
-
- <TextView
- android:id="@+id/region_tv"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/parent_cl1"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- 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_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:layout_height="match_parent">
- <ImageView
- android:id="@+id/region_next_iv"
- android:layout_width="@dimen/dp_13"
- android:layout_height="@dimen/dp_13"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_26"
- android:src="@drawable/next" />
+ <!-- <ImageView-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="0dp"-->
+ <!-- android:background="@drawable/bj"-->
+ <!-- app:layout_constraintBottom_toBottomOf="parent"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+ <!-- app:layout_constraintTop_toTopOf="parent" />-->
- <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_1AFFFFFF" />
+ <TextView
+ android:id="@+id/register_back_tv"
+ android:layout_width="@dimen/dp_30"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_38"
+ android:background="@drawable/back"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/register_region_account_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_region_server_rl">
-
- <TextView
- android:id="@+id/region_account_tv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_150"
- android:gravity="center_vertical"
- android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <TextView
- android:id="@+id/region_account_number_tv"
- android:layout_width="@dimen/dp_90"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_58"
- android:gravity="center_vertical|end"
- android:text="+86"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
-
- />
-
- <ImageView
- android:id="@+id/region_account_next_iv"
- android:layout_width="@dimen/dp_20"
- android:layout_height="@dimen/dp_20"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_26"
- android:src="@drawable/spinner" />
-
- <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_1AFFFFFF" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/register_account_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_region_account_rl">
-
- <EditText
- android:id="@+id/register_account_et"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_60"
- android:background="@null"
- android:hint="@string/home_login_input_phone"
- android:inputType="text"
- android:lines="1"
- android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <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_1AFFFFFF" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/register_psw_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_account_rl">
-
- <EditText
- android:id="@+id/register_psw_et"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_60"
- android:background="@null"
- android:hint="@string/home_login_input_6_16"
- android:inputType="textPassword"
- android:lines="1"
- android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/register_psw_hide_iv"
- android:layout_width="@dimen/dp_20"
- android:layout_height="@dimen/dp_20"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_32"
- android:src="@drawable/hide" />
-
- <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_1AFFFFFF" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/register_confirm_psw_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_psw_rl">
-
- <EditText
- android:id="@+id/register_confirm_psw_et"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_60"
- android:background="@null"
- android:hint="@string/home_login_confirm_psw"
- android:inputType="textPassword"
- android:lines="1"
- android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/register_confirm_psw_hide_iv"
- android:layout_width="@dimen/dp_20"
- android:layout_height="@dimen/dp_20"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_32"
- android:src="@drawable/hide" />
-
- <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_1AFFFFFF" />
-
- </RelativeLayout>
-
- <!--鎵嬫満鍙烽獙璇佺爜-->
- <RelativeLayout
- android:id="@+id/register_phone_verification_code_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl">
+ <TextView
+ android:id="@+id/register_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_39"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/home_login_register"
+ android:textAlignment="center"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_28"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
+ <!--鎵嬫満鍙�-->
+ <include
+ android:id="@+id/register_phone_title_ic"
+ layout="@layout/text_underline"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginTop="@dimen/dp_43"
+ app:layout_constraintStart_toStartOf="@+id/register_title_tv"
+ app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
+ <!--閭-->
+ <include
+ android:id="@+id/register_mail_title_ic"
+ layout="@layout/text_underline"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginStart="@dimen/dp_28"
+ android:layout_marginTop="@dimen/dp_43"
+ app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic"
+ app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
- <TextView
- 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_verification_code"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ <RelativeLayout
+ android:id="@+id/register_region_server_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ android:layout_marginTop="102.5dp"
+ app:layout_constraintStart_toStartOf="@+id/register_title_tv"
+ app:layout_constraintTop_toBottomOf="@+id/register_title_tv">
- <View
- android:id="@+id/register_phone_verification_v"
- android:layout_width="0.5dp"
- android:layout_height="20dp"
- android:layout_alignStart="@+id/register_phone_verification_tv"
- android:layout_centerInParent="true"
- android:background="@color/text_1AFFFFFF" />
-
- <EditText
- android:id="@+id/register_phone_verification_et"
- android:layout_width="@dimen/dp_150"
- android:layout_height="match_parent"
- 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_verification_code"
- android:inputType="text"
- android:lines="1"
- android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14"
-
- />
-
- <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_1AFFFFFF" />
+ <ImageView
+ android:id="@+id/region_iv"
+ android:layout_width="@dimen/dp_13"
+ android:layout_height="@dimen/dp_13"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_20"
+ android:src="@drawable/l" />
- </RelativeLayout>
+ <TextView
+ android:id="@+id/region_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ 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_FFACACAC"
+ android:textSize="@dimen/text_14" />
- <!--閭楠岃瘉鐮�-->
- <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">
+ <ImageView
+ android:id="@+id/region_next_iv"
+ android:layout_width="@dimen/dp_13"
+ android:layout_height="@dimen/dp_13"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_26"
+ android:src="@drawable/next" />
+
+ <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_1AFFFFFF" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/register_region_account_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_region_server_rl">
+
+ <TextView
+ android:id="@+id/region_account_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_150"
+ android:gravity="center_vertical"
+ android:text="@string/home_chinese_mainland"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/region_account_number_tv"
+ android:layout_width="@dimen/dp_90"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_50"
+ android:gravity="center_vertical|end"
+ android:text="+964"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
+
+ />
+
+ <ImageView
+ android:id="@+id/region_account_next_iv"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_26"
+ android:src="@drawable/spinner" />
+
+ <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_1AFFFFFF" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/register_account_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_region_account_rl">
+
+ <EditText
+ android:id="@+id/register_account_et"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_60"
+ android:background="@null"
+ android:hint="@string/home_login_input_phone"
+ android:inputType="text"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+
+ <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_1AFFFFFF" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/register_psw_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_account_rl">
+
+ <EditText
+ android:id="@+id/register_psw_et"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_60"
+ android:background="@null"
+ android:hint="@string/home_login_input_6_16"
+ android:inputType="textPassword"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/register_psw_hide_iv"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_32"
+ android:src="@drawable/hide" />
+
+ <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_1AFFFFFF" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/register_confirm_psw_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_psw_rl">
+
+ <EditText
+ android:id="@+id/register_confirm_psw_et"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_60"
+ android:background="@null"
+ android:hint="@string/home_login_confirm_psw"
+ android:inputType="textPassword"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/register_confirm_psw_hide_iv"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_32"
+ android:src="@drawable/hide" />
+
+ <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_1AFFFFFF" />
+
+ </RelativeLayout>
+
+ <!--鎵嬫満鍙烽獙璇佺爜-->
+ <RelativeLayout
+ android:id="@+id/register_phone_verification_code_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ 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_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ <TextView
+ 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_verification_code"
+ android:textColor="@color/text_FFACACAC"
+ 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_1AFFFFFF" />
+ <View
+ android:id="@+id/register_phone_verification_v"
+ android:layout_width="0.5dp"
+ android:layout_height="20dp"
+ android:layout_alignStart="@+id/register_phone_verification_tv"
+ android:layout_centerInParent="true"
+ android:background="@color/text_1AFFFFFF" />
- <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_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14"
+ <EditText
+ android:id="@+id/register_phone_verification_et"
+ android:layout_width="@dimen/dp_150"
+ android:layout_height="match_parent"
+ 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_verification_code"
+ android:inputType="text"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
- />
+ />
- <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_1AFFFFFF" />
+ <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_1AFFFFFF" />
- </RelativeLayout>
- <!--閿欒鎻愮ず-->
- <TextView
- 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" />
+ </RelativeLayout>
- <TextView
- android:id="@+id/register_complete_tv"
- android:layout_width="0dp"
- android:layout_height="52dp"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="102dp"
- android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/bj_ccffff_13"
- android:enabled="false"
- android:gravity="center"
- android:text="@string/home_login_register"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
+ <!--閭楠岃瘉鐮�-->
+ <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_FFACACAC"
+ 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_1AFFFFFF" />
+
+ <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_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
+
+ />
+
+ <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_1AFFFFFF" />
+
+
+ </RelativeLayout>
+ <!--閿欒鎻愮ず-->
+ <TextView
+ 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="102dp"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:background="@drawable/bj_ccffff_13"
+ android:enabled="false"
+ android:gravity="center"
+ android:text="@string/home_login_register"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="14sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.core.widget.NestedScrollView>
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0