Skip to content

Commit 49a2c2b

Browse files
jaclyncjaclync
committed
Move previous button constants POSButtonStyleConstants to POSButtonStyle.
1 parent c388d1c commit 49a2c2b

File tree

5 files changed

+12
-73
lines changed

5 files changed

+12
-73
lines changed

‎WooCommerce/Classes/POS/Presentation/Reusable Views/Buttons/POSButtonStyle.swift‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct POSButtonStyle: ButtonStyle {
4747
.overlay(borderOverlay)
4848
// Makes the entire area tappable, otherwise the area with clear background is not tappable.
4949
.contentShape(Rectangle())
50-
.cornerRadius(POSButtonStyleConstants.framedButtonCornerRadius)
50+
.cornerRadius(Constants.cornerRadius)
5151
.opacity(configuration.isPressed ? 0.7 : 1.0)
5252
.animation(.easeOut(duration: 0.15), value: configuration.isPressed)
5353
}
@@ -79,13 +79,22 @@ struct POSButtonStyle: ButtonStyle {
7979
@ViewBuilder
8080
private var borderOverlay: some View {
8181
if variant == .outlined {
82-
RoundedRectangle(cornerRadius: POSButtonStyleConstants.framedButtonCornerRadius)
82+
RoundedRectangle(cornerRadius: Constants.cornerRadius)
8383
.stroke(isEnabled ? Color.posInverseSurface : .posDisabledContainer,
84-
lineWidth: 2)
84+
lineWidth: Constants.borderStrokeWidth)
8585
}
8686
}
8787
}
8888

89+
// MARK: - POSButtonStyle Constants
90+
91+
private extension POSButtonStyle {
92+
enum Constants {
93+
static let cornerRadius: CGFloat = 8.0
94+
static let borderStrokeWidth: CGFloat = 2.0
95+
}
96+
}
97+
8998
// MARK: - POSButtonSize Extensions
9099

