2110512039/BisaUMKM
1
0
Fork 0
mirror of https://github.com/shaulascr/ecommerce_serang.git synced 2025-12-18 00:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix layout

Browse Source
This commit is contained in:
shaulascr
2025-08-29 17:58:55 +07:00
parent 9b8c92605c
commit 971d489939
7 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/alya/ecommerce_serang/ui/order/history/detailorder/DetailOrderStatusActivity.kt
View File

@ -742,7 +742,7 @@ class DetailOrderStatusActivity : AppCompatActivity() {
inputFormat.timeZone = TimeZone.getTimeZone("UTC") inputFormat.timeZone = TimeZone.getTimeZone("UTC")
// Output format // Output format
val outputFormat = SimpleDateFormat("dd MMMM yyyy", Locale("id", "ID")) val outputFormat = SimpleDateFormat("dd MMM yyyy", Locale("id", "ID"))
// Parse the input date // Parse the input date
val date = inputFormat.parse(dateString) val date = inputFormat.parse(dateString)

2
app/src/main/res/layout/activity_add_address.xml
View File

@ -312,7 +312,7 @@
<Button <Button
android:id="@+id/btnReloadLocation" android:id="@+id/btnReloadLocation"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="36dp" android:layout_height="36dp"
android:text="Reload" android:text="Reload"
android:textSize="12sp" android:textSize="12sp"

14
app/src/main/res/layout/activity_detail_payment.xml
View File

@ -411,11 +411,25 @@
<Button <Button
android:id="@+id/btn_hold_payment" android:id="@+id/btn_hold_payment"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:ellipsize="end"
android:layout_weight="1"
android:scrollHorizontally="false"
android:singleLine="false"
style="@style/button.large.secondary.medium" style="@style/button.large.secondary.medium"
android:text="Tahan Konfirmasi"/> android:text="Tahan Konfirmasi"/>
<Button <Button
android:id="@+id/btn_confirm_payment" android:id="@+id/btn_confirm_payment"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:ellipsize="end"
android:layout_weight="1"
android:scrollHorizontally="false"
android:singleLine="false"
style="@style/button.large.active.medium" style="@style/button.large.active.medium"
android:text="Konfirmasi Terima" android:text="Konfirmasi Terima"
android:layout_alignParentEnd="true"/> android:layout_alignParentEnd="true"/>

4
app/src/main/res/layout/activity_detail_store_address.xml
View File

@ -379,6 +379,10 @@
<Button <Button
android:id="@+id/btn_save_address" android:id="@+id/btn_save_address"
android:text="Simpan Perubahan" android:text="Simpan Perubahan"
android:layout_height="36dp"
android:layout_weight="1"
android:layout_gravity="center"
android:gravity="center"
style="@style/button.large.active.long" style="@style/button.large.active.long"
android:enabled="true" android:enabled="true"
android:layout_marginBottom="16dp"/> android:layout_marginBottom="16dp"/>

1
app/src/main/res/layout/dialog_popup.xml
View File

@ -75,7 +75,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/dmsans_regular" android:fontFamily="@font/dmsans_regular"
android:theme="@style/body_medium" android:theme="@style/body_medium"
android:text="Tidak" /> android:text="Tidak" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

6
app/src/main/res/layout/item_shipping_order.xml
View File

@ -39,7 +39,7 @@
<TextView <TextView
android:id="@+id/courier_name_cost" android:id="@+id/courier_name_cost"
android:fontFamily="@font/dmsans_semibold" android:fontFamily="@font/dmsans_semibold"
android:textSize="14sp" android:textSize="16sp"
android:paddingHorizontal="2dp" android:paddingHorizontal="2dp"
android:paddingTop="4dp" android:paddingTop="4dp"
android:ellipsize="end" android:ellipsize="end"
@ -54,7 +54,7 @@
android:id="@+id/est_date" android:id="@+id/est_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" android:textSize="14sp"
android:paddingHorizontal="4dp" android:paddingHorizontal="4dp"
android:text="Estimasi 3-4 hari"/> android:text="Estimasi 3-4 hari"/>
</LinearLayout> </LinearLayout>
@ -65,7 +65,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.3" android:layout_weight="0.3"
android:textSize="14sp" android:textSize="16sp"
android:gravity="start" android:gravity="start"
android:fontFamily="@font/dmsans_semibold" android:fontFamily="@font/dmsans_semibold"
android:text="Rp15.000"/> android:text="Rp15.000"/>

2
app/src/main/res/values/themes.xml
View File

@ -188,7 +188,7 @@
</style> </style>
<style name="button.large.active.long"> <style name="button.large.active.long">
<item name="android:layout_width">380dp</item> <item name="android:layout_width">320dp</item>
</style> </style>
<style name="button.large.active.medium"> <style name="button.large.active.medium">