Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

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

    <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">

    <TextView
        android:id="@+id/change_back_tv"
        android:layout_width="@dimen/dp_30"
@@ -25,7 +37,7 @@
        android:layout_marginTop="@dimen/dp_39"
        android:text="@string/home_login_change_password"
        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/change_back_tv" />
@@ -49,14 +61,73 @@
        app:layout_constraintStart_toEndOf="@+id/change_phone_ic"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />

            <View
                android:id="@+id/interval"
                android:layout_width="match_parent"
                android:layout_height="2.5dp"
                android:layout_marginTop="100dp"
                app:layout_constraintStart_toStartOf="@+id/change_title_tv"
                app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />

            <RelativeLayout
                android:id="@+id/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/interval">

                <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="+86"
                    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/change_account_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_60"
        android:layout_marginTop="102.5dp"
        app:layout_constraintStart_toStartOf="@+id/change_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv">
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/region_account_rl">

        <EditText
            android:id="@+id/change_account_et"
@@ -69,8 +140,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
@@ -101,7 +172,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
@@ -124,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"

            />
@@ -159,7 +230,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
@@ -182,8 +253,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"

            />
@@ -219,8 +290,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
@@ -261,8 +332,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
@@ -306,10 +377,12 @@
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_confirm_reset"
        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/change_confirm_psw_rl" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>