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 022be0b..38a3737 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 @@ -222,8 +222,6 @@ class AddEvidencePaymentActivity : AppCompatActivity() { val adapter = object : ArrayAdapter(this, R.layout.item_dialog_add_evidence, R.id.tvOption, options) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val view = super.getView(position, convertView, parent) - val divider = view.findViewById(R.id.divider) - divider.visibility = if (position == count - 1) View.GONE else View.VISIBLE return view } } @@ -455,9 +453,6 @@ class AddEvidencePaymentActivity : AppCompatActivity() { ).show() } - - - companion object { private const val PERMISSION_REQUEST_CODE = 100 private const val TAG = "AddEvidenceActivity" diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/DetailStoreProductActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/DetailStoreProductActivity.kt index 27b805b..81b6a42 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/DetailStoreProductActivity.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/DetailStoreProductActivity.kt @@ -418,8 +418,8 @@ class DetailStoreProductActivity : AppCompatActivity() { Log.d(TAG, "SPPIRT URI: ${sppirtUri.toString()}") Log.d(TAG, "Halal URI: ${halalUri.toString()}") - logFileInfo("Sppirt Size", sppirtFile!!) - logFileInfo("Halal Size", halalFile!!) + sppirtFile?.let { logFileInfo("Sppirt Size", it) } + halalFile?.let { logFileInfo("Halal Size", it) } val imagePart = imageFile?.let { createPartFromFile("productimg", it) } val sppirtPart = sppirtFile?.let { createPartFromFile("sppirt", it) } 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 c303f94..6d4908e 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 @@ -206,6 +206,8 @@ class SellsAdapter( tvSellsTitle.text = "Pesanan Telah Dibayar" tvSellsDueDesc.text = "Konfirmasi pembayaran sebelum:" tvSellsDue.text = formatDueDate(order.updatedAt.toString(), 2) + val totalPrice = (order.totalAmount?.toDouble()?.toInt() ?: 0) - (order.shipmentPrice?.toDouble()?.toInt() ?: 0) + tvSellsPrice.text =formatPrice(totalPrice).toString() } "processed" -> { diff --git a/app/src/main/res/drawable/banner_default.jpg b/app/src/main/res/drawable/banner_default.jpg deleted file mode 100644 index 4b227f5..0000000 Binary files a/app/src/main/res/drawable/banner_default.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/logo_psb_small.png b/app/src/main/res/drawable/logo_psb_small.png deleted file mode 100644 index 0cf47e2..0000000 Binary files a/app/src/main/res/drawable/logo_psb_small.png and /dev/null differ diff --git a/app/src/main/res/layout/dialog_popup.xml b/app/src/main/res/layout/dialog_popup.xml index 6aa77bc..1a20aba 100644 --- a/app/src/main/res/layout/dialog_popup.xml +++ b/app/src/main/res/layout/dialog_popup.xml @@ -28,14 +28,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Judul" - android:layout_marginTop="16dp" + android:layout_marginTop="32dp" android:paddingHorizontal="16dp" + android:layout_marginHorizontal="32dp" android:paddingTop="4dp" android:ellipsize="end" android:scrollHorizontally="false" android:singleLine="false" android:gravity="center" - android:textSize="16sp" + android:textSize="18sp" android:maxLines="3" android:fontFamily="@font/dmsans_semibold" android:textColor="?attr/colorOnSurface" /> @@ -45,6 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" + android:layout_marginHorizontal="32dp" android:gravity="center" android:maxLines="3" android:paddingHorizontal="16dp" @@ -54,7 +56,7 @@ android:singleLine="false" android:text="Pesan Dialog" android:fontFamily="@font/dmsans_regular" - android:textSize="12sp" + android:textSize="14sp" android:textColor="?attr/colorOnSurfaceVariant" /> @@ -83,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:fontFamily="@font/dmsans_regular" - android:theme="@style/body_small" + android:theme="@style/body_medium" android:text="Ya" />