Skip to content

Commit f8ec517

Browse files
jaclyncjaclync
committed
Merge branch 'trunk' into feat/15070-floating-control-ds
# Conflicts: # WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift # WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift
2 parents 9b30912 + 1035b7c commit f8ec517

File tree

92 files changed

+978
-494
lines changed

Some content is hidden

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

92 files changed

+978
-494
lines changed

‎Experiments/Experiments/DefaultFeatureFlagService.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
9191
return true
9292
case .acceptCashForPointOfSale:
9393
return true
94-
case .variableProductsInPointOfSale:
95-
return true
9694
case .hideSitesInStorePicker:
9795
return true
9896
case .filterHistoryOnOrderAndProductLists:

‎Experiments/Experiments/FeatureFlag.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ public enum FeatureFlag: Int {
197197
///
198198
case acceptCashForPointOfSale
199199

200-
/// Supports variable products in POS.
201-
///
202-
case variableProductsInPointOfSale
203-
204200
/// Supports hiding sites from the store picker
205201
///
206202
case hideSitesInStorePicker

‎RELEASE-NOTES.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22
*** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
3+
34
21.8
45
-----
5-
6+
- [*] Now "Suggested by AI" label is visible in dark mode in Blaze campaign creation flow. [https://github.com/woocommerce/woocommerce-ios/pull/15088]
7+
- [*] Improved image loading in Blaze Campaign Creation: displays a redacted and shimmering effects when loading product image and falls back to a placeholder if no image is available. [https://github.com/woocommerce/woocommerce-ios/pull/15098]
8+
- [*] Product List: Display syncing animation on items with image upload in progress [https://github.com/woocommerce/woocommerce-ios/pull/15052]
69

710
21.7
811
-----

‎WooCommerce/Classes/POS/Colors/Color+POSColorPalette.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ extension Color {
88
static var posOnPrimaryContainer: Color { Color(.posOnPrimaryContainer) }
99

1010
// MARK: - Secondary Container Colors
11+
static var posSecondary: Color { Color(.posSecondary) }
12+
static var posOnSecondary: Color { Color(.posOnSecondary) }
1113
static var posSecondaryContainer: Color { Color(.posSecondaryContainer) }
1214
static var posOnSecondaryContainer: Color { Color(.posOnSecondaryContainer) }
1315

‎WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnSecondary.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x17",
9+
"green" : "0x15",
10+
"red" : "0x10"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0x17",
27+
"green" : "0x15",
28+
"red" : "0x10"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posSecondary.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xFF",
9+
"green" : "0xC1",
10+
"red" : "0xD1"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0xFF",
27+
"green" : "0xC1",
28+
"red" : "0xD1"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct CardReaderConnectionStatusView: View {
5252
} label: {
5353
Text(Localization.connectReader)
5454
}
55-
.buttonStyle(POSButtonStyle(variant: .filled, size: .extraSmall))
55+
.buttonStyle(POSFilledButtonStyle(size: .extraSmall))
5656
}
5757
.padding(.horizontal, Constants.horizontalPadding)
5858
.frame(maxHeight: .infinity)
@@ -109,7 +109,7 @@ private extension CardReaderConnectionStatusView {
109109
static let imageDimension: CGFloat = 12
110110
static let progressIndicatorDimension: CGFloat = 10
111111
static let progressIndicatorLineWidth: CGFloat = 2
112-
static let font = POSFontStyle.posDetailEmphasized
112+
static let font = POSFontStyle.posBodyMediumRegular()
113113
static let horizontalPadding: CGFloat = 24
114114
}
115115
}

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

Lines changed: 3 additions & 3 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)
@@ -33,7 +33,7 @@ struct PointOfSaleCardPresentPaymentBluetoothRequiredAlertView: View {
3333

3434
Button(viewModel.openSettingsButtonViewModel.title,
3535
action: viewModel.openSettingsButtonViewModel.actionHandler)
36-
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
36+
.buttonStyle(POSFilledButtonStyle(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: 3 additions & 3 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
}
@@ -28,7 +28,7 @@ struct PointOfSaleCardPresentPaymentConnectingFailedChargeReaderView: View {
2828

2929
Button(viewModel.retryButtonViewModel.title,
3030
action: viewModel.retryButtonViewModel.actionHandler)
31-
.buttonStyle(POSButtonStyle(variant: .filled, size: .normal))
31+
.buttonStyle(POSFilledButtonStyle(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/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
}

0 commit comments

Comments
 (0)