Skip to content

Commit 79f229e

Browse files
authored
Merge pull request #13574 from woocommerce/issue/12439-normalize-address-new
Normalize address
2 parents 8b8a2f3 + 808f6a9 commit 79f229e

File tree

14 files changed

+783
-149
lines changed

14 files changed

+783
-149
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/WCModalBottomSheet.kt

+4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.woocommerce.android.ui.compose.component
22

33
import androidx.compose.foundation.layout.ColumnScope
4+
import androidx.compose.foundation.layout.WindowInsets
45
import androidx.compose.foundation.shape.RoundedCornerShape
6+
import androidx.compose.material3.BottomSheetDefaults
57
import androidx.compose.material3.ExperimentalMaterial3Api
68
import androidx.compose.material3.ModalBottomSheet
79
import androidx.compose.material3.SheetState
@@ -20,6 +22,7 @@ fun WCModalBottomSheet(
2022
sheetState: SheetState,
2123
onDismissRequest: () -> Unit,
2224
modifier: Modifier = Modifier,
25+
contentWindowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
2326
shape: Shape = RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp),
2427
content: @Composable ColumnScope.() -> Unit,
2528
) {
@@ -28,6 +31,7 @@ fun WCModalBottomSheet(
2831
onDismissRequest = onDismissRequest,
2932
modifier = modifier,
3033
sheetState = sheetState,
34+
contentWindowInsets = contentWindowInsets,
3135
shape = shape,
3236
content = content
3337
)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/ShipmentDetails.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private fun ShipmentDetailsLandscape(
225225
}
226226

227227
@Composable
228-
internal fun ShipmentDetailsSectionTitle(
228+
fun ShipmentDetailsSectionTitle(
229229
title: String,
230230
modifier: Modifier = Modifier
231231
) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/address/AddressSection.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ fun AddressSelection(
372372
LazyColumn {
373373
items(originAddresses) { option ->
374374
val isSelected = option == shipFrom
375-
AddressSelectionItem(
375+
OriginAddressSelectionItem(
376376
address = option,
377377
isSelected = isSelected,
378378
onEdit = onEditOriginAddress,
@@ -398,7 +398,7 @@ fun AddressSelection(
398398
}
399399

400400
@Composable
401-
fun AddressSelectionItem(
401+
fun OriginAddressSelectionItem(
402402
address: OriginShippingAddress,
403403
isSelected: Boolean,
404404
onClick: () -> Unit,

0 commit comments

Comments
 (0)