From e6af65eb7c610047c37b9bcaaa70c97edd92529e Mon Sep 17 00:00:00 2001 From: Fabian Bender Date: Fri, 9 Aug 2024 08:09:24 +0200 Subject: [PATCH 1/2] add method to update the shopping cart manually --- .../snabble/sdk/ui/cart/shoppingcart/ShoppingCartScreen.kt | 6 +++--- .../sdk/ui/cart/shoppingcart/ShoppingCartViewModel.kt | 4 ++++ 2 files changed, 7 insertions(+), 3 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 index d90825a413..da6cd3e7db 100644 --- 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 @@ -1,12 +1,10 @@ package io.snabble.sdk.ui.cart.shoppingcart import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.background import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll @@ -138,7 +136,9 @@ private fun CardWithUserWeightedItems() { items = listOf( ProductItem( ShoppingCart.Item(ShoppingCart(), LineItem(name = "Cold brew Coffee")) - .apply { product = Product.Builder().setType(Product.Type.UserWeighed).build() }, + .apply { + product = Product.Builder().setType(Product.Type.UserWeighed).build() + }, name = "Apple", quantity = 1, editable = true, 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 index 541815a739..9e49c7e9da 100644 --- 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 @@ -30,6 +30,10 @@ class ShoppingCartViewModel : ViewModel() { } } + fun updateCart() { + updateUiState(cachedCart) + } + init { val project = Snabble.checkedInProject.value val cart = Snabble.checkedInProject.value?.shoppingCart From fc50eb6a690e0f25c5f3db27913821c9933a95ba Mon Sep 17 00:00:00 2001 From: Fabian Bender Date: Fri, 9 Aug 2024 08:47:14 +0200 Subject: [PATCH 2/2] update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4ab1eb987..2929f0b989 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file. ### Removed ### Fixed +## [0.75.0] +### Added +* ui: add function `updateCart()` to update the cart manually for the `ShoppingCartScreen` + ## [0.75.0] ### Changed * ui: update fiserv 3D's flow. The user now has to enter additional information to add a credit card.