Skip to content

Commit c11a3f3

Browse files
authored
[Woo POS][Design System] Audit/update font style (#15114)
2 parents 437ed99 + c2f4fca commit c11a3f3

File tree

52 files changed

+211
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+211
-149
lines changed

WooCommerce/Classes/POS/Presentation/CardReaderConnection/CardReaderConnectionStatusView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private extension CardReaderConnectionStatusView {
111111
static let imageDimension: CGFloat = 12
112112
static let progressIndicatorDimension: CGFloat = 10
113113
static let progressIndicatorLineWidth: CGFloat = 2
114-
static let font = POSFontStyle.posDetailEmphasized
114+
static let font = POSFontStyle.posBodyMediumRegular()
115115
static let horizontalPadding: CGFloat = 24
116116
static let overlayRadius: CGFloat = 4
117117
static let overlayLineWidth: CGFloat = 2

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentBluetoothRequiredAlertView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ struct PointOfSaleCardPresentPaymentBluetoothRequiredAlertView: View {
1818

1919
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
2020
Text(viewModel.title)
21-
.font(POSFontStyle.posTitleEmphasized)
21+
.font(POSFontStyle.posHeading)
2222
.accessibilityAddTraits(.isHeader)
2323
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
2424

2525
Text(viewModel.errorDetails)
26-
.font(POSFontStyle.posBodyRegular)
26+
.font(POSFontStyle.posBodyLargeRegular())
2727
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2828
}
2929
.fixedSize(horizontal: false, vertical: true)

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingFailedChargeReaderView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ struct PointOfSaleCardPresentPaymentConnectingFailedChargeReaderView: View {
1212

1313
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
1414
Text(viewModel.title)
15-
.font(POSFontStyle.posTitleEmphasized)
15+
.font(POSFontStyle.posHeading)
1616
.fixedSize(horizontal: false, vertical: true)
1717
.accessibilityAddTraits(.isHeader)
1818
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
1919

2020
Text(viewModel.errorDetails)
21-
.font(POSFontStyle.posBodyRegular)
21+
.font(POSFontStyle.posBodyLargeRegular())
2222
.fixedSize(horizontal: false, vertical: true)
2323
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2424
}

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingFailedNonRetryableView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ struct PointOfSaleCardPresentPaymentConnectingFailedNonRetryableView: View {
1111

1212
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
1313
Text(viewModel.title)
14-
.font(POSFontStyle.posTitleEmphasized)
14+
.font(POSFontStyle.posHeading)
1515
.fixedSize(horizontal: false, vertical: true)
1616
.accessibilityAddTraits(.isHeader)
1717
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
1818

1919
Text(viewModel.errorDetails)
20-
.font(POSFontStyle.posBodyRegular)
20+
.font(POSFontStyle.posBodyLargeRegular())
2121
.fixedSize(horizontal: false, vertical: true)
2222
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2323
}

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingFailedUpdateAddressView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedUpdateAddressView: View {
1111
.matchedGeometryEffect(id: animation.iconTransitionId, in: animation.namespace, properties: .position)
1212

1313
Text(viewModel.title)
14-
.font(POSFontStyle.posTitleEmphasized)
14+
.font(POSFontStyle.posHeading)
1515
.fixedSize(horizontal: false, vertical: true)
1616
.accessibilityAddTraits(.isHeader)
1717
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingFailedUpdatePostalCodeView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ struct PointOfSaleCardPresentPaymentConnectingFailedUpdatePostalCodeView: View {
1212

1313
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
1414
Text(viewModel.title)
15-
.font(POSFontStyle.posTitleEmphasized)
15+
.font(POSFontStyle.posHeading)
1616
.fixedSize(horizontal: false, vertical: true)
1717
.accessibilityAddTraits(.isHeader)
1818
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
1919

2020
Text(viewModel.errorDetails)
21-
.font(POSFontStyle.posBodyRegular)
21+
.font(POSFontStyle.posBodyLargeRegular())
2222
.fixedSize(horizontal: false, vertical: true)
2323
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2424
}

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingFailedView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ struct PointOfSaleCardPresentPaymentConnectingFailedView: View {
1818

1919
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
2020
Text(viewModel.title)
21-
.font(POSFontStyle.posTitleEmphasized)
21+
.font(POSFontStyle.posHeading)
2222
.accessibilityAddTraits(.isHeader)
2323
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
2424

2525
if let errorDetails = viewModel.errorDetails {
2626
Text(errorDetails)
27-
.font(POSFontStyle.posBodyRegular)
27+
.font(POSFontStyle.posBodyLargeRegular())
2828
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2929
}
3030
}

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectingToReaderView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ struct PointOfSaleCardPresentPaymentConnectingToReaderView: View {
1717

1818
VStack(spacing: PointOfSaleReaderConnectionModalLayout.textSpacing) {
1919
Text(viewModel.title)
20-
.font(POSFontStyle.posTitleEmphasized)
20+
.font(POSFontStyle.posHeading)
2121
.fixedSize(horizontal: false, vertical: true)
2222
.accessibilityAddTraits(.isHeader)
2323
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
2424

2525
Text(viewModel.instruction)
26-
.font(POSFontStyle.posBodyRegular)
26+
.font(POSFontStyle.posBodyLargeRegular())
2727
.fixedSize(horizontal: false, vertical: true)
2828
.matchedGeometryEffect(id: animation.contentTransitionId, in: animation.namespace, properties: .position)
2929
}

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentConnectionSuccessAlertView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct PointOfSaleCardPresentPaymentConnectionSuccessAlertView: View {
1616
.matchedGeometryEffect(id: animation.iconTransitionId, in: animation.namespace, properties: .position)
1717

1818
Text(viewModel.title)
19-
.font(POSFontStyle.posTitleEmphasized)
19+
.font(POSFontStyle.posHeading)
2020
.fixedSize(horizontal: false, vertical: true)
2121
.accessibilityAddTraits(.isHeader)
2222
.matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentFoundMultipleReadersView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct PointOfSaleCardPresentPaymentFoundMultipleReadersView: View {
1818
var body: some View {
1919
VStack {
2020
Text(Localization.headline)
21-
.font(.posTitleEmphasized)
21+
.font(.posHeading)
2222
.padding(Layout.headerPadding)
2323
.accessibilityAddTraits(.isHeader)
2424

@@ -48,7 +48,7 @@ private extension PointOfSaleCardPresentPaymentFoundMultipleReadersView {
4848
@ViewBuilder func readerRow(readerID: String) -> some View {
4949
HStack {
5050
Text(readerID)
51-
.font(.posBodyRegular)
51+
.font(.posBodyLargeRegular())
5252
Spacer()
5353
Button(Localization.connect) {
5454
connect(readerID)
@@ -64,7 +64,7 @@ private extension PointOfSaleCardPresentPaymentFoundMultipleReadersView {
6464
ProgressView()
6565
.progressViewStyle(POSProgressViewStyle(size: 20, lineWidth: 4))
6666
Text(Localization.scanningLabel)
67-
.font(.posBodyRegular)
67+
.font(.posBodyLargeRegular())
6868
Spacer()
6969
}
7070
}

0 commit comments

Comments
 (0)