91100
private extension POSButtonSize {

‎WooCommerce/Classes/POS/Presentation/Reusable Views/Buttons/POSButtonStylesPreview.swift‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎WooCommerce/Classes/POS/Presentation/Reusable Views/POSButtonStyleConstants.swift‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎WooCommerce/Classes/POS/Presentation/Reusable Views/POSTextButtonStyle.swift‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
020F41E623163C0100776C4D /* TopBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020F41E423163C0100776C4D /* TopBannerView.swift */; };
118118
021080FA2D5441CE0054C78D /* POSColorPalette.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 021080F92D5441CE0054C78D /* POSColorPalette.xcassets */; };
119119
021080FC2D544B3E0054C78D /* Color+POSColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021080FB2D544B3E0054C78D /* Color+POSColorPalette.swift */; };
120-
0210A2472D55EC250054C78D /* POSButtonStylesPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0210A2462D55EC250054C78D /* POSButtonStylesPreview.swift */; };
121120
0210A2492D55F0530054C78D /* POSButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0210A2482D55F0530054C78D /* POSButtonStyle.swift */; };
122121
0210D8692A7BEEF700846F8C /* WooAnalyticsEvent+ProductListFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0210D8682A7BEEF700846F8C /* WooAnalyticsEvent+ProductListFilter.swift */; };
123122
0211252825773F220075AD2A /* Models+Copiable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0211252725773F220075AD2A /* Models+Copiable.generated.swift */; };
@@ -800,7 +799,6 @@
800799
2026ECE92C25D21F00BEF7E4 /* CardPresentPaymentInvalidatablePaymentOrchestrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2026ECE82C25D21F00BEF7E4 /* CardPresentPaymentInvalidatablePaymentOrchestrator.swift */; };
801800
2027F74F2C8F0858004BDF73 /* PointOfSaleCardPresentPaymentConnectionSuccessAlertViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2027F74E2C8F0858004BDF73 /* PointOfSaleCardPresentPaymentConnectionSuccessAlertViewModelTests.swift */; };
802801
2027F7562C90B013004BDF73 /* CardPresentPaymentReaderConnectionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2027F7552C90B013004BDF73 /* CardPresentPaymentReaderConnectionStatus.swift */; };
803-
202C6C562C7F667700413107 /* POSTextButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 202C6C552C7F667700413107 /* POSTextButtonStyle.swift */; };
804802
202D2A5A2AC5933100E4ABC0 /* TopTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 202D2A592AC5933100E4ABC0 /* TopTabView.swift */; };
805803
203163A92C1B5AA7001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 203163A82C1B5AA7001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertViewModel.swift */; };
806804
203163AB2C1B5DEE001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 203163AA2C1B5DEE001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertView.swift */; };
@@ -894,7 +892,6 @@
894892
20D2CCA32C7E175700051705 /* WavesProgressViewStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D2CCA22C7E175700051705 /* WavesProgressViewStyle.swift */; };
895893
20D2CCA52C7E328300051705 /* POSModalCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D2CCA42C7E328300051705 /* POSModalCloseButton.swift */; };
896894
20D3D42B2C64D7CC004CE6E3 /* SimpleProductsOnlyInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D3D42A2C64D7CC004CE6E3 /* SimpleProductsOnlyInformation.swift */; };
897-
20D3D4312C64F202004CE6E3 /* POSButtonStyleConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D3D4302C64F202004CE6E3 /* POSButtonStyleConstants.swift */; };
898895
20D3D4332C65E59B004CE6E3 /* OrdersRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D3D4322C65E59B004CE6E3 /* OrdersRoute.swift */; };
899896
20D3D4352C65E640004CE6E3 /* OrdersDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D3D4342C65E640004CE6E3 /* OrdersDestination.swift */; };
900897
20D3D4372C65EF72004CE6E3 /* OrdersRouteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D3D4362C65EF72004CE6E3 /* OrdersRouteTests.swift */; };
@@ -3324,7 +3321,6 @@
33243321
020F41E423163C0100776C4D /* TopBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TopBannerView.swift; sourceTree = "<group>"; };
33253322
021080F92D5441CE0054C78D /* POSColorPalette.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = POSColorPalette.xcassets; sourceTree = "<group>"; };
33263323
021080FB2D544B3E0054C78D /* Color+POSColorPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+POSColorPalette.swift"; sourceTree = "<group>"; };
3327-
0210A2462D55EC250054C78D /* POSButtonStylesPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSButtonStylesPreview.swift; sourceTree = "<group>"; };
33283324
0210A2482D55F0530054C78D /* POSButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSButtonStyle.swift; sourceTree = "<group>"; };
33293325
0210D8682A7BEEF700846F8C /* WooAnalyticsEvent+ProductListFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WooAnalyticsEvent+ProductListFilter.swift"; sourceTree = "<group>"; };
33303326
0211252725773F220075AD2A /* Models+Copiable.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Models+Copiable.generated.swift"; sourceTree = "<group>"; };
@@ -4011,7 +4007,6 @@
40114007
2026ECE82C25D21F00BEF7E4 /* CardPresentPaymentInvalidatablePaymentOrchestrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentPaymentInvalidatablePaymentOrchestrator.swift; sourceTree = "<group>"; };
40124008
2027F74E2C8F0858004BDF73 /* PointOfSaleCardPresentPaymentConnectionSuccessAlertViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleCardPresentPaymentConnectionSuccessAlertViewModelTests.swift; sourceTree = "<group>"; };
40134009
2027F7552C90B013004BDF73 /* CardPresentPaymentReaderConnectionStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentPaymentReaderConnectionStatus.swift; sourceTree = "<group>"; };
4014-
202C6C552C7F667700413107 /* POSTextButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSTextButtonStyle.swift; sourceTree = "<group>"; };
40154010
202D2A592AC5933100E4ABC0 /* TopTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopTabView.swift; sourceTree = "<group>"; };
40164011
203163A82C1B5AA7001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleCardPresentPaymentBluetoothRequiredAlertViewModel.swift; sourceTree = "<group>"; };
40174012
203163AA2C1B5DEE001C96DA /* PointOfSaleCardPresentPaymentBluetoothRequiredAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleCardPresentPaymentBluetoothRequiredAlertView.swift; sourceTree = "<group>"; };
@@ -4107,7 +4102,6 @@
41074102
20D2CCA22C7E175700051705 /* WavesProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WavesProgressViewStyle.swift; sourceTree = "<group>"; };
41084103
20D2CCA42C7E328300051705 /* POSModalCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSModalCloseButton.swift; sourceTree = "<group>"; };
41094104
20D3D42A2C64D7CC004CE6E3 /* SimpleProductsOnlyInformation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleProductsOnlyInformation.swift; sourceTree = "<group>"; };
4110-
20D3D4302C64F202004CE6E3 /* POSButtonStyleConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSButtonStyleConstants.swift; sourceTree = "<group>"; };
41114105
20D3D4322C65E59B004CE6E3 /* OrdersRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersRoute.swift; sourceTree = "<group>"; };
41124106
20D3D4342C65E640004CE6E3 /* OrdersDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersDestination.swift; sourceTree = "<group>"; };
41134107
20D3D4362C65EF72004CE6E3 /* OrdersRouteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersRouteTests.swift; sourceTree = "<group>"; };
@@ -6485,8 +6479,6 @@
64856479
209EEF8F2C762ED5007969A4 /* POSModalManager.swift */,
64866480
02B2AD8C2CD0A87B00929CE8 /* POSModalSizing.swift */,
64876481
01D0823F2C5B9EAB007FE81F /* POSBackgroundAppearanceKey.swift */,
6488-
202C6C552C7F667700413107 /* POSTextButtonStyle.swift */,
6489-
20D3D4302C64F202004CE6E3 /* POSButtonStyleConstants.swift */,
64906482
683988A62C7D82E60084B85A /* POSHeaderLayoutConstants.swift */,
64916483
207823E82C5D3A1700025A59 /* POSErrorExclamationMark.swift */,
64926484
20ADE9402C6A02B700C91265 /* POSErrorXMark.swift */,
@@ -6650,7 +6642,6 @@
66506642
isa = PBXGroup;
66516643
children = (
66526644
0210A2482D55F0530054C78D /* POSButtonStyle.swift */,
6653-
0210A2462D55EC250054C78D /* POSButtonStylesPreview.swift */,
66546645
);
66556646
path = Buttons;
66566647
sourceTree = "<group>";
@@ -15527,7 +15518,6 @@
1552715518
CC41E70C29310C1F008B3FB9 /* AnalyticsLineChart.swift in Sources */,
1552815519
456CB50D2444BFAC00992A05 /* ProductPurchaseNoteViewController.swift in Sources */,
1552915520
EE3BC28E2BE390B800195AF0 /* InAppFeedbackCardViewModel.swift in Sources */,
15530-
0210A2472D55EC250054C78D /* POSButtonStylesPreview.swift in Sources */,
1553115521
6827140F28A3988300E6E3F6 /* DismissableNoticeView.swift in Sources */,
1553215522
D802541F2655137A001B2CC1 /* CardPresentModalNonRetryableError.swift in Sources */,
1553315523
B651474527D644FF00C9C4E6 /* CustomerNoteSection.swift in Sources */,
@@ -15559,7 +15549,6 @@
1555915549
456931842653E9F2009ED69D /* ShippingLabelCarrierRow.swift in Sources */,
1556015550
09BE3A8E27C91E730070B69D /* BulkUpdatePriceSettingsViewModel.swift in Sources */,
1556115551
02FFDDC62A31A73D000F5F1C /* WooAnalyticsEvent+Blaze.swift in Sources */,
15562-
20D3D4312C64F202004CE6E3 /* POSButtonStyleConstants.swift in Sources */,
1556315552
03B9E5212A13971F005C77F5 /* TapToPayReconnectionController.swift in Sources */,
1556415553
26D1E9E82949818B00A7DC62 /* AnalyticsHubTimeRageAdapter.swift in Sources */,
1556515554
CE32B11A20BF8E32006FBCF4 /* UIButton+Helpers.swift in Sources */,
@@ -16868,7 +16857,6 @@
1686816857
B65496342A0B291A003D29E1 /* EUShippingNoticeBanner.swift in Sources */,
1686916858
B946881029B8DD01000646B0 /* InPersonPaymentsMenuViewController+Activity.swift in Sources */,
1687016859
203163B12C1C5C87001C96DA /* PointOfSaleCardPresentPaymentConnectingFailedUpdatePostalCodeAlertViewModel.swift in Sources */,
16871-
202C6C562C7F667700413107 /* POSTextButtonStyle.swift in Sources */,
1687216860
EE289AE92C9D7CEF004AB1A6 /* ImageTextScanner.swift in Sources */,
1687316861
027EB56C29C05F4B003CE551 /* StoreOnboardingLaunchStoreView.swift in Sources */,
1687416862
2044158F2CE6181E0070BF54 /* PointOfSaleOrderState.swift in Sources */,

0 commit comments

Comments
 (0)