Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -1,42 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:gravity="center">

    <androidx.constraintlayout.widget.ConstraintLayout
    <LinearLayout
        android:id="@+id/tip_parent_cl"
        android:layout_width="@dimen/dp_128"
        android:layout_height="@dimen/dp_120"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_100"
        android:layout_marginEnd="@dimen/dp_100"
        android:background="@drawable/dialog_flashing_box"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/tip_image_tv"
            android:layout_width="@dimen/dp_36"
            android:layout_height="@dimen/dp_36"
            android:layout_marginTop="@dimen/dp_28"
            android:background="@drawable/tip_fail"
            app:layout_constraintEnd_toEndOf="@id/tip_parent_cl"
            app:layout_constraintStart_toStartOf="@id/tip_parent_cl"
            app:layout_constraintTop_toTopOf="@id/tip_parent_cl" />
        android:gravity="center"
        android:paddingTop="@dimen/dp_8"
        android:paddingBottom="@dimen/dp_8">

        <TextView
            android:id="@+id/tip_content_tv"
            android:layout_width="@dimen/dp_120"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:gravity="center"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="@id/tip_parent_cl"
            app:layout_constraintStart_toStartOf="@id/tip_parent_cl"
            app:layout_constraintTop_toBottomOf="@id/tip_image_tv" />
            android:paddingStart="@dimen/dp_10"
            android:paddingEnd="@dimen/dp_10"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
    </LinearLayout>


    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>