From 4e0525287189ead2b40d86cde62d96890db1389b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 31 三月 2025 09:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/AndroidManifest.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f78127..99381b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,13 +83,19 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.FirstApp"
- tools:targetApi="31">
-<!-- <activity-->
-<!-- android:name=".ui.reminderOther.ReminderOtherAddActivity2"-->
-<!-- android:configChanges="orientation|keyboardHidden|screenSize"-->
-<!-- android:exported="false"-->
-<!-- android:label="@string/title_activity_reminder_other_add2"-->
-<!-- android:theme="@style/Theme.FirstApp.Fullscreen" />-->
+ tools:targetApi="31"
+ android:usesCleartextTraffic="true"
+ >
+ <activity
+ android:name=".activity.VipActivity"
+ android:exported="false"
+ android:theme="@style/Theme.FirstApp" />
+ <activity
+ android:name=".ui.reminderOther.ReminderOtherAddActivity2"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:exported="false"
+ android:label="@string/title_activity_reminder_other_add2"
+ android:theme="@style/Theme.FirstApp.Fullscreen" />
<activity
android:name=".activity.LoginActivity"
android:exported="true"
@@ -106,11 +112,11 @@
android:exported="false" />
<activity
android:name=".activity.PickupActivity"
- android:exported="false"/>
+ android:exported="false" />
<activity
android:name=".activity.ContentDetailActivity"
- android:theme="@style/Theme.ContentDetail"
- android:exported="false" />
+ android:exported="false"
+ android:theme="@style/Theme.ContentDetail" />
<activity
android:name=".ui.profile.EditProfileActivity"
android:exported="false"/>
--
Gitblit v1.9.3