Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

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

@@ -11,7 +11,7 @@
        android:layout_height="225dp"
        android:layout_marginStart="@dimen/dp_48"
        android:layout_marginEnd="@dimen/dp_48"
        android:background="@drawable/bj_ff333738"
        android:background="@drawable/dalog_bj_ff222222"
        android:paddingBottom="@dimen/dp_24"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -57,6 +57,7 @@
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +100,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
@@ -122,7 +123,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