From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/activity_message_center_list.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 9c099f1..444d865 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -182,23 +182,24 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/message_bottom_alarm_device_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
+ android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
android:text="@string/alarm_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
android:id="@+id/message_bottom_alarm_device_line_v"
android:layout_width="18dp"
android:layout_height="3dp"
+ android:layout_gravity="center"
android:layout_marginTop="4.5dp"
android:background="@drawable/line_view" />
@@ -210,23 +211,24 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/message_bottom_alarm_record_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
+ android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
android:text="@string/alarm_record"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
android:id="@+id/message_bottom_alarm_record_line_v"
android:layout_width="@dimen/dp_18"
android:layout_height="3dp"
+ android:layout_gravity="center"
android:layout_marginTop="4.5dp"
android:background="@drawable/line_view" />
--
Gitblit v1.8.0