From 8f4a21c13de88f6c34705f0660ec54ec5e032aa4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 01 十二月 2025 08:24:33 +0800
Subject: [PATCH] Merge branch 'master' into 2.0
---
app/src/main/res/layout/activity_set.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index f3fe5b2..814a06b 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -47,6 +47,13 @@
android:id="@+id/set_temperature_unit_il"
layout="@layout/set_line" />
+ <include
+ android:id="@+id/set_notification_settings_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_context_switch_il"
+ layout="@layout/set_line" />
</LinearLayout>
</ScrollView>
@@ -60,7 +67,7 @@
android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/set_logout"
- 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"
--
Gitblit v1.8.0