remove obsolete delete logic

snabble · Dec 23, 2024 · 4b65adb · 4b65adb
1 parent 7772f64
commit 4b65adb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 30 deletions.
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/ShoppingCartScreen.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/ShoppingCartScreen.kt
@@ -47,9 +47,6 @@ fun ShoppingCartScreen(
             },
             onQuantityChanged = { item, quantity ->
                 viewModel.onEvent(UpdateQuantity(item, quantity))
-            },
-            onDeleteDepositReturnClick = {
-                viewModel.onEvent(RemoveDepositReturn(it))
             }
         )
     }
@@ -60,7 +57,6 @@ private fun ShoppingCartScreen(
     uiState: UiState,
     modifier: Modifier = Modifier,
     onItemDeleted: (ShoppingCart.Item) -> Unit,
-    onDeleteDepositReturnClick: (ShoppingCart.Item) -> Unit,
     onQuantityChanged: (ShoppingCart.Item, Int) -> Unit
 ) {
 
@@ -82,7 +78,7 @@ private fun ShoppingCartScreen(
 
                 is DepositReturnItem -> {
                     val showHint = uiState.totalCartPrice != null && uiState.totalCartPrice < 0
-                    DepositReturn(item = cartItem, showHint = showHint, onDeleteClick = onDeleteDepositReturnClick)
+                    DepositReturn(item = cartItem, showHint = showHint, onDeleteClick = onItemDeleted)
                 }
 
                 is CartDiscountItem -> {
@@ -134,7 +130,6 @@ private fun CardWithDefaultItems() {
         uiState = uiState,
         onItemDeleted = {},
         onQuantityChanged = { _, _ -> },
-        onDeleteDepositReturnClick = {}
     )
 }
 
@@ -164,7 +159,6 @@ private fun CardWithUserWeightedItems() {
         uiState = uiState,
         onItemDeleted = {},
         onQuantityChanged = { _, _ -> },
-        onDeleteDepositReturnClick = {}
     )
 }
 
@@ -200,7 +194,6 @@ private fun CardWithDiscountItem() {
         uiState = uiState,
         onItemDeleted = {},
         onQuantityChanged = { _, _ -> },
-        onDeleteDepositReturnClick = {}
     )
 }
 
@@ -235,7 +228,6 @@ private fun CardWithDeposit() {
         uiState = uiState,
         onItemDeleted = {},
         onQuantityChanged = { _, _ -> },
-        onDeleteDepositReturnClick = {}
     )
 }
 
@@ -268,6 +260,5 @@ private fun CardWithCartDiscount() {
         uiState = uiState,
         onItemDeleted = {},
         onQuantityChanged = { _, _ -> },
-        onDeleteDepositReturnClick = {}
     )
 }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/ShoppingCartViewModel.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/ShoppingCartViewModel.kt
@@ -50,14 +50,6 @@ class ShoppingCartViewModel : ViewModel() {
         when (event) {
             is RemoveItem -> removeItemFromCart(event.item, event.onSuccess)
             is UpdateQuantity -> updateQuantity(event.item, event.quantity)
-            is RemoveDepositReturn -> removeDepositReturnItem(event.item)
-        }
-    }
-
-    private fun removeDepositReturnItem(item: ShoppingCart.Item) {
-        val index = cachedCart.indexOf(item)
-        if (index != -1) {
-            cachedCart.remove(index)
         }
     }
 
@@ -99,15 +91,15 @@ class ShoppingCartViewModel : ViewModel() {
 
     private fun MutableList<CartItem>.addDepositReturnItems(depositReturns: List<ShoppingCart.Item>) {
         depositReturns.forEach { returnVoucher ->
-                val totalDepositReturn =
-                    returnVoucher.depositReturnVoucher?.lineItems?.sumOf { it.totalPrice } ?: return@forEach
-                add(
-                    DepositReturnItem(
-                        item = returnVoucher,
-                        totalDeposit = priceFormatter?.format(totalDepositReturn).orEmpty()
-                    )
+            val totalDepositReturn =
+                returnVoucher.depositReturnVoucher?.lineItems?.sumOf { it.totalPrice } ?: return@forEach
+            add(
+                DepositReturnItem(
+                    item = returnVoucher,
+                    totalDeposit = priceFormatter?.format(totalDepositReturn).orEmpty()
                 )
-            }
+            )
+        }
     }
 
     private fun MutableList<CartItem>.sortCartDiscountsToBottom() {
@@ -253,10 +245,6 @@ class ShoppingCartViewModel : ViewModel() {
 
 sealed interface Event
 
-internal data class RemoveDepositReturn(
-    val item: ShoppingCart.Item,
-) : Event
-
 internal data class RemoveItem(
     val item: ShoppingCart.Item,
     val onSuccess: (index: Int) -> Unit