Skip to content

[Shipping labels] Refactor purchased screen preview #13909

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
merged 4 commits into from
Apr 17, 2025
Merged

[Shipping labels] Refactor purchased screen preview #13909

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f726c
Remove unnecessary duplicate composable from shipping purchased screen
irfano Apr 9, 2025
ba159d0
Use equality check instead of elvis in shipping purchased screen
irfano Apr 9, 2025
bd8be4f
Rename WooShippingLabelPurchasedWithBottomSheetScreen
irfano Apr 16, 2025
77acf18
Merge branch 'trunk' into issue/WOOMOB-266-refactor-purchased-screen-…
irfano Apr 17, 2025
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
125 changes: 19 additions & 106 deletions ...commerce/android/ui/orders/wooshippinglabels/purchased/WooShippingLabelPurchasedScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ import com.woocommerce.android.R
import com.woocommerce.android.ui.compose.component.ProgressDialog
import com.woocommerce.android.ui.compose.component.WCColoredButton
import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHazmatCategory
import com.woocommerce.android.ui.orders.wooshippinglabels.RoundedCornerBoxWithBorder
import com.woocommerce.android.ui.orders.wooshippinglabels.ShipmentDetails
import com.woocommerce.android.ui.orders.wooshippinglabels.ShippableItemsUI
import com.woocommerce.android.ui.orders.wooshippinglabels.ShippingProductsCard
import com.woocommerce.android.ui.orders.wooshippinglabels.ShippingRateSummaryUI
import com.woocommerce.android.ui.orders.wooshippinglabels.WooShippingAddresses
import com.woocommerce.android.ui.orders.wooshippinglabels.address.AddressStatus
import com.woocommerce.android.ui.orders.wooshippinglabels.generateItems
import com.woocommerce.android.ui.orders.wooshippinglabels.hazmat.HazmatCard
Expand All @@ -64,8 +65,8 @@ import kotlinx.coroutines.launch
@Composable
fun WooShippingLabelPurchasedScreen(viewModel: WooShippingLabelPurchasedViewModel) {
val viewState = viewModel.viewState.observeAsState()
WooShippingLabelPurchasedWithBottomSheetScreen(
isLoading = viewState.value?.isLoadingData ?: false,
WooShippingLabelPurchasedScreen(
isLoading = viewState.value?.isLoadingData == true,
isPurchaseFinished = viewState.value?.isPurchaseFinished,
shippingData = viewState.value?.shippingLabelData,
selectedLabelPaperSizeOption = viewState.value?.paperSizeOption ?: WooShippingLabelPaperSize.LEGAL,
Expand All @@ -79,7 +80,7 @@ fun WooShippingLabelPurchasedScreen(viewModel: WooShippingLabelPurchasedViewMode
}

@Composable
internal fun WooShippingLabelPurchasedWithBottomSheetScreen(
internal fun WooShippingLabelPurchasedScreen(
isLoading: Boolean,
isPurchaseFinished: Boolean?,
shippingData: PurchasedShippingLabelData?,
Expand Down Expand Up @@ -206,103 +207,6 @@ internal fun WooShippingLabelPurchasedWithBottomSheetScreen(
}
}

@Composable
internal fun WooShippingLabelPurchasedScreen(
isLoading: Boolean,
isPurchaseFinished: Boolean?,
shippingData: ShippableItemsUI?,
selectedLabelPaperSizeOption: WooShippingLabelPaperSize,
onLabelPaperSizeOptionSelected: (WooShippingLabelPaperSize) -> Unit,
onPrintShippingLabelClicked: () -> Unit,
onTrackShipmentClicked: () -> Unit,
onSchedulePickUpClicked: () -> Unit,
onRefundClicked: () -> Unit,
onLearnMoreClicked: () -> Unit,
modifier: Modifier = Modifier,
selectedHazmatCategory: ShippingLabelHazmatCategory? = null,
) {
Column(
modifier = modifier
.verticalScroll(rememberScrollState())
) {
Column(
modifier = modifier.padding(16.dp)
) {
val (titleResId, messageResId) = when (isPurchaseFinished) {
true -> Pair(
R.string.shipping_label_purchased_success_title,
R.string.shipping_label_purchased_success_message
)

false -> Pair(
R.string.shipping_label_purchased_in_progress_title,
R.string.shipping_label_purchased_in_progress_message
)

null -> Pair(
R.string.shipping_label_purchased_failure_title,
R.string.shipping_label_purchased_failure_message
)
}

Text(
text = stringResource(id = titleResId),
style = MaterialTheme.typography.subtitle1,
fontWeight = FontWeight.Bold,
)
Text(
text = stringResource(id = messageResId),
modifier = Modifier.padding(top = 8.dp),
style = MaterialTheme.typography.subtitle1,
)
Spacer(modifier = Modifier.padding(top = 16.dp))
PrintShippingLabelCard(
isPrintButtonEnabled = isPurchaseFinished == true,
selectedLabelPaperSizeOption = selectedLabelPaperSizeOption,
onLabelPaperSizeOptionSelected = onLabelPaperSizeOptionSelected,
onPrintShippingLabelClicked = onPrintShippingLabelClicked,
onTrackShipmentClicked = onTrackShipmentClicked,
onSchedulePickUpClicked = onSchedulePickUpClicked,
onRefundClicked = onRefundClicked,
onLearnMoreClicked = onLearnMoreClicked,
)
Text(
text = stringResource(id = R.string.shipping_label_purchased_note),
style = MaterialTheme.typography.caption,
color = colorResource(id = R.color.color_on_surface_medium),
modifier = Modifier.padding(top = 8.dp),
)

shippingData?.let { shippingData ->
val isExpanded = remember { mutableStateOf(false) }
ShippingProductsCard(
shippableItems = ShippableItemsUI(
shippableItems = shippingData.shippableItems,
formattedTotalWeight = shippingData.formattedTotalWeight,
formattedTotalPrice = shippingData.formattedTotalPrice
),
isExpanded = isExpanded.value,
onExpand = { isExpanded.value = it },
iconColor = MaterialTheme.colors.onSurface,
modifier = Modifier.padding(top = 24.dp)
)
}
Spacer(modifier = Modifier.padding(top = 16.dp))
}

HazmatCard(
selectedCategory = selectedHazmatCategory
)

if (isLoading) {
ProgressDialog(
title = stringResource(R.string.loading),
subtitle = stringResource(R.string.please_wait),
)
}
}
}

@Composable
private fun PrintShippingLabelCard(
isPrintButtonEnabled: Boolean,
Expand Down Expand Up @@ -485,13 +389,22 @@ internal fun WooShippingLabelPurchasedScreenPreview() {
WooShippingLabelPurchasedScreen(
isLoading = false,
isPurchaseFinished = true,
shippingData = ShippableItemsUI(
shippableItems = generateItems(6),
formattedTotalWeight = "8.5kg",
formattedTotalPrice = "$92.78"
shippingData = PurchasedShippingLabelData(
labelId = 0,
orderId = 0,
carrierId = "",
trackingNumber = "",
items = ShippableItemsUI(
shippableItems = generateItems(6),
formattedTotalWeight = "8.5kg",
formattedTotalPrice = "$92.78"
),
addresses = WooShippingAddresses.EMPTY,
rateSummary = ShippingRateSummaryUI(serviceName = "", total = ""),
shippingLines = emptyList(),
hazmatSelection = null
),
selectedLabelPaperSizeOption = selectedLabelPaperSizeOption.value,
selectedHazmatCategory = ShippingLabelHazmatCategory.CLASS_1,
onLabelPaperSizeOptionSelected = { selectedLabelPaperSizeOption.value = it },
onPrintShippingLabelClicked = {},
onTrackShipmentClicked = {},
Expand Down