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:
shaulascr
2025-05-14 04:27:42 +07:00
88 changed files with 5091 additions and 1301 deletions

View File

@ -10,7 +10,7 @@
<string name="item_price_txt">Rp%.1f</string>
<string name="retry">Coba lagi\n</string>
<string name="error_loading">Terdapat error...</string>
<string name="error_loading">Terdapat error</string>
<string name="new_products_text">Produk Terbaru</string>
<string name="rating">4.5</string>
<string name="open_store">Buka Toko</string>