-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12802 from woocommerce/issue/creating-shipping-la…
…bel-add-products-cards Issue/creating shipping label add products cards
- Loading branch information
Showing
5 changed files
with
675 additions
and
11 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/modifiers/Borders.kt
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,52 @@ | ||
package com.woocommerce.android.ui.compose.modifiers | ||
|
||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.draw.drawWithContent | ||
import androidx.compose.ui.graphics.Brush | ||
import androidx.compose.ui.graphics.Color | ||
import androidx.compose.ui.graphics.PathEffect | ||
import androidx.compose.ui.graphics.Shape | ||
import androidx.compose.ui.graphics.SolidColor | ||
import androidx.compose.ui.graphics.StrokeCap | ||
import androidx.compose.ui.graphics.drawOutline | ||
import androidx.compose.ui.graphics.drawscope.Stroke | ||
import androidx.compose.ui.unit.Dp | ||
import androidx.compose.ui.unit.dp | ||
|
||
fun Modifier.dashedBorder( | ||
color: Color, | ||
shape: Shape, | ||
strokeWidth: Dp = 2.dp, | ||
dashLength: Dp = 4.dp, | ||
gapLength: Dp = 4.dp, | ||
cap: StrokeCap = StrokeCap.Square | ||
) = dashedBorder(brush = SolidColor(color), shape, strokeWidth, dashLength, gapLength, cap) | ||
|
||
fun Modifier.dashedBorder( | ||
brush: Brush, | ||
shape: Shape, | ||
strokeWidth: Dp = 2.dp, | ||
dashLength: Dp = 4.dp, | ||
gapLength: Dp = 4.dp, | ||
cap: StrokeCap = StrokeCap.Square | ||
) = this.drawWithContent { | ||
val outline = shape.createOutline(size, layoutDirection, density = this) | ||
|
||
val dashedStroke = Stroke( | ||
cap = cap, | ||
width = strokeWidth.toPx(), | ||
pathEffect = PathEffect.dashPathEffect( | ||
intervals = floatArrayOf(dashLength.toPx(), gapLength.toPx()) | ||
) | ||
) | ||
|
||
// Draw the content | ||
drawContent() | ||
|
||
// Draw the border | ||
drawOutline( | ||
outline = outline, | ||
style = dashedStroke, | ||
brush = brush | ||
) | ||
} |
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
185 changes: 185 additions & 0 deletions
185
...lin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationScreen.kt
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,185 @@ | ||
package com.woocommerce.android.ui.orders.wooshippinglabels | ||
|
||
import android.content.res.Configuration | ||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.clickable | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Row | ||
import androidx.compose.foundation.layout.fillMaxSize | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.rememberScrollState | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.foundation.verticalScroll | ||
import androidx.compose.material.Icon | ||
import androidx.compose.material.MaterialTheme | ||
import androidx.compose.material.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.mutableStateOf | ||
import androidx.compose.runtime.remember | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.res.colorResource | ||
import androidx.compose.ui.res.dimensionResource | ||
import androidx.compose.ui.res.painterResource | ||
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.text.font.FontWeight | ||
import androidx.compose.ui.text.style.TextAlign | ||
import androidx.compose.ui.tooling.preview.Devices | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
import com.woocommerce.android.R | ||
import com.woocommerce.android.ui.compose.component.WCColoredButton | ||
import com.woocommerce.android.ui.compose.modifiers.dashedBorder | ||
import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground | ||
|
||
@Composable | ||
fun WooShippingLabelCreationScreen( | ||
modifier: Modifier = Modifier | ||
) { | ||
Column(modifier.verticalScroll(rememberScrollState())) { | ||
val isExpanded = remember { mutableStateOf(false) } | ||
ShippingProductsCard( | ||
shippableItems = ShippableItems( | ||
shippableItems = generateItems(6), | ||
totalWeight = "8.5kg", | ||
totalPrice = "$92.78" | ||
), | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
.padding(16.dp), | ||
isExpanded = isExpanded.value, | ||
onExpand = { isExpanded.value = it } | ||
) | ||
HazmatCard( | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
.padding(horizontal = dimensionResource(id = R.dimen.minor_50)) | ||
) | ||
PackageCard(modifier = Modifier.padding(dimensionResource(id = R.dimen.major_100))) | ||
} | ||
} | ||
|
||
@Preview(name = "dark", uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL) | ||
@Preview(name = "light", uiMode = Configuration.UI_MODE_NIGHT_NO, device = Devices.PIXEL) | ||
@Composable | ||
private fun WooShippingLabelCreationScreenPreview() { | ||
WooThemeWithBackground { | ||
WooShippingLabelCreationScreen(modifier = Modifier.fillMaxSize()) | ||
} | ||
} | ||
|
||
@Composable | ||
private fun HazmatCard( | ||
modifier: Modifier = Modifier, | ||
onClick: () -> Unit = {} | ||
) { | ||
Row(modifier = modifier.clickable { onClick() }) { | ||
Text( | ||
text = stringResource(R.string.shipping_label_hazmat_title), | ||
style = MaterialTheme.typography.subtitle1, | ||
color = MaterialTheme.colors.onSurface, | ||
modifier = Modifier | ||
.weight(1f) | ||
.padding(dimensionResource(id = R.dimen.major_100)) | ||
.align(Alignment.CenterVertically) | ||
) | ||
|
||
Text( | ||
text = stringResource(R.string.no), | ||
style = MaterialTheme.typography.subtitle1, | ||
color = colorResource(id = R.color.color_on_surface_medium), | ||
modifier = Modifier | ||
.align(Alignment.CenterVertically) | ||
) | ||
|
||
Icon( | ||
painter = painterResource(R.drawable.ic_arrow_right), | ||
tint = colorResource(id = R.color.color_on_surface_medium), | ||
contentDescription = | ||
stringResource(id = R.string.shipping_label_package_details_items_expand_content_description), | ||
modifier = Modifier | ||
.align(Alignment.CenterVertically) | ||
.padding(end = dimensionResource(R.dimen.minor_50)) | ||
) | ||
} | ||
} | ||
|
||
@Preview | ||
@Composable | ||
private fun HazmatCardPreview() { | ||
WooThemeWithBackground { | ||
HazmatCard(modifier = Modifier.padding(16.dp)) | ||
} | ||
} | ||
|
||
@Composable | ||
private fun PackageCard(modifier: Modifier = Modifier) { | ||
Column( | ||
modifier = modifier | ||
.background( | ||
color = MaterialTheme.colors.surface, | ||
shape = RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large)) | ||
) | ||
.dashedBorder( | ||
color = colorResource(R.color.divider_color), | ||
strokeWidth = 2.dp, | ||
dashLength = 8.dp, | ||
gapLength = 8.dp, | ||
shape = RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large)) | ||
) | ||
.padding(dimensionResource(id = R.dimen.major_200)) | ||
) { | ||
WCColoredButton( | ||
onClick = {}, | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
.align(Alignment.CenterHorizontally) | ||
) { | ||
Text(stringResource(R.string.shipping_label_select_package_button)) | ||
} | ||
Text( | ||
text = stringResource(R.string.shipping_label_select_package_title), | ||
style = MaterialTheme.typography.subtitle1, | ||
color = MaterialTheme.colors.onSurface, | ||
textAlign = TextAlign.Center, | ||
fontWeight = FontWeight.SemiBold, | ||
modifier = Modifier | ||
.padding(top = dimensionResource(id = R.dimen.major_200)) | ||
.align(Alignment.CenterHorizontally) | ||
) | ||
Text( | ||
text = stringResource(R.string.shipping_label_select_package_description), | ||
style = MaterialTheme.typography.subtitle1, | ||
color = colorResource(id = R.color.color_on_surface_medium), | ||
textAlign = TextAlign.Center, | ||
modifier = Modifier | ||
.padding(top = dimensionResource(id = R.dimen.minor_100)) | ||
.align(Alignment.CenterHorizontally) | ||
) | ||
} | ||
} | ||
|
||
@Preview | ||
@Composable | ||
private fun PackageCardPreview() { | ||
WooThemeWithBackground { | ||
PackageCard(modifier = Modifier.padding(16.dp)) | ||
} | ||
} | ||
|
||
data class ShippableItem( | ||
val productId: Long, | ||
val title: String, | ||
val description: String, | ||
val weight: String, | ||
val price: String, | ||
val quantity: Int, | ||
val imageUrl: String? = null | ||
) | ||
|
||
data class ShippableItems( | ||
val shippableItems: List<ShippableItem>, | ||
val totalWeight: String, | ||
val totalPrice: String | ||
) |
Oops, something went wrong.