Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -26,7 +26,7 @@
            android:layout_marginTop="@dimen/dp_24"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="@string/app_discover_new_version"
            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"
@@ -44,7 +44,7 @@
            android:layout_marginBottom="@dimen/dp_0"
            android:singleLine="false"
            android:tag="click"
            android:textColor="@color/text_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            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_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -78,6 +78,7 @@
            android:layout_height="@dimen/dp_41"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:layout_marginBottom="@dimen/dp_16"
            android:orientation="horizontal"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
@@ -89,7 +90,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23_no"
                android:background="@drawable/bj_un_ff39383d_24"
                android:gravity="center">

                <TextView
@@ -97,7 +98,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" />


@@ -112,7 +113,7 @@
                android:layout_width="@dimen/dp_0"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/bj_ff555859_23"
                android:background="@drawable/bj_ff39383d_24"
                android:gravity="center">

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