fix restore

This commit is contained in:
shaulascr
2025-08-22 14:54:28 +07:00
parent 2f16542e5e
commit 29fb55e3c0
3 changed files with 18 additions and 14 deletions

View File

@ -547,15 +547,6 @@ class OrderHistoryAdapter(
// Use ViewModel to fetch order details // Use ViewModel to fetch order details
viewModel.getOrderDetails(order.orderId) viewModel.getOrderDetails(order.orderId)
// Create loading dialog
// val loadingDialog = Dialog(itemView.context).apply {
// requestWindowFeature(Window.FEATURE_NO_TITLE)
// setContentView(R.layout.dialog_loading)
// window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
// setCancelable(false)
// }
// loadingDialog.show()
viewModel.error.observe(itemView.findViewTreeLifecycleOwner()!!) { errorMsg -> viewModel.error.observe(itemView.findViewTreeLifecycleOwner()!!) { errorMsg ->
if (!errorMsg.isNullOrEmpty()) { if (!errorMsg.isNullOrEmpty()) {
Toast.makeText(itemView.context, errorMsg, Toast.LENGTH_SHORT).show() Toast.makeText(itemView.context, errorMsg, Toast.LENGTH_SHORT).show()

View File

@ -59,20 +59,20 @@ class MyStoreActivity : AppCompatActivity() {
finish() finish()
} }
viewModel.loadMyStore()
viewModel.loadMyStoreProducts()
viewModel.myStoreProfile.observe(this){ user -> viewModel.myStoreProfile.observe(this){ user ->
user?.let { myStoreProfileOverview(it.store) } user?.let { myStoreProfileOverview(it.store) }
} }
viewModel.loadMyStore()
viewModel.loadMyStoreProducts()
viewModel.fetchBalance()
viewModel.errorMessage.observe(this) { error -> viewModel.errorMessage.observe(this) { error ->
Toast.makeText(this, error, Toast.LENGTH_SHORT).show() Toast.makeText(this, error, Toast.LENGTH_SHORT).show()
} }
setUpClickListeners() setUpClickListeners()
getCountOrder() getCountOrder()
observeViewModel() observeViewModel()
viewModel.fetchBalance()
fetchBalance() fetchBalance()
} }
@ -206,6 +206,13 @@ class MyStoreActivity : AppCompatActivity() {
} }
} }
override fun onResume() {
super.onResume()
viewModel.loadMyStore()
viewModel.loadMyStoreProducts()
viewModel.fetchBalance()
}
companion object { companion object {
private const val PROFILE_REQUEST_CODE = 100 private const val PROFILE_REQUEST_CODE = 100
} }

View File

@ -83,10 +83,10 @@ class SellsListFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
loadSells()
setupRecyclerView() setupRecyclerView()
observeSellsList() observeSellsList()
observePaymentConfirmation() observePaymentConfirmation()
loadSells()
// getAllOrderCountsAndNavigate() // getAllOrderCountsAndNavigate()
} }
@ -211,6 +211,12 @@ class SellsListFragment : Fragment() {
} }
} }
override fun onResume() {
super.onResume()
viewModel.getSellList(status)
observeSellsList()
}
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
_binding = null _binding = null