Skip to content

Commit c742c2c

Browse files
committed
Add line cap and max dynamic-type-size for toggle
1 parent a073fb1 commit c742c2c

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShippingCreateLabelsView.swift

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,13 @@ private extension WooShippingCreateLabelsView {
305305
if isiPhonePortrait {
306306
VStack(spacing: Layout.bottomSheetSpacing) {
307307
if isShipmentDetailsExpanded {
308-
Toggle(Localization.BottomSheet.markComplete, isOn: $viewModel.markOrderComplete)
309-
.font(.subheadline)
310-
.tint(Color(.primary))
308+
Toggle(isOn: $viewModel.markOrderComplete) {
309+
Text(Localization.BottomSheet.markComplete)
310+
.font(.subheadline)
311+
.lineLimit(Layout.toggleTextLineLimit)
312+
.dynamicTypeSize(...Layout.toggleTextMaxDynamicTypeSizePortrait)
313+
}
314+
.tint(Color(.primary))
311315
}
312316
if isShipmentDetailsExpanded || viewModel.currentShipmentDetailsViewModel.selectedPackage != nil {
313317
purchaseButton
@@ -317,10 +321,14 @@ private extension WooShippingCreateLabelsView {
317321
else {
318322
HStack(spacing: Layout.bottomSheetSpacing) {
319323
if viewModel.currentShipmentDetailsViewModel.selectedPackage != nil || isShipmentDetailsExpanded {
320-
Toggle(Localization.BottomSheet.markComplete, isOn: $viewModel.markOrderComplete)
321-
.font(.subheadline)
322-
.tint(Color(.primary))
323-
.fixedSize(horizontal: false, vertical: true)
324+
Toggle(isOn: $viewModel.markOrderComplete) {
325+
Text(Localization.BottomSheet.markComplete)
326+
.font(.subheadline)
327+
.lineLimit(Layout.toggleTextLineLimit)
328+
.dynamicTypeSize(...Layout.toggleTextMaxDynamicTypeSizeAlbum)
329+
}
330+
.tint(Color(.primary))
331+
.fixedSize(horizontal: false, vertical: true)
324332
purchaseButton
325333
}
326334
}
@@ -608,6 +616,10 @@ private extension WooShippingCreateLabelsView {
608616
static let gradientViewWidth: CGFloat = 32
609617
static let purchasedIconWidth: CGFloat = 16
610618
static let purchasedIcon = UIImage(systemName: "checkmark.circle.fill")?.withRenderingMode(.alwaysTemplate)
619+
620+
static let toggleTextLineLimit = 3
621+
static let toggleTextMaxDynamicTypeSizePortrait = DynamicTypeSize.accessibility1
622+
static let toggleTextMaxDynamicTypeSizeAlbum = DynamicTypeSize.xxxLarge
611623
}
612624

613625
enum Localization {
@@ -725,3 +737,4 @@ private extension WooShippingCreateLabelsView {
725737
)
726738
}
727739
}
740+

0 commit comments

Comments
 (0)