Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

 app/src/main/res/layout/activity_register_account.xml

@@ -8,6 +8,18 @@
    android:background="@drawable/login"
    tools:context=".ui.account.RegisterAccountActivity">

    <androidx.core.widget.NestedScrollView
        android:id="@+id/parent_nsv"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:fillViewport="true"
        android:overScrollMode="never">

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/parent_cl1"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

    <!--    <ImageView-->
    <!--        android:layout_width="0dp"-->
    <!--        android:layout_height="0dp"-->
@@ -35,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" />
@@ -86,7 +98,7 @@
            android:layout_toEndOf="@+id/region_iv"
            android:gravity="center_vertical"
            android:text="HDL China"
            android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <ImageView
@@ -124,7 +136,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
@@ -133,10 +145,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"

            />
@@ -179,8 +191,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
@@ -212,8 +224,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
@@ -254,8 +266,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
@@ -296,7 +308,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
@@ -319,8 +331,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"

            />
@@ -356,7 +368,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
@@ -379,8 +391,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"

            />
@@ -418,11 +430,12 @@
        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"
        app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />

        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>