[Order creation] Update coupons display order details #12855
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.woocommerce.android.ui.orders.creation.coupon | ||
|
|
||
| data class CouponLineDetails( | ||
| val code: String | ||
| ) | ||
|
|
||
| data class CouponSection( | ||
| val couponLines: List<CouponLineDetails>, | ||
| val isEnabled: Boolean, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package com.woocommerce.android.ui.orders.creation.coupon | ||
|
|
||
| import androidx.compose.animation.AnimatedVisibility | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.Card | ||
| import androidx.compose.material.Icon | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Add | ||
| import androidx.compose.material.icons.outlined.DeleteOutline | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.alpha | ||
| import androidx.compose.ui.graphics.RectangleShape | ||
| import androidx.compose.ui.graphics.SolidColor | ||
| import androidx.compose.ui.res.colorResource | ||
| import androidx.compose.ui.res.dimensionResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.tooling.preview.PreviewLightDark | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import com.woocommerce.android.R | ||
| import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground | ||
|
|
||
| @Composable | ||
| fun CouponLineFormSection( | ||
| couponLineDetails: List<CouponLineDetails>, | ||
| isEnabled: Boolean, | ||
| onAddClicked: () -> Unit, | ||
| onRemoveClicked: (code: String) -> Unit, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| AnimatedVisibility(couponLineDetails.isNotEmpty()) { | ||
| Card(shape = RectangleShape, modifier = modifier) { | ||
| Column(modifier = Modifier.padding(16.dp)) { | ||
| Row(modifier = Modifier.padding(bottom = 16.dp)) { | ||
| Text( | ||
| text = stringResource(id = R.string.coupons), | ||
| style = MaterialTheme.typography.h6, | ||
| modifier = modifier | ||
| .weight(2f, true) | ||
| .align(Alignment.CenterVertically), | ||
| ) | ||
| Icon( | ||
| imageVector = Icons.Default.Add, | ||
| contentDescription = stringResource(id = R.string.order_creation_add_coupon), | ||
| modifier = Modifier | ||
| .align(Alignment.CenterVertically) | ||
| .alpha(if (isEnabled) 1f else 0.4f) | ||
| .clickable(enabled = isEnabled) { onAddClicked() }, | ||
| tint = MaterialTheme.colors.primary | ||
| ) | ||
| } | ||
|
|
||
samiuelson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| couponLineDetails.forEachIndexed { i, couponDetails -> | ||
| val itemModifier = if (i == 0) Modifier else Modifier.padding(top = 8.dp) | ||
| CouponLineEditCard( | ||
| couponLine = couponDetails, | ||
| modifier = itemModifier | ||
| .alpha(if (isEnabled) 1f else 0.4f) | ||
| .clickable(enabled = isEnabled) { onRemoveClicked(couponDetails.code) } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun CouponLineEditCard( | ||
| couponLine: CouponLineDetails, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .border( | ||
| brush = SolidColor(MaterialTheme.colors.onSurface.copy(alpha = 0.12f)), | ||
| width = 1.dp, | ||
| shape = RoundedCornerShape(dimensionResource(id = R.dimen.corner_radius_large)) | ||
| ) | ||
| .padding(dimensionResource(id = R.dimen.major_100)) | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.weight(1f), | ||
| text = couponLine.code, | ||
| style = TextStyle( | ||
| fontWeight = FontWeight.Normal, | ||
| fontSize = 18.sp | ||
| ), | ||
| color = colorResource(id = R.color.color_on_surface), | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
| Icon( | ||
| imageVector = Icons.Outlined.DeleteOutline, | ||
| contentDescription = stringResource(id = R.string.order_creation_remove_coupon), | ||
| modifier = Modifier | ||
| .align(Alignment.CenterVertically) | ||
| .padding(start = 16.dp) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @PreviewLightDark | ||
| @Composable | ||
| fun CouponLineDetailsPreview() { | ||
| WooThemeWithBackground { | ||
| CouponLineDetails( | ||
| code = "abcdefg", | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @PreviewLightDark | ||
| @Composable | ||
| fun CouponLineFormSectionPreview() { | ||
| val couponLine = List(3) { i -> | ||
| CouponLineDetails( | ||
| code = "abcdefg_abcdefg_abcdefg_abcdefg_$i", | ||
| ) | ||
| } | ||
| WooThemeWithBackground { | ||
| CouponLineFormSection( | ||
| couponLineDetails = couponLine, | ||
| isEnabled = true, | ||
| onAddClicked = { }, | ||
| onRemoveClicked = { } | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code would ideally live in the VM so it could be unit tested, however, refactoring it felt like out of scope and bringing inconsistency to the surrounding code feels worse than not having this tested. I'm open to suggestions though.