Skip to content

Commit be8aca0

Browse files
authored
[Woo POS][Design System] Consolidate corner radius style (#15132)
2 parents dde59af + bb3dee7 commit be8aca0

14 files changed

+59
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private extension CardReaderConnectionStatusView {
121121
static let font = POSFontStyle.posBodyMediumRegular()
122122
static let horizontalPadding: CGFloat = 24
123123
static let disconnectedBorderAndContentSpacing: CGFloat = 16
124-
static let disconnectedBorderCornerRadius: CGFloat = 4
124+
static let disconnectedBorderCornerRadius: CGFloat = POSCornerRadiusStyle.small.value
125125
static let disconnectedBorderWidth: CGFloat = 2
126126
static let disconnectedBorderInset: CGFloat = 8
127127
}

WooCommerce/Classes/POS/Presentation/Item Selector/GhostItemCardView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private extension GhostItemCardView {
3131

3232
enum Layout {
3333
static let placeholderHeight: CGFloat = 36
34-
static let cornerRadius: CGFloat = 8
34+
static let cornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
3535
}
3636
}
3737

WooCommerce/Classes/POS/Presentation/ItemListView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private extension ItemListView {
180180
enum Constants {
181181
static let bannerTitleFont: POSFontStyle = .posBodyLargeBold
182182
static let bannerSubtitleFont: POSFontStyle = .posBodySmallRegular()
183-
static let bannerCornerRadius: CGFloat = 8
183+
static let bannerCornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
184184
static let bannerVerticalPadding: CGFloat = 26
185185
static let bannerTextSpacing: CGFloat = 4
186186
static let bannerTitleSpacing: CGFloat = 8

WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ extension POSFloatingControlView {
104104
private extension POSFloatingControlView {
105105
enum Constants {
106106
static let size: CGFloat = 80
107-
static let cornerRadius: CGFloat = 8
107+
static let cornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
108108
}
109109

110110
enum Localization {

WooCommerce/Classes/POS/Presentation/POSReceiptEligibilityBanner.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct POSReceiptEligibilityBanner: View {
2929
private extension POSReceiptEligibilityBanner {
3030
enum Constants {
3131
static let elementSpacing: CGFloat = 8
32-
static let cornerRadius: CGFloat = 20
32+
static let cornerRadius: CGFloat = POSCornerRadiusStyle.large.value
3333
static let imagesize: CGFloat = 40
3434
static let imagePadding: CGFloat = 4
3535
static let bannerPadding: CGFloat = 16
@@ -42,3 +42,8 @@ private extension POSReceiptEligibilityBanner {
4242
comment: "Text for the banner requiring specific WooCommerce version.")
4343
}
4444
}
45+
46+
#Preview {
47+
POSReceiptEligibilityBanner(isVisible: .constant(true))
48+
.padding()
49+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private struct POSButton: View {
137137

138138
private extension POSButton {
139139
enum Constants {
140-
static let cornerRadius: CGFloat = 8.0
140+
static let cornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
141141
static let borderStrokeWidth: CGFloat = 2.0
142142
}
143143
}

WooCommerce/Classes/POS/Presentation/Reusable Views/POSConnectivityView.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ struct POSConnectivityView: View {
2828
@ViewBuilder private var noConnectionBanner: some View {
2929
HStack(spacing: Constants.spacing) {
3030
Image(systemName: "wifi.exclamationmark")
31-
.foregroundColor(Color(.text.inverted))
31+
.foregroundColor(Color.posOnSecondaryContainer)
3232
.font(.posBodySmallBold)
3333

3434
Text(Localization.title)
35-
.foregroundColor(Color(.text.inverted))
35+
.foregroundColor(Color.posOnSecondaryContainer)
3636
.font(.posBodySmallBold)
3737
}
3838
.padding(.vertical, Constants.verticalPadding)
3939
.padding(.horizontal, Constants.horizontalPadding)
4040
.frame(minHeight: Constants.height)
41-
.background(Color(.systemGray6.inverted))
41+
.background(Color.posSecondaryContainer)
4242
.cornerRadius(Constants.cornerRadius)
43-
.shadow(color: Color.black.opacity(0.2), radius: 8, x: 0, y: 2)
43+
.shadow(color: Color.posShadow.opacity(0.2), radius: 8, x: 0, y: 2)
4444
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
4545
}
4646

@@ -51,7 +51,7 @@ struct POSConnectivityView: View {
5151

5252
private extension POSConnectivityView {
5353
enum Constants {
54-
static let cornerRadius: CGFloat = 16
54+
static let cornerRadius: CGFloat = POSCornerRadiusStyle.large.value
5555
static let height: CGFloat = 64
5656
static let spacing: CGFloat = 16
5757
static let horizontalPadding: CGFloat = 24
@@ -67,3 +67,8 @@ private extension POSConnectivityView {
6767
)
6868
}
6969
}
70+
71+
#Preview {
72+
// To enable preview, set `isVisible` to `true` and comment out `onAppear` block.
73+
POSConnectivityView()
74+
}

WooCommerce/Classes/POS/Presentation/Reusable Views/POSItemCardBorderStylesModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct POSItemCardBorderStylesModifier: ViewModifier {
1515

1616
private extension POSItemCardBorderStylesModifier {
1717
enum Constants {
18-
static let cardCornerRadius: CGFloat = 8.0
18+
static let cardCornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
1919
// The use of stroke means the shape is rendered as an outline (border) rather than a filled shape,
2020
// since we still have to give it a value, we use 0 so it renders no border but it's shaped as one.
2121
static let nilOutline: CGFloat = 0

WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalViewModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct POSRootModalViewModifier: ViewModifier {
2626
ZStack {
2727
modalManager.getContent()
2828
.background(Color.posSurfaceBright)
29-
.cornerRadius(24)
29+
.cornerRadius(POSCornerRadiusStyle.extraLarge.value)
3030
.shadow(color: Color.posShadow.opacity(0.02), radius: 43, x: 0, y: 50) // 0px 50px 43px 0px #00000005
3131
.shadow(color: Color.posShadow.opacity(0.04), radius: 36, x: 0, y: 30) // 0px 30px 36px 0px #0000000A
3232
.shadow(color: Color.posShadow.opacity(0.07), radius: 27, x: 0, y: 15) // 0px 15px 27px 0px #00000012

WooCommerce/Classes/POS/Presentation/SimpleProductsOnlyInformation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private extension SimpleProductsOnlyInformation {
7373
static let modalContentPadding: CGFloat = 40
7474
static let hintVerticalPadding: CGFloat = 24
7575
static let hintHorizontalPadding: CGFloat = 40
76-
static let hintBackgroundCornerRadius: CGFloat = 8
76+
static let hintBackgroundCornerRadius: CGFloat = POSCornerRadiusStyle.medium.value
7777
static let contentBlockSpacing: CGFloat = 40
7878
static let textSpacing: CGFloat = 16
7979
static let textToModalBottomPadding: CGFloat = 8

0 commit comments

Comments
 (0)