Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -28,7 +28,7 @@
            android:layout_marginTop="@dimen/dp_25"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="wifi_ssid"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_16" />

        <androidx.constraintlayout.widget.ConstraintLayout
@@ -55,8 +55,8 @@
                android:maxLines="1"
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
@@ -108,7 +108,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" />


@@ -131,7 +131,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>