From 3e3904224ff6b37c654f54cee56e9ca466f289de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/layout/activity_message_center_list.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 c19cd38..894ba7b 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -39,7 +39,7 @@
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"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +50,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/down"
+ android:background="@drawable/up"
app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv"
app:layout_constraintStart_toEndOf="@+id/all_device_title_tv"
app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" />
@@ -69,7 +69,7 @@
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"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/down"
+ android:background="@drawable/up"
app:layout_constraintBottom_toBottomOf="@+id/all_grade_title_tv"
app:layout_constraintStart_toEndOf="@+id/all_grade_title_tv"
app:layout_constraintTop_toTopOf="@+id/all_grade_title_tv" />
@@ -101,7 +101,7 @@
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"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -111,7 +111,7 @@
android:id="@+id/all_time_title_iv"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
- android:background="@drawable/down"
+ android:background="@drawable/up"
app:layout_constraintBottom_toBottomOf="@+id/all_time_title_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/all_time_title_tv" />
--
Gitblit v1.8.0