Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="@dimen/dp_100"
    android:layout_height="85dp"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_gravity="center_horizontal"
    android:background="@drawable/bg_load_dialog"
    android:maxWidth="300dp"
    android:minWidth="@dimen/dp_100">


    <ProgressBar
    <!--    <ProgressBar-->
    <!--        android:id="@+id/load_pb"-->
    <!--        android:layout_width="40dp"-->
    <!--        android:layout_height="40dp"-->
    <!--        android:layout_marginTop="@dimen/dp_10"-->
    <!--        android:indeterminateDrawable="@drawable/progress_small"-->
    <!--        app:layout_constraintEnd_toEndOf="parent"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="parent" />-->

    <ImageView
        android:id="@+id/load_pb"
        android:layout_width="40dp"
        android:layout_height="40dp"
        android:layout_width="80dp"
        android:layout_height="37.5dp"
        android:layout_marginTop="@dimen/dp_10"
        android:indeterminateDrawable="@drawable/progress_small"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
@@ -29,11 +37,12 @@
        android:layout_marginBottom="@dimen/dp_10"
        android:maxLines="1"
        android:text="@string/device_loading"
        android:textColor="@color/text_FFFFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_12"
        app:layout_constraintEnd_toEndOf="@+id/load_pb"
        app:layout_constraintStart_toStartOf="@+id/load_pb"
        app:layout_constraintTop_toBottomOf="@+id/load_pb"
        android:visibility="gone"


        />