- order page improvement

shopemaa · Sep 25, 2022 · 447263c · 447263c
1 parent 2c160b8
commit 447263c
Show file tree

Hide file tree

Showing 2 changed files with 356 additions and 329 deletions.
diff --git a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/OrderDetailsActivity.kt b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/OrderDetailsActivity.kt
@@ -9,6 +9,7 @@ import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import cn.pedant.SweetAlert.SweetAlertDialog
 import com.apollographql.apollo3.api.or
 import com.arellomobile.mvp.presenter.InjectPresenter
@@ -57,6 +58,8 @@ class OrderDetailsActivity : BaseActivity(), OrderView {
 
     private lateinit var order: OrderByCustomerEmailQuery.OrderByCustomerEmail
 
+    private lateinit var swipeLayout: SwipeRefreshLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_order_details)
@@ -94,6 +97,21 @@ class OrderDetailsActivity : BaseActivity(), OrderView {
             }
         }
 
+        swipeLayout = findViewById(R.id.order_details_layout)
+        swipeLayout.setOnRefreshListener {
+            if (::order.isInitialized) {
+                alertDialog.show()
+
+                lifecycleScope.launch {
+                    presenter.requestOrderDetails(
+                        applicationContext,
+                        order.hash,
+                        order.customer.email
+                    )
+                }
+            }
+        }
+
         orderItems = findViewById(R.id.order_items)
         orderItemsList = mutableListOf()
         orderItemsAdapter = OrderItemListAdapter(applicationContext, orderItemsList)
@@ -149,6 +167,7 @@ class OrderDetailsActivity : BaseActivity(), OrderView {
         discount.text = Utils.formatAmount(applicationContext, order.discountedAmount, true)
         grandTotal.text = Utils.formatAmount(applicationContext, order.grandTotal, true)
 
+        orderItemsList.clear()
         orderItemsList.addAll(order.cart.cartItems)
         orderItemsAdapter.notifyDataSetChanged()
 
@@ -157,12 +176,14 @@ class OrderDetailsActivity : BaseActivity(), OrderView {
         }
 
         alertDialog.dismiss()
+        swipeLayout.isRefreshing = false
     }
 
     override fun onOrderDetailsFailure(err: ApiError) {
         alertDialog.dismiss()
         showMessage(applicationContext, "Order not found")
         finish()
+        swipeLayout.isRefreshing = false
     }
 
     override fun onBackPressed() {