Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -44,7 +44,7 @@
            android:layout_marginBottom="@dimen/dp_0"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_FF5B5B5B"
            android:textColor="@color/text_FFACACAC"
            app:layout_constraintBottom_toTopOf="@+id/loading_confirmation_content2_tv"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
            android:layout_marginBottom="@dimen/dp_34"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_FF5B5B5B"
            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"