Merge branch 'screen-features'

# Conflicts:
#	app/src/main/AndroidManifest.xml
This commit is contained in:
shaulascr
2025-06-18 00:41:47 +07:00
39 changed files with 1225 additions and 365 deletions

View File

@ -90,7 +90,7 @@
<string name="dl_pending">Batas Tagihan</string>
<string name="dl_unpaid">Batas Pembayaran</string>
<string name="dl_processed">Batas Pengiriman</string>
<string name="dal_paid">Semua Pesanan </string>
<string name="dl_paid">Batas Konfirmasi Penjual</string>
<string name="dl_delivered">Semua Pesanan </string>
<string name="dl_completed">Semua Pesanan </string>
<string name="dl_shipped">Tanggal Pesanan Sampai</string>

View File

@ -60,4 +60,17 @@
<item name="cornerRadius">8dp</item>
<item name="backgroundTint">@color/white</item>
</style>
<style name="MyCardView" parent="@style/Widget.MaterialComponents.CardView">
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialCardView.Cut</item>
</style>
<style name="ShapeAppearanceOverlay.MaterialCardView.Cut" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">24dp</item>
<item name="cornerSizeTopLeft">24dp</item>
<item name="cornerSizeBottomRight">4dp</item>
<item name="cornerSizeBottomLeft">4dp</item>
</style>
</resources>