Merge remote-tracking branch 'origin/master'

tj

2025-03-28 dde2eeddbaf07246da7c2c352e7d49ec63fddcd2

 app/src/main/AndroidManifest.xml

@@ -83,7 +83,13 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.FirstApp"
        tools:targetApi="31">
        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"
@@ -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"/>