Skip to content

Replace items depositText w/ local i18n text #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmaier merged 3 commits into from
Aug 15, 2024
Merged

Replace items depositText w/ local i18n text #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84b8b8c
Replace items depositText w/ local i18n text
cmaier Aug 15, 2024
c974759
Update changelog
cmaier Aug 15, 2024
50c4f0f
Merge branch 'main' into apps-1699-rename-deposit-item-in-shopping-cart
Fabtron Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
## UNRELEASED
### Added
### Changed
* Replace items depositText w/ local i18n text
### Removed
### Fixed

Expand Down
5 changes: 4 additions & 1 deletion ...java/io/snabble/sdk/ui/cart/shoppingcart/product/widget/description/ProductDescription.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import io.snabble.sdk.ui.R
import io.snabble.sdk.ui.cart.shoppingcart.product.model.ProductItem

@Composable
Expand All @@ -34,8 +36,9 @@ internal fun ProductDescription(modifier: Modifier = Modifier, item: ProductItem
else -> LineItemDescription(item.totalPriceText)
}
if (item.deposit != null) {
val depositText = stringResource(id = R.string.Snabble_Shoppingcart_deposit)
Text(
text = "${item.priceText} + ${item.deposit.depositPriceText} ${item.deposit.depositText}",
text = "${item.priceText} + ${item.deposit.depositPriceText} $depositText",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurface
)
Expand Down