Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -18,7 +18,7 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_21"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"
            />

@@ -46,8 +46,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