Skip to content

Commit 07b4d13

Browse files
authored
[Woo POS][Design System] Update buttons to use POS button style (#15102)
2 parents 992f3db + 0dacf14 commit 07b4d13

File tree

39 files changed

+246
-266
lines changed

39 files changed

+246
-266
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct PointOfSaleCardPresentPaymentBluetoothRequiredAlertView: View {
3333

3434
Button(viewModel.openSettingsButtonViewModel.title,
3535
action: viewModel.openSettingsButtonViewModel.actionHandler)
36-
.buttonStyle(POSPrimaryButtonStyle())
36+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
3737
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
3838
}
3939
.posModalCloseButton(action: viewModel.dismissButtonViewModel.actionHandler,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedChargeReaderView: View {
2828

2929
Button(viewModel.retryButtonViewModel.title,
3030
action: viewModel.retryButtonViewModel.actionHandler)
31-
.buttonStyle(POSPrimaryButtonStyle())
31+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
3232
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
3333
}
3434
.posModalCloseButton(action: viewModel.cancelButtonViewModel.actionHandler,

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
@@ -20,7 +20,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedUpdateAddressView: View {
2020
if let primaryButtonViewModel = viewModel.primaryButtonViewModel {
2121
Button(primaryButtonViewModel.title,
2222
action: primaryButtonViewModel.actionHandler)
23-
.buttonStyle(POSPrimaryButtonStyle())
23+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
2424
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
2525
}
2626
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedUpdatePostalCodeView: View {
2828

2929
Button(viewModel.retryButtonViewModel.title,
3030
action: viewModel.retryButtonViewModel.actionHandler)
31-
.buttonStyle(POSPrimaryButtonStyle())
31+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
3232
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
3333
}
3434
.posModalCloseButton(action: viewModel.cancelButtonViewModel.actionHandler,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedView: View {
3535

3636
Button(viewModel.retryButtonViewModel.title,
3737
action: viewModel.retryButtonViewModel.actionHandler)
38-
.buttonStyle(POSPrimaryButtonStyle())
38+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
3939
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
4040
}
4141
.posModalCloseButton(action: viewModel.cancelButtonViewModel.actionHandler,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct PointOfSaleCardPresentPaymentFoundMultipleReadersView: View {
3636
}) {
3737
Text(Localization.cancel)
3838
}
39-
.buttonStyle(POSSecondaryButtonStyle())
39+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
4040
.padding(Layout.buttonPadding)
4141
}
4242
.padding(Layout.padding)
@@ -53,7 +53,7 @@ private extension PointOfSaleCardPresentPaymentFoundMultipleReadersView {
5353
Button(Localization.connect) {
5454
connect(readerID)
5555
}
56-
.buttonStyle(POSTextButtonStyle())
56+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .extraSmall))
5757
}
5858
.padding(.vertical, Layout.rowVerticalPadding)
5959
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ struct PointOfSaleCardPresentPaymentFoundReaderView: View {
2929
VStack(spacing: PointOfSaleReaderConnectionModalLayout.buttonSpacing) {
3030
Button(viewModel.connectButton.title,
3131
action: viewModel.connectButton.actionHandler)
32-
.buttonStyle(POSPrimaryButtonStyle())
32+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
3333

3434
Button(viewModel.continueSearchButton.title,
3535
action: viewModel.continueSearchButton.actionHandler)
36-
.buttonStyle(POSSecondaryButtonStyle())
36+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
3737
}
3838
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
3939
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct PointOfSaleCardPresentPaymentOptionalReaderUpdateInProgressView: View {
4545
cancelReaderUpdate()
4646
}
4747
})
48-
.buttonStyle(POSSecondaryButtonStyle())
48+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
4949
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
5050
}
5151
.multilineTextAlignment(.center)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedLowBatteryView: View {
3737
VStack(spacing: PointOfSaleReaderConnectionModalLayout.buttonSpacing) {
3838
Button(viewModel.retrySearchButtonViewModel.title,
3939
action: viewModel.retrySearchButtonViewModel.actionHandler)
40-
.buttonStyle(POSPrimaryButtonStyle())
40+
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
4141
Button(viewModel.cancelButtonViewModel.title,
4242
action: viewModel.cancelButtonViewModel.actionHandler)
43-
.buttonStyle(POSSecondaryButtonStyle())
43+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
4444
}
4545
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
4646
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedNonRetryableView: View {
2525

2626
Button(viewModel.cancelButtonViewModel.title,
2727
action: viewModel.cancelButtonViewModel.actionHandler)
28-
.buttonStyle(POSSecondaryButtonStyle())
28+
.buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
2929
.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
3030
}
3131
.multilineTextAlignment(.center)

0 commit comments

Comments
 (0)