From 52f5a8bd245aeeeb97eb7b3d73939a30fe6f33c2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 18 七月 2024 11:06:49 +0800
Subject: [PATCH] 2024年07月18日11:06:44
---
app/src/main/res/layout/fragment_message.xml | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index d22ba4f..01af4c2 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -3,12 +3,13 @@
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_36"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginEnd="@dimen/dp_16"
@@ -21,9 +22,9 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:gravity="center_vertical"
+ android:gravity="center_vertical|bottom"
android:text="@string/message_nascent"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_20"
android:textStyle="bold" />
@@ -34,26 +35,23 @@
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_toStartOf="@+id/all_clear_iv"
android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
- android:gravity="start|center_vertical"
+ android:gravity="start|center_vertical|bottom"
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_marginTop="@dimen/dp_4"
+ android:src="@drawable/clearall" />
</RelativeLayout>
@@ -101,8 +99,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,11 +140,11 @@
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
@@ -154,7 +152,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>
@@ -178,11 +176,11 @@
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
@@ -190,7 +188,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>
@@ -214,18 +212,18 @@
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>
--
Gitblit v1.8.0