Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -8,7 +8,7 @@
        android:id="@+id/dialog_change_photograph"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_C1C1C1"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintBottom_toTopOf="@+id/line"
@@ -20,7 +20,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_FF222222"
            android:textColor="@color/text_FFACACAC"
            android:textSize="16sp"

            />
@@ -42,7 +42,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:layout_marginBottom="8dp"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_C1C1C1"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintBottom_toTopOf="@+id/dialog_change_avatar_cancel_ll"
@@ -56,7 +56,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_FF222222"
            android:textColor="@color/text_FFACACAC"
            android:textSize="16sp"

            />
@@ -78,7 +78,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_FF5757"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="16sp"

            />