From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'
---
app/src/main/res/layout/fragment_message.xml | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index c9efd4b..4e16aa1 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="4dp"
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">
@@ -152,7 +150,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/up" />
+ android:background="@drawable/down" />
</LinearLayout>
@@ -243,12 +241,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