Merge branch 'dev' into feature/v1.4.1

mac

2024-06-05 31de722a45e886eae89cfea2f1740c1f4d3b0216

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

@@ -4,6 +4,15 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <RelativeLayout
        android:id="@+id/click_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_0"
        app:layout_constraintBottom_toTopOf="@+id/default_filtering_cl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/default_filtering_cl"
        android:layout_width="match_parent"
@@ -23,17 +32,19 @@

            <LinearLayout
                android:id="@+id/cancel_ll"
                android:layout_width="@dimen/dp_51"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_alignParentStart="true"
                android:layout_marginStart="@dimen/dp_20"
                android:orientation="horizontal">

                <TextView
                    android:layout_width="match_parent"

                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:gravity="center_vertical|end"
                    android:gravity="center_vertical"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_40000000"
                    android:textColor="@color/text_66000000"
                    android:textSize="@dimen/text_18" />
            </LinearLayout>

@@ -46,18 +57,19 @@
                android:layout_toEndOf="@+id/cancel_ll"
                android:gravity="center"
                android:text="@string/filtering"
                android:textColor="@color/text_90000000"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/dp_18" />

            <LinearLayout
                android:id="@+id/affirm_ll"
                android:layout_width="@dimen/dp_51"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:layout_marginEnd="@dimen/dp_20"
                android:orientation="horizontal">

                <TextView
                    android:layout_width="match_parent"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:gravity="center_vertical|start"
                    android:text="@string/loading_affirm"
@@ -75,13 +87,13 @@


        <TextView

            android:id="@+id/capacity_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_18"
            android:text="@string/string_capacity"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -102,7 +114,7 @@
            android:layout_marginTop="@dimen/dp_18"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="@string/reset"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -123,22 +135,18 @@
                android:layout_marginStart="@dimen/dp_20"
                android:background="@drawable/search_bj_ff05000000"
                android:gravity="center"
                android:hint="min"
                android:textColor="@color/text_90000000"
                android:textColorHint="@color/text_40000000"
                android:inputType="number"
                android:textColor="@color/text_E6000000"
                android:textColorHint="@color/text_66000000"
                android:textSize="@dimen/text_14" />

            <View
                android:layout_width="match_parent"
                android:layout_width="@dimen/dp_16"
                android:layout_height="1dp"
                android:layout_marginStart="@dimen/dp_5"
                android:layout_marginTop="@dimen/dp_17"
                android:layout_marginEnd="@dimen/dp_5"
                android:layout_toStartOf="@+id/max_et"
                android:layout_toEndOf="@+id/min_et"
                android:background="@color/text_E1E1E1"

                />
                android:layout_alignParentStart="true"
                android:layout_marginStart="@dimen/dp_180"
                android:layout_marginTop="@dimen/dp_19"
                android:background="@color/text_E1E1E1" />

            <EditText
                android:id="@+id/max_et"
@@ -149,9 +157,9 @@
                android:layout_marginEnd="@dimen/dp_20"
                android:background="@drawable/search_bj_ff05000000"
                android:gravity="center"
                android:hint="max"
                android:textColor="@color/text_90000000"
                android:textColorHint="@color/text_40000000"
                android:inputType="number"
                android:textColor="@color/text_E6000000"
                android:textColorHint="@color/text_66000000"
                android:textSize="@dimen/text_14" />
        </RelativeLayout>

@@ -165,7 +173,7 @@
            android:gravity="center"
            android:tag="0-5"
            android:text="0 ~ 5"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -180,7 +188,7 @@
            android:gravity="center"
            android:tag="5-10"
            android:text="5 ~ 10"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text1_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -195,7 +203,7 @@
            android:gravity="center"
            android:tag="10-15"
            android:text="10 ~ 15"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text2_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -210,7 +218,7 @@
            android:gravity="center"
            android:tag="15-30"
            android:text="15 ~ 30"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -219,13 +227,13 @@
            android:id="@+id/text5_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_15"
            android:layout_marginTop="@dimen/dp_66"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="30-100"
            android:text="30 ~ 100"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text4_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -234,13 +242,13 @@
            android:id="@+id/text6_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_15"
            android:layout_marginTop="@dimen/dp_66"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="100-300"
            android:text="100 ~ 300"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text5_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -255,7 +263,7 @@
            android:gravity="center"
            android:tag="300-500"
            android:text="300 ~ 500"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -264,13 +272,13 @@
            android:id="@+id/text8_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_15"
            android:layout_marginTop="114dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="500-1000000"
            android:tag="500+"
            android:text="500+"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text7_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -282,7 +290,7 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="167dp"
            android:text="@string/grid_connected_state"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -295,9 +303,8 @@
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="all"
            android:text="@string/message_all"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="@+id/min_max_rl"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
@@ -310,9 +317,8 @@
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="grid_connected"
            android:text="@string/grid_connected"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/all_tv"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
@@ -325,9 +331,8 @@
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="off_network"
            android:text="@string/off_network"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/grid_connected_tv"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />