Replace POSSecondaryButtonStyle with POSButtonStyle(variant: .outlined, size: .normal).

jaclync · jaclync · commit 36d5ade64bb4 · 2025-02-07T16:57:54.000+08:00
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentFoundMultipleReadersView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentFoundMultipleReadersView.swift
@@ -36,7 +36,7 @@ struct PointOfSaleCardPresentPaymentFoundMultipleReadersView: View {
             }) {
                 Text(Localization.cancel)
             }
-            .buttonStyle(POSSecondaryButtonStyle())
+            .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             .padding(Layout.buttonPadding)
         }
         .padding(Layout.padding)
@@ -53,7 +53,7 @@ private extension PointOfSaleCardPresentPaymentFoundMultipleReadersView {
             Button(Localization.connect) {
                 connect(readerID)
             }
-            .buttonStyle(POSTextButtonStyle())
+            .buttonStyle(POSButtonStyle(variant: .outlined, size: .extraSmall))
         }
         .padding(.vertical, Layout.rowVerticalPadding)
     }
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentFoundReaderView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentFoundReaderView.swift
@@ -33,7 +33,7 @@ struct PointOfSaleCardPresentPaymentFoundReaderView: View {
 
                 Button(viewModel.continueSearchButton.title,
                        action: viewModel.continueSearchButton.actionHandler)
-                .buttonStyle(POSSecondaryButtonStyle())
+                .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             }
             .matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
         }
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentOptionalReaderUpdateInProgressView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentOptionalReaderUpdateInProgressView.swift
@@ -45,7 +45,7 @@ struct PointOfSaleCardPresentPaymentOptionalReaderUpdateInProgressView: View {
                     cancelReaderUpdate()
                 }
             })
-            .buttonStyle(POSSecondaryButtonStyle())
+            .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             .matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
         }
         .multilineTextAlignment(.center)
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentReaderUpdateFailedLowBatteryView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentReaderUpdateFailedLowBatteryView.swift
@@ -40,7 +40,7 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedLowBatteryView: View {
                 .buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
                 Button(viewModel.cancelButtonViewModel.title,
                        action: viewModel.cancelButtonViewModel.actionHandler)
-                .buttonStyle(POSSecondaryButtonStyle())
+                .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             }
             .matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
         }
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentReaderUpdateFailedNonRetryableView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentReaderUpdateFailedNonRetryableView.swift
@@ -25,7 +25,7 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedNonRetryableView: View {
 
             Button(viewModel.cancelButtonViewModel.title,
                    action: viewModel.cancelButtonViewModel.actionHandler)
-            .buttonStyle(POSSecondaryButtonStyle())
+            .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             .matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
         }
         .multilineTextAlignment(.center)
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentRequiredReaderUpdateInProgressView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Connection Alerts/PointOfSaleCardPresentPaymentRequiredReaderUpdateInProgressView.swift
@@ -45,7 +45,7 @@ struct PointOfSaleCardPresentPaymentRequiredReaderUpdateInProgressView: View {
                     cancelReaderUpdate()
                 }
             })
-            .buttonStyle(POSSecondaryButtonStyle())
+            .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             .matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)
         }
         .multilineTextAlignment(.center)
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentCaptureErrorMessageView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentCaptureErrorMessageView.swift
@@ -38,7 +38,7 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {
                 Button(action: viewModel.newOrderButtonViewModel.actionHandler) {
                     Label(viewModel.newOrderButtonViewModel.title, systemImage: "arrow.uturn.backward")
                 }
-                .buttonStyle(POSSecondaryButtonStyle())
+                .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
             }
         }
         .multilineTextAlignment(.center)
@@ -60,4 +60,5 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {
             newOrderButtonAction: {}),
         animation: .init(namespace: namespace)
     )
+    .environmentObject(POSModalManager())
 }
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentErrorMessageView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentErrorMessageView.swift
@@ -30,7 +30,7 @@ struct PointOfSaleCardPresentPaymentErrorMessageView: View {
                 if let backToCheckoutButtonViewModel = viewModel.backToCheckoutButtonViewModel {
                     Button(backToCheckoutButtonViewModel.title,
                            action: backToCheckoutButtonViewModel.actionHandler)
-                    .buttonStyle(POSSecondaryButtonStyle())
+                    .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
                 }
             }
         }
