From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/res/layout/activity_setting.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index b66c6ac..3710dc8 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -35,7 +35,7 @@
</androidx.appcompat.widget.Toolbar>
<LinearLayout
- android:id="@+id/about_company"
+ android:id="@+id/notification_permission"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center"
@@ -48,6 +48,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
+ android:text="开启通知权限"
+ android:textColor="#000000" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/about_company"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:background="#F9F9F9"
+ android:layout_marginTop="1dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="5dp"
android:text="关于我们"
android:textColor="#000000" />
</LinearLayout>
--
Gitblit v1.9.3