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 | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 9f64d5f..a9a1bca 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -16,7 +16,7 @@
<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"
@@ -98,26 +98,6 @@
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_E6000000"
- 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"
@@ -337,6 +317,41 @@
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