From 9c67fc611daf6f9cb7c05f72d598543bff2d26f1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 11:23:17 +0800
Subject: [PATCH] s2024年10月25日11:23:14

---
 app/src/main/res/layout/fragment_message.xml |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index c9efd4b..20feb3f 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -9,9 +9,9 @@
     <RelativeLayout
         android:id="@+id/message_rl"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_36"
+        android:layout_height="@dimen/dp_44"
         android:layout_marginStart="@dimen/dp_16"
-        android:layout_marginTop="@dimen/dp_44"
+        android:layout_marginTop="@dimen/dp_38"
         android:layout_marginEnd="@dimen/dp_16"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,9 +20,8 @@
         <TextView
             android:id="@+id/message_tab_nascent_title_tv"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:gravity="center_vertical|bottom"
             android:text="@string/message_nascent"
             android:textColor="@color/text_E6000000"
             android:textSize="@dimen/text_20"
@@ -31,13 +30,11 @@
         <TextView
             android:id="@+id/message_tab_recover_title_tv"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/dp_21"
-            android:layout_marginEnd="@dimen/dp_4"
-            android:layout_toStartOf="@+id/all_clear_iv"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="36dp"
             android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
-            android:gravity="start|center_vertical|bottom"
             android:text="@string/alarm_record"
             android:textColor="@color/text_66000000"
             android:textSize="@dimen/text_16"
@@ -50,6 +47,7 @@
             android:layout_width="@dimen/dp_28"
             android:layout_height="@dimen/dp_28"
             android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/dp_4"
             android:src="@drawable/clearall" />
 
@@ -60,7 +58,7 @@
         android:id="@+id/message_cl"
         android:layout_width="match_parent"
         android:layout_height="98dp"
-        android:layout_marginTop="@dimen/dp_21"
+        android:layout_marginTop="@dimen/dp_13"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/message_rl">
@@ -151,8 +149,8 @@
                             android:id="@+id/all_device_title_iv"
                             android:layout_width="@dimen/dp_10"
                             android:layout_height="@dimen/dp_10"
-                            android:layout_marginStart="@dimen/dp_7"
-                            android:background="@drawable/up" />
+                            android:layout_marginStart="@dimen/dp_0"
+                            android:background="@drawable/down" />
 
                     </LinearLayout>
 
@@ -187,7 +185,7 @@
                             android:id="@+id/all_grade_title_iv"
                             android:layout_width="@dimen/dp_10"
                             android:layout_height="@dimen/dp_10"
-                            android:layout_marginStart="@dimen/dp_7"
+                            android:layout_marginStart="@dimen/dp_0"
                             android:background="@drawable/down" />
                     </LinearLayout>
 
@@ -210,7 +208,6 @@
                             android:id="@+id/all_time_title_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="@dimen/dp_20"
-                            android:layout_marginEnd="@dimen/dp_7"
                             android:text="@string/alarm_all_time"
                             android:textColor="@color/text_E6000000"
                             android:textSize="@dimen/text_14" />
@@ -243,12 +240,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/message_cl">
 
+        <!-- android:clipToPadding="false"
+            android:paddingBottom="@dimen/dp_16"
+            搴曢儴闂磋窛
+            -->
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/message_rcv"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingBottom="@dimen/dp_16" />
+            android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->

--
Gitblit v1.8.0