Merge remote-tracking branch 'origin/master' into gracia

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	gradle/libs.versions.toml
This commit is contained in:
shaulascr
2025-05-21 12:19:24 +07:00
123 changed files with 10495 additions and 1452 deletions

View File

@ -29,6 +29,18 @@
android:theme="@style/Theme.Ecommerce_serang"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".ui.auth.RegisterStoreActivity"
android:exported="false" />
<activity
android:name=".ui.profile.editprofile.EditProfileCustActivity"
android:exported="false" />
<activity
android:name=".ui.order.history.detailorder.DetailOrderStatusActivity"
android:exported="false" />
<activity
android:name=".ui.order.review.CreateReviewActivity"
android:exported="false" />
<activity
android:name=".ui.profile.mystore.sells.shipment.ShipmentConfirmationActivity"
android:exported="false" />
@ -41,6 +53,9 @@
<activity
android:name=".ui.profile.mystore.sells.payment.DetailPaymentActivity"
android:exported="false" />
<activity
android:name=".ui.profile.mystore.sells.order.DetailOrderActivity"
android:exported="false" />
<activity
android:name=".ui.chat.ChatActivity"
android:exported="false" /> <!-- <provider -->
@ -52,7 +67,6 @@
android:enabled="true"
android:exported="false"
android:foregroundServiceType="dataSync" />
<activity
android:name=".ui.profile.mystore.profile.shipping_service.ShippingServiceActivity"
android:exported="false" />
@ -69,7 +83,7 @@
android:name=".ui.order.detail.PaymentActivity"
android:exported="false" />
<activity
android:name=".data.api.response.customer.cart.CartActivity"
android:name=".ui.cart.CartActivity"
android:exported="false" />
<activity
android:name=".ui.order.address.EditAddressActivity"
@ -140,6 +154,24 @@
<activity
android:name=".ui.MainActivity"
android:exported="false" />
<service
android:name=".ui.notif.fcm.FCMService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/outline_notifications_24" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/blue_500" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="fcm_default_channel" />
</application>
</manifest>