diff --git a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt index 5439b14..5efc65d 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/sells/OrderListResponse.kt @@ -129,5 +129,7 @@ data class OrdersItem( val status: String? = null, @field:SerializedName("city_id") - val cityId: Int? = null + val cityId: Int? = null, + + var displayStatus: String? = null ) diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangePriceBottomSheetFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangePriceBottomSheetFragment.kt index 0d8be50..8a88ac1 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangePriceBottomSheetFragment.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangePriceBottomSheetFragment.kt @@ -5,56 +5,47 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button +import android.widget.EditText +import android.widget.Toast import com.alya.ecommerce_serang.R +import com.alya.ecommerce_serang.data.api.dto.ProductsItem +import com.alya.ecommerce_serang.databinding.FragmentChangePriceBottomSheetBinding +import com.google.android.material.bottomsheet.BottomSheetDialogFragment -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [ChangePriceBottomSheetFragment.newInstance] factory method to - * create an instance of this fragment. - */ -class ChangePriceBottomSheetFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } +class ChangePriceBottomSheetFragment( + private val product: ProductsItem, + private val onSave: (productId: Int, newPrice: Int) -> Unit +) : BottomSheetDialogFragment() { + private var _binding: FragmentChangePriceBottomSheetBinding? = null + private val binding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_change_price_bottom_sheet, container, false) + ): View { + _binding = FragmentChangePriceBottomSheetBinding.inflate(inflater, container, false) + + binding.header.headerTitle.text = "Atur Harga" + binding.header.headerLeftIcon.setImageResource(R.drawable.ic_close) + binding.header.headerLeftIcon.setOnClickListener { dismiss() } + + binding.edtPrice.setText(product.price) + + binding.btnSave.setOnClickListener { + val newPrice = binding.edtPrice.text.toString().replace(".", "").toIntOrNull() + if (newPrice != null && newPrice > 0) { + onSave(product.id, newPrice) + dismiss() + } else { + Toast.makeText(requireContext(), "Masukkan harga yang valid", Toast.LENGTH_SHORT).show() + } + } + return binding.root } - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment ChangePriceBottomSheetFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - ChangePriceBottomSheetFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } + override fun onDestroyView() { + super.onDestroyView() + _binding = null } } \ No newline at end of file diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangeStockBottomSheetFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangeStockBottomSheetFragment.kt new file mode 100644 index 0000000..9a4762d --- /dev/null +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ChangeStockBottomSheetFragment.kt @@ -0,0 +1,69 @@ +package com.alya.ecommerce_serang.ui.profile.mystore.product + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import com.alya.ecommerce_serang.R +import com.alya.ecommerce_serang.data.api.dto.ProductsItem +import com.alya.ecommerce_serang.databinding.FragmentChangeStockBottomSheetBinding +import com.google.android.material.bottomsheet.BottomSheetDialogFragment + +class ChangeStockBottomSheetFragment( + private val product: ProductsItem, + private val onSave: (productId: Int, newStock: Int) -> Unit +): BottomSheetDialogFragment() { + private var _binding: FragmentChangeStockBottomSheetBinding? = null + private val binding get() = _binding!! + + private var stock = 0 + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + _binding = FragmentChangeStockBottomSheetBinding.inflate(inflater, container, false) + + binding.header.headerTitle.text = "Atur Stok" + binding.header.headerLeftIcon.setImageResource(R.drawable.ic_close) + binding.header.headerLeftIcon.setOnClickListener { dismiss() } + + stock = product.stock + updateStock() + + binding.btnMinus.setOnClickListener { + if (stock > 0) stock-- + updateStock() + } + + binding.btnPlus.setOnClickListener { + stock++ + updateStock() + } + + binding.btnSave.setOnClickListener { + onSave(product.id, stock) + dismiss() + } + + return binding.root + } + + private fun updateStock() { + binding.edtStock.setText(stock.toString()) + if (stock == 0) { + binding.btnMinus.isEnabled = false + binding.btnMinus.setColorFilter(ContextCompat.getColor(requireContext(), R.color.black_100)) + } else { + binding.btnMinus.isEnabled = true + binding.btnMinus.setColorFilter(ContextCompat.getColor(requireContext(), R.color.blue_500)) + } + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductActivity.kt index 45a3cbd..e28b2f6 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductActivity.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductActivity.kt @@ -20,9 +20,10 @@ class ProductActivity : AppCompatActivity() { private lateinit var binding: ActivityProductBinding private lateinit var sessionManager: SessionManager + private lateinit var productAdapter: ProductAdapter + private val viewModel: ProductViewModel by viewModels { BaseViewModelFactory { - sessionManager = SessionManager(this) val apiService = ApiConfig.getApiService(sessionManager) val productRepository = ProductRepository(apiService) ProductViewModel(productRepository) @@ -30,6 +31,8 @@ class ProductActivity : AppCompatActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + sessionManager = SessionManager(this) + super.onCreate(savedInstanceState) binding = ActivityProductBinding.inflate(layoutInflater) setContentView(binding.root) @@ -56,9 +59,18 @@ class ProductActivity : AppCompatActivity() { is Result.Success -> { binding.progressBar.visibility = View.GONE val products = result.data - binding.rvStoreProduct.adapter = ProductAdapter(products) { - Toast.makeText(this, "Produk: ${it.name}", Toast.LENGTH_SHORT).show() - } + + productAdapter = ProductAdapter( + products, + onItemClick = { products -> + Toast.makeText(this, "Produk ${products.name} diklik", Toast.LENGTH_SHORT).show() + }, + onUpdateProduct = { productId, updatedFields -> + viewModel.updateProduct(productId, updatedFields) + } + ) + + binding.rvStoreProduct.adapter = productAdapter } is Result.Error -> { binding.progressBar.visibility = View.GONE @@ -66,6 +78,19 @@ class ProductActivity : AppCompatActivity() { } } } + + viewModel.productUpdateResult.observe(this) { result -> + when (result) { + is Result.Success -> { + Toast.makeText(this, "Produk berhasil diperbarui", Toast.LENGTH_SHORT).show() + viewModel.loadMyStoreProducts() + } + is Result.Error -> { + Toast.makeText(this, "Gagal memperbarui produk", Toast.LENGTH_SHORT).show() + } + else -> {} + } + } } private fun setupHeader() { diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductAdapter.kt index c249fb0..5fa810b 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductAdapter.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/ProductAdapter.kt @@ -3,6 +3,7 @@ package com.alya.ecommerce_serang.ui.profile.mystore.product import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import android.widget.ImageView import android.widget.PopupMenu import android.widget.TextView @@ -15,10 +16,14 @@ import com.alya.ecommerce_serang.R import com.alya.ecommerce_serang.data.api.dto.Product import com.alya.ecommerce_serang.data.api.dto.ProductsItem import com.bumptech.glide.Glide +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody class ProductAdapter( private val products: List, - private val onItemClick: (ProductsItem) -> Unit + private val onItemClick: (ProductsItem) -> Unit, + private val onUpdateProduct: (productId: Int, updatedFields: Map) -> Unit ) : RecyclerView.Adapter() { inner class ProductViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { @@ -28,6 +33,8 @@ class ProductAdapter( private val tvProductStock: TextView = itemView.findViewById(R.id.tv_product_stock) private val tvProductStatus: TextView = itemView.findViewById(R.id.tv_product_status) private val ivMenu: ImageView = itemView.findViewById(R.id.iv_menu) + private val btnChangePrice: Button = itemView.findViewById(R.id.btn_change_price) + private val btnChangeStock: Button = itemView.findViewById(R.id.btn_change_stock) fun bind(product: ProductsItem) { tvProductName.text = product.name @@ -55,7 +62,6 @@ class ProductAdapter( .into(ivProduct) ivMenu.setOnClickListener { - // Show Bottom Sheet when menu is clicked val bottomSheetFragment = ProductOptionsBottomSheetFragment(product) bottomSheetFragment.show( (itemView.context as FragmentActivity).supportFragmentManager, @@ -63,6 +69,36 @@ class ProductAdapter( ) } + btnChangePrice.setOnClickListener { + val bottomSheetFragment = ChangePriceBottomSheetFragment(product) { id, newPrice -> + val body = mapOf( + "product_id" to id.toString().toRequestBody("text/plain".toMediaTypeOrNull()), + "price" to newPrice.toString().toRequestBody("text/plain".toMediaTypeOrNull()) + ) + onUpdateProduct(id, body) + Toast.makeText(itemView.context, "Harga berhasil diubah", Toast.LENGTH_SHORT).show() + } + bottomSheetFragment.show( + (itemView.context as FragmentActivity).supportFragmentManager, + bottomSheetFragment.tag + ) + } + + btnChangeStock.setOnClickListener { + val bottomSheetFragment = ChangeStockBottomSheetFragment(product) { id, newStock -> + val body = mapOf( + "product_id" to id.toString().toRequestBody("text/plain".toMediaTypeOrNull()), + "stock" to newStock.toString().toRequestBody("text/plain".toMediaTypeOrNull()) + ) + onUpdateProduct(id, body) + Toast.makeText(itemView.context, "Stok berhasil diubah", Toast.LENGTH_SHORT).show() + } + bottomSheetFragment.show( + (itemView.context as FragmentActivity).supportFragmentManager, + bottomSheetFragment.tag + ) + } + itemView.setOnClickListener { onItemClick(product) } 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 4fadaab..38342be 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 @@ -86,7 +86,7 @@ class SellsAdapter( Log.d("SellsAdapter", "=== ViewHolder.bind() called ===") Log.d("SellsAdapter", "Binding order: ${order.orderId} with status: ${order.status}") - val actualStatus = if (fragmentStatus == "all") order.status ?: "" else fragmentStatus + val actualStatus = if (fragmentStatus == "all") order.displayStatus ?: "" else fragmentStatus adjustDisplay(actualStatus, order) tvSellsNumber.text = "No. Pesanan: ${order.orderId}" diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/shipment/DetailShipmentActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/shipment/DetailShipmentActivity.kt index 9ca1b03..99b8077 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/shipment/DetailShipmentActivity.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/shipment/DetailShipmentActivity.kt @@ -6,6 +6,7 @@ import android.util.Log import android.widget.Toast import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import com.alya.ecommerce_serang.data.api.response.store.sells.Orders import com.alya.ecommerce_serang.data.api.response.store.sells.OrdersItem import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig @@ -13,6 +14,7 @@ import com.alya.ecommerce_serang.data.repository.AddressRepository import com.alya.ecommerce_serang.data.repository.SellsRepository import com.alya.ecommerce_serang.databinding.ActivityDetailShipmentBinding import com.alya.ecommerce_serang.ui.profile.mystore.sells.SellsProductAdapter +import com.alya.ecommerce_serang.ui.profile.mystore.sells.payment.DetailPaymentActivity import com.alya.ecommerce_serang.utils.BaseViewModelFactory import com.alya.ecommerce_serang.utils.SessionManager import com.alya.ecommerce_serang.utils.viewmodel.AddressViewModel @@ -51,6 +53,12 @@ class DetailShipmentActivity : AppCompatActivity() { finish() } + productAdapter = SellsProductAdapter() + binding.rvProductItems.apply { + adapter = productAdapter + layoutManager = LinearLayoutManager(this@DetailShipmentActivity) + } + val sellsJson = intent.getStringExtra("sells_data") if (sellsJson != null) { try { diff --git a/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/ProductViewModel.kt b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/ProductViewModel.kt index 280f3e1..61c796f 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/ProductViewModel.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/ProductViewModel.kt @@ -111,9 +111,9 @@ class ProductViewModel(private val repository: ProductRepository) : ViewModel() fun updateProduct( productId: Int?, data: Map, - image: MultipartBody.Part?, - halal: MultipartBody.Part?, - sppirt: MultipartBody.Part? + image: MultipartBody.Part? = null, + halal: MultipartBody.Part? = null, + sppirt: MultipartBody.Part? = null ) { viewModelScope.launch { _productUpdateResult.postValue(Result.Loading) diff --git a/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/SellsViewModel.kt b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/SellsViewModel.kt index 63ec528..92a04ce 100644 --- a/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/SellsViewModel.kt +++ b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/SellsViewModel.kt @@ -14,7 +14,12 @@ import com.alya.ecommerce_serang.data.api.response.store.sells.PaymentConfirmati import com.alya.ecommerce_serang.data.repository.Result import com.alya.ecommerce_serang.data.repository.SellsRepository import com.alya.ecommerce_serang.ui.order.address.ViewState +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch +import java.text.SimpleDateFormat +import java.util.Locale class SellsViewModel(private val repository: SellsRepository) : ViewModel() { @@ -59,79 +64,128 @@ class SellsViewModel(private val repository: SellsRepository) : ViewModel() { Log.d(TAG, "Coroutine launched successfully") try { - Log.d(TAG, "Calling repository.getSellList(status='$status')") - val startTime = System.currentTimeMillis() + if(status == "all") { + Log.d(TAG, "Status is 'all', calling repository.getSellList()") + val allStatuses = listOf("pending", "unpaid", "processed", "shipped") + val allSells = mutableListOf() - when (val result = repository.getSellList(status)) { - is Result.Success -> { - val endTime = System.currentTimeMillis() - Log.d(TAG, "Repository call completed in ${endTime - startTime}ms") - Log.d(TAG, "Result.Success received from repository") - - // Log the entire result data structure - Log.d(TAG, "Raw result data: ${result.data}") - Log.d(TAG, "Result data class: ${result.data.javaClass.simpleName}") - - val orders = result.data.orders - Log.d(TAG, "Extracted orders list: $orders") - Log.d(TAG, "Orders list class: ${orders.javaClass.simpleName}") - Log.d(TAG, "Orders count: ${orders.size}") - - // Check if orders list is null or empty - if (false) { - Log.w(TAG, "⚠️ Orders list is NULL") - } else if (orders.isEmpty()) { - Log.w(TAG, "⚠️ Orders list is EMPTY") - } else { - Log.d(TAG, "✅ Orders list contains ${orders.size} items") - - // Log individual order details with more comprehensive info - orders.forEachIndexed { index, order -> - Log.d(TAG, "--- Order ${index + 1}/${orders.size} ---") - Log.d(TAG, " Order object: $order") - Log.d(TAG, " Order class: ${order.javaClass.simpleName}") - Log.d(TAG, " - ID: ${order.orderId}") - Log.d(TAG, " - Status: '${order.status}'") - Log.d(TAG, " - Customer: '${order.username}'") - Log.d(TAG, " - Total: ${order.totalAmount}") - Log.d(TAG, " - Items count: ${order.orderItems?.size ?: 0}") - Log.d(TAG, " - Created at: ${order.createdAt}") - Log.d(TAG, " - Updated at: ${order.updatedAt}") - - // Log order items if available - order.orderItems?.let { items -> - Log.d(TAG, " Order items:") - items.forEachIndexed { itemIndex, item -> - Log.d(TAG, " Item ${itemIndex + 1}: ${item?.productName} (Qty: ${item?.quantity})") + coroutineScope { + val deferreds = allStatuses.map { status -> + async { + when (val result = repository.getSellList(status)) { + is Result.Success -> { + result.data.orders.onEach { it.displayStatus = status } } + + is Result.Error -> { + Log.e( + TAG, + "Error loading orders for status $status", + result.exception + ) + emptyList() + } + + is Result.Loading -> emptyList() } } } - // Set the ViewState to Success - _sells.value = ViewState.Success(orders) - Log.d(TAG, "✅ ViewState.Success set with ${orders.size} orders") + deferreds.awaitAll().forEach { orders -> + allSells.addAll(orders) + } } - is Result.Error -> { - val endTime = System.currentTimeMillis() - Log.e(TAG, "Repository call failed in ${endTime - startTime}ms") - Log.e(TAG, "❌ Result.Error received from repository") - Log.e(TAG, "Error message: ${result.exception.message}") - Log.e(TAG, "Exception type: ${result.exception.javaClass.simpleName}") - Log.e(TAG, "Exception stack trace:", result.exception) - - val errorMessage = result.exception.message ?: "Unknown error occurred" - _sells.value = ViewState.Error(errorMessage) - Log.d(TAG, "ViewState.Error set with message: '$errorMessage'") + val sortedSells = allSells.sortedByDescending { order -> + try { + SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", + Locale.getDefault() + ).parse(order.createdAt) + } catch (e: Exception) { + null + } } - is Result.Loading -> { - Log.d(TAG, "Result.Loading received from repository (this is unusual)") - // Keep the current loading state + _sells.value = ViewState.Success(sortedSells) + Log.d(TAG, "All orders loaded successfully: ${sortedSells.size} items") + } else { + Log.d(TAG, "Calling repository.getSellList(status='$status')") + val startTime = System.currentTimeMillis() + + when (val result = repository.getSellList(status)) { + is Result.Success -> { + val endTime = System.currentTimeMillis() + Log.d(TAG, "Repository call completed in ${endTime - startTime}ms") + Log.d(TAG, "Result.Success received from repository") + + // Log the entire result data structure + Log.d(TAG, "Raw result data: ${result.data}") + Log.d(TAG, "Result data class: ${result.data.javaClass.simpleName}") + + val orders = result.data.orders + Log.d(TAG, "Extracted orders list: $orders") + Log.d(TAG, "Orders list class: ${orders.javaClass.simpleName}") + Log.d(TAG, "Orders count: ${orders.size}") + + // Check if orders list is null or empty + if (false) { + Log.w(TAG, "⚠️ Orders list is NULL") + } else if (orders.isEmpty()) { + Log.w(TAG, "⚠️ Orders list is EMPTY") + } else { + Log.d(TAG, "✅ Orders list contains ${orders.size} items") + + // Log individual order details with more comprehensive info + orders.forEachIndexed { index, order -> + Log.d(TAG, "--- Order ${index + 1}/${orders.size} ---") + Log.d(TAG, " Order object: $order") + Log.d(TAG, " Order class: ${order.javaClass.simpleName}") + Log.d(TAG, " - ID: ${order.orderId}") + Log.d(TAG, " - Status: '${order.status}'") + Log.d(TAG, " - Customer: '${order.username}'") + Log.d(TAG, " - Total: ${order.totalAmount}") + Log.d(TAG, " - Items count: ${order.orderItems?.size ?: 0}") + Log.d(TAG, " - Created at: ${order.createdAt}") + Log.d(TAG, " - Updated at: ${order.updatedAt}") + + // Log order items if available + order.orderItems?.let { items -> + Log.d(TAG, " Order items:") + items.forEachIndexed { itemIndex, item -> + Log.d( + TAG, + " Item ${itemIndex + 1}: ${item?.productName} (Qty: ${item?.quantity})" + ) + } + } + } + } + + // Set the ViewState to Success + _sells.value = ViewState.Success(orders) + Log.d(TAG, "✅ ViewState.Success set with ${orders.size} orders") + } + + is Result.Error -> { + val endTime = System.currentTimeMillis() + Log.e(TAG, "Repository call failed in ${endTime - startTime}ms") + Log.e(TAG, "❌ Result.Error received from repository") + Log.e(TAG, "Error message: ${result.exception.message}") + Log.e(TAG, "Exception type: ${result.exception.javaClass.simpleName}") + Log.e(TAG, "Exception stack trace:", result.exception) + + val errorMessage = result.exception.message ?: "Unknown error occurred" + _sells.value = ViewState.Error(errorMessage) + Log.d(TAG, "ViewState.Error set with message: '$errorMessage'") + } + + is Result.Loading -> { + Log.d(TAG, "Result.Loading received from repository (this is unusual)") + // Keep the current loading state + } } } - } catch (e: Exception) { Log.e(TAG, "❌ Exception caught in getSellList") Log.e(TAG, "Exception type: ${e.javaClass.simpleName}") diff --git a/app/src/main/res/drawable/ic_add.png b/app/src/main/res/drawable/ic_add.png new file mode 100644 index 0000000..4acefe2 Binary files /dev/null and b/app/src/main/res/drawable/ic_add.png differ diff --git a/app/src/main/res/drawable/ic_minus.png b/app/src/main/res/drawable/ic_minus.png new file mode 100644 index 0000000..9d7ed0b Binary files /dev/null and b/app/src/main/res/drawable/ic_minus.png differ diff --git a/app/src/main/res/layout/fragment_change_price_bottom_sheet.xml b/app/src/main/res/layout/fragment_change_price_bottom_sheet.xml index 9e7b5ba..81252e8 100644 --- a/app/src/main/res/layout/fragment_change_price_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_change_price_bottom_sheet.xml @@ -1,14 +1,50 @@ - + tools:context=".ui.profile.mystore.product.ChangePriceBottomSheetFragment" + android:orientation="vertical"> - - + + + + android:layout_height="wrap_content" + android:orientation="horizontal" + android:background="@drawable/bg_text_field" + android:layout_marginTop="10dp" + android:layout_marginHorizontal="16dp"> - \ No newline at end of file + + + + + + +