From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/res/layout/dialog_default_filtering.xml | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 46 deletions(-)
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index a2dd503..a9a1bca 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -4,10 +4,19 @@
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"
- android:layout_height="405dp"
+ android:layout_height="447dp"
android:background="@color/ffffff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="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,37 +87,17 @@
<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" />
- <ImageView
- android:layout_width="@dimen/dp_19"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_5"
- android:src="@drawable/reset"
- app:layout_constraintEnd_toStartOf="@+id/reset_tv"
- app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
-
- <TextView
- android:id="@+id/reset_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_23"
- android:layout_marginTop="@dimen/dp_18"
- android:layout_marginEnd="@dimen/dp_20"
- android:text="@string/reset"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
<RelativeLayout
android:id="@+id/min_max_rl"
@@ -124,8 +116,8 @@
android:background="@drawable/search_bj_ff05000000"
android:gravity="center"
android:inputType="number"
- android:textColor="@color/text_90000000"
- android:textColorHint="@color/text_40000000"
+ android:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
<View
@@ -146,8 +138,8 @@
android:background="@drawable/search_bj_ff05000000"
android:gravity="center"
android:inputType="number"
- android:textColor="@color/text_90000000"
- android:textColorHint="@color/text_40000000"
+ android:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -161,7 +153,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" />
@@ -176,7 +168,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" />
@@ -191,7 +183,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" />
@@ -206,7 +198,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" />
@@ -221,7 +213,7 @@
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" />
@@ -236,7 +228,7 @@
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" />
@@ -251,7 +243,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" />
@@ -266,7 +258,7 @@
android:gravity="center"
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" />
@@ -278,7 +270,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" />
@@ -292,7 +284,7 @@
android:background="@drawable/search_bj_ff05000000"
android:gravity="center"
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" />
@@ -306,7 +298,7 @@
android:background="@drawable/search_bj_ff05000000"
android:gravity="center"
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" />
@@ -320,11 +312,46 @@
android:background="@drawable/search_bj_ff05000000"
android:gravity="center"
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" />
+ <RelativeLayout
+ android:id="@+id/reset_rl"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_52"
+ android:background="@color/text_38C494"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_17"
+ android:src="@drawable/reset" />
+
+ <View
+ android:layout_width="@dimen/dp_2"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/reset_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:text="@string/reset"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_18" />
+ </LinearLayout>
+ </RelativeLayout>
+
</androidx.constraintlayout.widget.ConstraintLayout>
--
Gitblit v1.8.0