Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -1,43 +1,33 @@
<?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="@dimen/dp_200"
    android:layout_marginStart="@dimen/dp_20"
    android:layout_marginEnd="@dimen/dp_20"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent">
    android:layout_height="wrap_content"
    android:background="@color/text_FF222222"
    android:orientation="vertical">


    <LinearLayout
        android:id="@+id/hdl_china_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_china_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="HDL China"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />
    </LinearLayout>

    <View
        android:id="@+id/line_v"
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="@color/text_E1E1E1"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
        android:background="@color/text_1AFFFFFF"

        />

@@ -46,45 +36,43 @@
        android:id="@+id/hdl_bahrain_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/line_v">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_bahrain_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="HDL Bahrain"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"

            />
    </LinearLayout>

    <View
        android:layout_width="match_parent"
        android:layout_height="10dp"
        android:background="@color/text_FF000000"

        />

    <LinearLayout
        android:id="@+id/hdl_cancel_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:layout_marginTop="@dimen/dp_20"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_cancel_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14"

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