mirror of
https://github.com/shaulascr/ecommerce_serang.git
synced 2025-08-13 10:42:21 +00:00
Merge branch 'master' into screen-features
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt # app/src/main/java/com/alya/ecommerce_serang/data/repository/OrderRepository.kt # app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt
This commit is contained in:
@ -41,6 +41,18 @@
|
||||
<activity
|
||||
android:name=".ui.cart.MainActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.profile.EditStoreProfileActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.sells.shipment.DetailShipmentActivity"
|
||||
android:exported="false" />
|
||||
<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 +64,9 @@
|
||||
android:enabled="true"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="dataSync" />
|
||||
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.profile.shipping_service.ShippingServiceActivity"
|
||||
android:exported="false"/>
|
||||
<activity
|
||||
android:name=".ui.notif.NotificationActivity"
|
||||
android:exported="false" />
|
||||
@ -104,12 +118,6 @@
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.balance.BalanceActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.sells.shipment.ShippingConfirmationActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.sells.payment.ClaimPaymentActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.balance.BalanceTopUpActivity"
|
||||
android:exported="false" />
|
||||
|
Reference in New Issue
Block a user