Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -26,7 +26,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
            android:gravity="center"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14"
            android:lineSpacingExtra="@dimen/dp_2"
            app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
@@ -79,7 +79,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />


@@ -102,7 +102,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>
        </LinearLayout>