Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

 app/src/main/res/layout/dialog_update_confirm_cancel.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/bj_ff333738"
        android:background="@drawable/bj_ff1c1c1e"
        app:layout_constraintBottom_toBottomOf="parent"
        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
@@ -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