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
This commit is contained in:
shaulascr
2025-04-20 22:43:25 +07:00
27 changed files with 1531 additions and 197 deletions

View File

@ -147,7 +147,7 @@
<!-- Buttons -->
<style name="button.large" parent="label_large_prominent">
<item name="android:padding">10.91dp</item>
<item name="android:gravity">center</item>
<item name="android:layout_height">40dp</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@null</item>
@ -217,7 +217,7 @@
</style>
<style name="button.small" parent="label_medium_prominent">
<item name="android:padding">7dp</item>
<item name="android:padding">2dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@null</item>