Merge remote-tracking branch 'origin/master'

cloudroam

2025-03-31 4e0525287189ead2b40d86cde62d96890db1389b

 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"/>