diff --git a/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentIntentCreationErrorMessageView.swift b/WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentIntentCreationErrorMessageView.swift
@@ -30,7 +30,7 @@ struct PointOfSaleCardPresentPaymentIntentCreationErrorMessageView: View {
                 if let editOrderButtonViewModel = viewModel.editOrderButtonViewModel {
                     Button(editOrderButtonViewModel.title,
                            action: editOrderButtonViewModel.actionHandler)
-                    .buttonStyle(POSSecondaryButtonStyle())
+                    .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct PointOfSaleCardPresentPaymentFoundMultipleReadersView: View {`
`36`	`36`	`}) {`
`37`	`37`	`Text(Localization.cancel)`
`38`	`38`	`}`
`39`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`39`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`40`	`40`	`.padding(Layout.buttonPadding)`
`41`	`41`	`}`
`42`	`42`	`.padding(Layout.padding)`
`@@ -53,7 +53,7 @@ private extension PointOfSaleCardPresentPaymentFoundMultipleReadersView {`
`53`	`53`	`Button(Localization.connect) {`
`54`	`54`	`connect(readerID)`
`55`	`55`	`}`
`56`		`- .buttonStyle(POSTextButtonStyle())`
	`56`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .extraSmall))`
`57`	`57`	`}`
`58`	`58`	`.padding(.vertical, Layout.rowVerticalPadding)`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct PointOfSaleCardPresentPaymentFoundReaderView: View {`
`33`	`33`
`34`	`34`	`Button(viewModel.continueSearchButton.title,`
`35`	`35`	`action: viewModel.continueSearchButton.actionHandler)`
`36`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`36`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`37`	`37`	`}`
`38`	`38`	`.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ struct PointOfSaleCardPresentPaymentOptionalReaderUpdateInProgressView: View {`
`45`	`45`	`cancelReaderUpdate()`
`46`	`46`	`}`
`47`	`47`	`})`
`48`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`48`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`49`	`49`	`.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)`
`50`	`50`	`}`
`51`	`51`	`.multilineTextAlignment(.center)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedLowBatteryView: View {`
`40`	`40`	`.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))`
`41`	`41`	`Button(viewModel.cancelButtonViewModel.title,`
`42`	`42`	`action: viewModel.cancelButtonViewModel.actionHandler)`
`43`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`43`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`44`	`44`	`}`
`45`	`45`	`.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ struct PointOfSaleCardPresentPaymentReaderUpdateFailedNonRetryableView: View {`
`25`	`25`
`26`	`26`	`Button(viewModel.cancelButtonViewModel.title,`
`27`	`27`	`action: viewModel.cancelButtonViewModel.actionHandler)`
`28`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`28`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`29`	`29`	`.matchedGeometryEffect(id: animation.buttonsTransitionId, in: animation.namespace, properties: .position)`
`30`	`30`	`}`
`31`	`31`	`.multilineTextAlignment(.center)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {`
`38`	`38`	`Button(action: viewModel.newOrderButtonViewModel.actionHandler) {`
`39`	`39`	`Label(viewModel.newOrderButtonViewModel.title, systemImage: "arrow.uturn.backward")`
`40`	`40`	`}`
`41`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`41`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`.multilineTextAlignment(.center)`
`@@ -60,4 +60,5 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {`
`60`	`60`	`newOrderButtonAction: {}),`
`61`	`61`	`animation: .init(namespace: namespace)`
`62`	`62`	`)`
	`63`	`+ .environmentObject(POSModalManager())`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct PointOfSaleCardPresentPaymentErrorMessageView: View {`
`30`	`30`	`if let backToCheckoutButtonViewModel = viewModel.backToCheckoutButtonViewModel {`
`31`	`31`	`Button(backToCheckoutButtonViewModel.title,`
`32`	`32`	`action: backToCheckoutButtonViewModel.actionHandler)`
`33`		`- .buttonStyle(POSSecondaryButtonStyle())`
	`33`	`+ .buttonStyle(POSButtonStyle(variant: .outlined, size: .normal))`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`