Merge branch '1.2.0' into 1.5.1_google

wjc

2025-04-30 f91ef956cf482ed4ce0885dc47794b783c20c415

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

@@ -12,7 +12,7 @@
        android:layout_marginTop="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_48"
        android:layout_marginBottom="@dimen/dp_20"
        android:background="@drawable/dalog_bj_ff222222"
        android:background="@drawable/dalog_bj_ff1c1c1c"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -26,7 +26,7 @@
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:textColor="@color/text_030D1C"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_18"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
            android:layout_marginBottom="@dimen/dp_34"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_030D1C"
            android:textColor="@color/text_FFACACAC"
            app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"