From 971d4899399e8ecf7b3d3c1ade05cb12cdda8c44 Mon Sep 17 00:00:00 2001
From: shaulascr <alya.roosyidah@gmail.com>
Date: Fri, 29 Aug 2025 17:58:55 +0700
Subject: [PATCH] fix layout

---
 .../detailorder/DetailOrderStatusActivity.kt       |  2 +-
 app/src/main/res/layout/activity_add_address.xml   |  2 +-
 .../main/res/layout/activity_detail_payment.xml    | 14 ++++++++++++++
 .../res/layout/activity_detail_store_address.xml   |  4 ++++
 app/src/main/res/layout/dialog_popup.xml           |  1 -
 app/src/main/res/layout/item_shipping_order.xml    |  6 +++---
 app/src/main/res/values/themes.xml                 |  2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/detailorder/DetailOrderStatusActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/detailorder/DetailOrderStatusActivity.kt
index 0b3f940..f151607 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/detailorder/DetailOrderStatusActivity.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/detailorder/DetailOrderStatusActivity.kt
@@ -742,7 +742,7 @@ class DetailOrderStatusActivity : AppCompatActivity() {
             inputFormat.timeZone = TimeZone.getTimeZone("UTC")
 
             // Output format
-            val outputFormat = SimpleDateFormat("dd MMMM yyyy", Locale("id", "ID"))
+            val outputFormat = SimpleDateFormat("dd MMM yyyy", Locale("id", "ID"))
 
             // Parse the input date
             val date = inputFormat.parse(dateString)
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
index 31bb2a1..4d4606f 100644
--- a/app/src/main/res/layout/activity_add_address.xml
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -312,7 +312,7 @@
 
         <Button
             android:id="@+id/btnReloadLocation"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="36dp"
             android:text="Reload"
             android:textSize="12sp"
diff --git a/app/src/main/res/layout/activity_detail_payment.xml b/app/src/main/res/layout/activity_detail_payment.xml
index 4039fc1..0ed0d0c 100644
--- a/app/src/main/res/layout/activity_detail_payment.xml
+++ b/app/src/main/res/layout/activity_detail_payment.xml
@@ -411,11 +411,25 @@
 
         <Button
             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"
             android:text="Tahan Konfirmasi"/>
 
         <Button
             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"
             android:text="Konfirmasi Terima"
             android:layout_alignParentEnd="true"/>
diff --git a/app/src/main/res/layout/activity_detail_store_address.xml b/app/src/main/res/layout/activity_detail_store_address.xml
index 0161177..694beba 100644
--- a/app/src/main/res/layout/activity_detail_store_address.xml
+++ b/app/src/main/res/layout/activity_detail_store_address.xml
@@ -379,6 +379,10 @@
             <Button
                 android:id="@+id/btn_save_address"
                 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"
                 android:enabled="true"
                 android:layout_marginBottom="16dp"/>
diff --git a/app/src/main/res/layout/dialog_popup.xml b/app/src/main/res/layout/dialog_popup.xml
index 1a20aba..5b3fc8c 100644
--- a/app/src/main/res/layout/dialog_popup.xml
+++ b/app/src/main/res/layout/dialog_popup.xml
@@ -75,7 +75,6 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/dmsans_regular"
             android:theme="@style/body_medium"
-
             android:text="Tidak" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_shipping_order.xml b/app/src/main/res/layout/item_shipping_order.xml
index 7fc90a4..870deef 100644
--- a/app/src/main/res/layout/item_shipping_order.xml
+++ b/app/src/main/res/layout/item_shipping_order.xml
@@ -39,7 +39,7 @@
                 <TextView
                     android:id="@+id/courier_name_cost"
                     android:fontFamily="@font/dmsans_semibold"
-                    android:textSize="14sp"
+                    android:textSize="16sp"
                     android:paddingHorizontal="2dp"
                     android:paddingTop="4dp"
                     android:ellipsize="end"
@@ -54,7 +54,7 @@
                     android:id="@+id/est_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="12sp"
+                    android:textSize="14sp"
                     android:paddingHorizontal="4dp"
                     android:text="Estimasi 3-4 hari"/>
             </LinearLayout>
@@ -65,7 +65,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.3"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:gravity="start"
                 android:fontFamily="@font/dmsans_semibold"
                 android:text="Rp15.000"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 05886d2..c825263 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -188,7 +188,7 @@
         </style>
 
             <style name="button.large.active.long">
-                <item name="android:layout_width">380dp</item>
+                <item name="android:layout_width">320dp</item>
             </style>
 
             <style name="button.large.active.medium">