From 37883963f4dbb613834bc8dbaf9b296848f16187 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 14:17:06 +0800
Subject: [PATCH] 2024年10月25日14:17:04
---
app/src/main/res/layout/fragment_message.xml | 77 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index d22ba4f..20feb3f 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -3,14 +3,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/message_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@drawable/bj">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/message_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31"
+ 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"
@@ -19,41 +20,36 @@
<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"
android:text="@string/message_nascent"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_20"
android:textStyle="bold" />
<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_tv"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="36dp"
android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
- android:gravity="start|center_vertical"
android:text="@string/alarm_record"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_16"
/>
- <TextView
- android:id="@+id/all_clear_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_31"
- android:layout_alignParentEnd="true"
- android:gravity="center"
- android:text="@string/all_read"
- android:textColor="@color/text_38C494"
- android:textSize="@dimen/dp_16"
+ <ImageView
- />
+ android:id="@+id/all_clear_iv"
+ 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" />
</RelativeLayout>
@@ -62,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">
@@ -101,8 +97,8 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
- android:text="Search the message"
- android:textColor="@color/text_40000000"
+ android:text="@string/enter_alarm_name"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -142,19 +138,19 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_device"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_14" />
<View
- android:layout_width="@dimen/dp_7"
+ android:layout_width="@dimen/dp_5"
android:layout_height="match_parent" />
<ImageView
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>
@@ -178,19 +174,19 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_grade"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_14" />
<View
- android:layout_width="7dp"
+ android:layout_width="5dp"
android:layout_height="match_parent" />
<ImageView
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:background="@drawable/up" />
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
</LinearLayout>
@@ -212,20 +208,19 @@
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_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_14" />
<View
- android:layout_width="@dimen/dp_7"
+ android:layout_width="@dimen/dp_5"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/all_time_title_iv"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
- android:background="@drawable/up" />
+ android:background="@drawable/down" />
</LinearLayout>
@@ -245,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