From 2f16542e5eb882e542a1306a41fa392b530b9816 Mon Sep 17 00:00:00 2001 From: shaulascr Date: Fri, 22 Aug 2025 14:38:02 +0700 Subject: [PATCH] fix UI evidence --- .../ecommerce_serang/ui/home/HomeFragment.kt | 2 +- .../ui/order/CheckoutActivity.kt | 12 ++++++------ .../order/detail/AddEvidencePaymentActivity.kt | 18 +++++++++--------- .../ui/profile/mystore/sells/SellsAdapter.kt | 6 +++--- .../layout/activity_add_evidence_payment.xml | 2 ++ 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/home/HomeFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/home/HomeFragment.kt index f7d0c96..25f5704 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/home/HomeFragment.kt @@ -145,7 +145,7 @@ class HomeFragment : Fragment() { binding.loadingAll.root.visibility = View.VISIBLE binding.error.root.isVisible = false binding.home.isVisible = false - delay(3000) + delay(5000) } is HomeUiState.Success -> { binding.loadingAll.root.visibility = View.GONE diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt index e6d7bc6..84b4caa 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt @@ -282,12 +282,12 @@ class CheckoutActivity : AppCompatActivity() { isNestedScrollingEnabled = false } - if (checkoutData.cartItems.isEmpty()) { - // Show empty products state - binding.containerEmptyProducts.visibility = View.VISIBLE - binding.rvProductItems.visibility = View.GONE - return - } +// if (checkoutData.cartItems.isEmpty()) { +// // Show empty products state +// binding.containerEmptyProducts.visibility = View.VISIBLE +// binding.rvProductItems.visibility = View.GONE +// return +// } binding.containerEmptyProducts.visibility = View.GONE binding.rvProductItems.visibility = View.VISIBLE diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/AddEvidencePaymentActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/AddEvidencePaymentActivity.kt index 806c878..e3f53c8 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/AddEvidencePaymentActivity.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/AddEvidencePaymentActivity.kt @@ -61,8 +61,8 @@ class AddEvidencePaymentActivity : AppCompatActivity() { } private val paymentMethods = arrayOf( + "Pilih Metode Pembayaran", "Transfer Bank", - "QRIS", ) // private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? -> @@ -313,10 +313,10 @@ class AddEvidencePaymentActivity : AppCompatActivity() { return } - if (binding.spinnerPaymentMethod.selectedItemPosition == 0) { - Toast.makeText(this, "Silahkan pilih metode pembayaran", Toast.LENGTH_SHORT).show() - return - } +// if (binding.spinnerPaymentMethod.selectedItemPosition == 0) { +// Toast.makeText(this, "Silahkan pilih metode pembayaran", Toast.LENGTH_SHORT).show() +// return +// } binding.etAccountNumber.visibility = View.GONE // if (binding.etAccountNumber.text.toString().trim().isEmpty()) { @@ -324,10 +324,10 @@ class AddEvidencePaymentActivity : AppCompatActivity() { // return // } - if (binding.tvPaymentDate.text.toString() == "Pilih tanggal") { - Toast.makeText(this, "Silahkan pilih tanggal pembayaran", Toast.LENGTH_SHORT).show() - return - } +// if (binding.tvPaymentDate.text.toString() == "Pilih tanggal") { +// Toast.makeText(this, "Silahkan pilih tanggal pembayaran", Toast.LENGTH_SHORT).show() +// return +// } // All validations passed, proceed with upload uploadPaymentProof() diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt index 8765e20..c303f94 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt @@ -97,7 +97,7 @@ class SellsAdapter( val product = order.orderItems?.firstOrNull() tvSellsProductName.text = product?.productName tvSellsProductQty.text = "x${product?.quantity}" - tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toInt()) } + tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toDouble().toInt()) } val fullImageUrl = when (val img = product?.productImage) { is String -> { @@ -170,7 +170,7 @@ class SellsAdapter( val product = order.orderItems?.firstOrNull() tvSellsProductName.text = product?.productName tvSellsProductQty.text = "x${product?.quantity}" - tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toInt()) } + tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toDouble().toInt()) } val fullImageUrl = when (val img = product?.productImage) { is String -> { @@ -186,7 +186,7 @@ class SellsAdapter( .into(ivSellsProduct) tvSellsQty.text = "${order.orderItems?.size} produk" - tvSellsPrice.text = order.totalAmount?.let { formatPrice(it.toInt()) } + tvSellsPrice.text = order.totalAmount?.let { formatPrice(it.toDouble().toInt()) } } "paid" -> { layoutOrders.visibility = View.GONE diff --git a/app/src/main/res/layout/activity_add_evidence_payment.xml b/app/src/main/res/layout/activity_add_evidence_payment.xml index 216d05e..d4ee31b 100644 --- a/app/src/main/res/layout/activity_add_evidence_payment.xml +++ b/app/src/main/res/layout/activity_add_evidence_payment.xml @@ -113,6 +113,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" + android:visibility="gone" android:text="Metode Pembayaran *" android:fontFamily="@font/dmsans_semibold" android:textSize="16sp" /> @@ -122,6 +123,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:visibility="gone" android:background="@drawable/edit_text_background" android:minHeight="50dp" android:padding="12dp" />