From 0e32a65d16039ebf195995dca1a79c3f5b0ae8e3 Mon Sep 17 00:00:00 2001
From: hmalik144 <h.malik144@gmail.com>
Date: Sat, 14 Dec 2019 22:25:25 +1100
Subject: [PATCH] Update to include variable toast messages based on api calls

---
 .idea/vcs.xml                                             | 6 ++++++
 .../example/h_mal/shopapicasestudy/api/AsyncApiCall.kt    | 5 +++--
 .../h_mal/shopapicasestudy/viewmodels/CartViewModel.kt    | 8 ++------
 .../h_mal/shopapicasestudy/viewmodels/ListViewModel.kt    | 3 ++-
 .../h_mal/shopapicasestudy/viewmodels/MainViewModel.kt    | 3 ++-
 .../shopapicasestudy/viewmodels/WishListViewModel.kt      | 3 ++-
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/h_mal/shopapicasestudy/api/AsyncApiCall.kt b/app/src/main/java/com/example/h_mal/shopapicasestudy/api/AsyncApiCall.kt
index 7f16562..ec66afb 100644
--- a/app/src/main/java/com/example/h_mal/shopapicasestudy/api/AsyncApiCall.kt
+++ b/app/src/main/java/com/example/h_mal/shopapicasestudy/api/AsyncApiCall.kt
@@ -10,7 +10,8 @@ import java.net.URL
 
 class AsyncApiCall(
     val urlString : String,
-    val callBack : ResponseListener?
+    val callBack : ResponseListener?,
+    val toastErrorString : String
 ): AsyncTask<String, Void, String>() {
 
     override fun onPreExecute() {
@@ -50,7 +51,7 @@ class AsyncApiCall(
 
     override fun onPostExecute(result: String) {
         if (result.isEmpty()){
-            callBack?.onFailure("Failed to retrieve")
+            callBack?.onFailure(toastErrorString)
         }else{
             callBack?.onSuccess()
         }
diff --git a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/CartViewModel.kt b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/CartViewModel.kt
index ed0a298..04587a3 100644
--- a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/CartViewModel.kt
+++ b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/CartViewModel.kt
@@ -24,7 +24,8 @@ class CartViewModel(
         val response =
             AsyncApiCall(
                 "https://private-anon-21a48b3d0e-ddshop.apiary-mock.com/cart/1",
-                cartResponseListener
+                cartResponseListener,
+                "Failed to delete item"
             )
                 .execute()
                 .get()
@@ -37,9 +38,4 @@ class CartViewModel(
         return response
     }
 
-    fun getTotalPrice(): String{
-
-        return ""
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/ListViewModel.kt b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/ListViewModel.kt
index 8fcc238..99d21b3 100644
--- a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/ListViewModel.kt
+++ b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/ListViewModel.kt
@@ -26,7 +26,8 @@ class ListViewModel(
         val response =
             AsyncApiCall(
                 "https://private-anon-f3c1195210-ddshop.apiary-mock.com/products",
-                responseListener
+                responseListener,
+                "Failed to insert"
             )
                 .execute()
                 .get()
diff --git a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/MainViewModel.kt b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/MainViewModel.kt
index 1ed144d..6521391 100644
--- a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/MainViewModel.kt
@@ -25,7 +25,8 @@ class MainViewModel(
         val jsonResponse =
             AsyncApiCall(
                 "https://private-anon-f3c1195210-ddshop.apiary-mock.com/products",
-                responseListener
+                responseListener,
+                "Failed To retrieve list"
             )
             .execute()
             .get()
diff --git a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/WishListViewModel.kt b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/WishListViewModel.kt
index 3f45a6f..eb888ea 100644
--- a/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/WishListViewModel.kt
+++ b/app/src/main/java/com/example/h_mal/shopapicasestudy/viewmodels/WishListViewModel.kt
@@ -24,7 +24,8 @@ class WishListViewModel(
         val response =
             AsyncApiCall(
                 "https://private-anon-f3c1195210-ddshop.apiary-mock.com/products",
-                wishResponseListener
+                wishResponseListener,
+                "Failed to insert item"
             )
                 .execute()
                 .get()