Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,17 +4,17 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.QrCodeMainActivity">

    <androidx.constraintlayout.widget.ConstraintLayout
        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" />
<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
<!--        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" />-->

    <include
        android:id="@+id/toolbar_top_rl"
@@ -52,7 +52,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_16"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_18"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/qr_code_box"
@@ -64,7 +64,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_8"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="@dimen/text_14"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
@@ -76,10 +76,10 @@
        android:layout_width="158dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_50"
        android:background="@drawable/selected_8_ff555859"
        android:background="@drawable/selected_8_ff39383d"
        android:gravity="center"
        android:text="@string/save_to_album"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
        app:layout_constraintStart_toStartOf="@+id/user_name_tv"