From 36487596c9951571f376e3d181d46ee11174f8e2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 18:46:31 +0800
Subject: [PATCH] 2024年11月27日18:46:26
---
app/src/main/res/layout/dialog_default_filtering.xml | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index a9a1bca..982d567 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -17,7 +17,7 @@
android:id="@+id/default_filtering_cl"
android:layout_width="match_parent"
android:layout_height="447dp"
- android:background="@color/ffffff"
+ android:background="@drawable/l_r_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@@ -44,8 +44,8 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/loading_cancel"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
@@ -57,8 +57,10 @@
android:layout_toEndOf="@+id/cancel_ll"
android:gravity="center"
android:text="@string/filtering"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/dp_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/dp_18"
+ android:visibility="gone"
+ />
<LinearLayout
android:id="@+id/affirm_ll"
@@ -73,15 +75,15 @@
android:layout_height="match_parent"
android:gravity="center_vertical|start"
android:text="@string/loading_affirm"
- android:textColor="@color/text_38C494"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_1"
+ android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -93,7 +95,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_18"
android:text="@string/string_capacity"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -113,16 +115,16 @@
android:layout_width="@dimen/dp_135"
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:inputType="number"
- android:textColor="@color/text_E6000000"
- android:textColorHint="@color/text_66000000"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
<View
android:layout_width="@dimen/dp_16"
- android:layout_height="1dp"
+ android:layout_height="0.5dp"
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_180"
android:layout_marginTop="@dimen/dp_19"
@@ -135,11 +137,11 @@
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:inputType="number"
- android:textColor="@color/text_E6000000"
- android:textColorHint="@color/text_66000000"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -149,11 +151,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_18"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="0-5"
android:text="0 ~ 5"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -164,11 +166,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_18"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="5-10"
android:text="5 ~ 10"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/text1_tv"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -179,11 +181,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_18"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="10-15"
android:text="10 ~ 15"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/text2_tv"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -194,11 +196,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_66"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="15-30"
android:text="15 ~ 30"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -209,11 +211,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_66"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="30-100"
android:text="30 ~ 100"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/text4_tv"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -224,11 +226,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_66"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="100-300"
android:text="100 ~ 300"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/text5_tv"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -239,11 +241,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="114dp"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="300-500"
android:text="300 ~ 500"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -254,11 +256,11 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="114dp"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:tag="500+"
android:text="500+"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/text7_tv"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -270,7 +272,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="167dp"
android:text="@string/grid_connected_state"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
@@ -281,10 +283,10 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="13dp"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/message_all"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="@+id/min_max_rl"
app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
@@ -295,10 +297,10 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="13dp"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/grid_connected"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/all_tv"
app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
@@ -309,10 +311,10 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="13dp"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/off_network"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toEndOf="@+id/grid_connected_tv"
app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
@@ -321,7 +323,7 @@
android:id="@+id/reset_rl"
android:layout_width="0dp"
android:layout_height="@dimen/dp_52"
- android:background="@color/text_38C494"
+ android:background="@color/text_FF555859"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@@ -335,20 +337,20 @@
<ImageView
android:layout_width="@dimen/dp_19"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_19"
android:src="@drawable/reset" />
<View
- android:layout_width="@dimen/dp_2"
- android:layout_height="wrap_content" />
+ android:layout_width="@dimen/dp_7"
+ android:layout_height="match_parent" />
<TextView
android:id="@+id/reset_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_25"
+ android:layout_height="wrap_content"
android:text="@string/reset"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
</RelativeLayout>
--
Gitblit v1.8.0