Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Woo POS] [Design System] Apply straightforward color updates #15068

Merged
merged 25 commits into from
Feb 10, 2025
Merged

[Woo POS] [Design System] Apply straightforward color updates #15068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0d82d75
Rename POS text colors to replace the existing primary/secondary/tert…
jaclync Feb 6, 2025
a445269
Replace `Color.posPrimaryTextInverted` with `Color.posOnInverseSurfac…
jaclync Feb 6, 2025
0d0e84b
Remove unused color `posOverlayFillInverted`.
jaclync Feb 6, 2025
a4049c2
Replace previous `posPrimaryBackground` color with DS colors.
jaclync Feb 6, 2025
6f84b09
Consolidate background color for cards using a constant and set it to…
jaclync Feb 6, 2025
690d36b
Revert use of clear background color to fix clear background area not…
jaclync Feb 6, 2025
da37b47
Update colors in cart view.
jaclync Feb 6, 2025
e6ca856
Update colors in POS modal base.
jaclync Feb 6, 2025
ed832c5
Update colors in product type banner view. This will be extracted to …
jaclync Feb 6, 2025
21fa12a
Update some colors in floating control. The views will also be update…
jaclync Feb 6, 2025
f9b515e
Replace remaining `posSecondaryBackground` usage with colors in design.
jaclync Feb 6, 2025
25a77a5
Remove unused color constant.
jaclync Feb 6, 2025
a405984
Replace `posSuccessColor` with `posSuccess` and update checkmark colo…
jaclync Feb 6, 2025
c1d5de4
Use 0.6 opacity in modal background overlay to allow content below to…
jaclync Feb 6, 2025
26d1fc8
Fix SwiftUI preview crash by passing environment object.
jaclync Feb 6, 2025
ac009e8
Update text colors in payment processing view.
jaclync Feb 6, 2025
6a67d6d
Remove unused color `posOverlayFill`.
jaclync Feb 6, 2025
5aed9e9
Remove debug code to show banner.
jaclync Feb 6, 2025
b2529ec
Polishes.
jaclync Feb 6, 2025
4010bf7
Merge branch 'trunk' into feat/15061-replace-colors
jaclync Feb 7, 2025
41ac7aa
Fix environment variables for previews from adopting Observation for …
jaclync Feb 7, 2025
5dd6465
Update to import SwiftUI for consistency.
jaclync Feb 7, 2025
ac3c0e0
Add shadow layers to product card border modifier based on design.
jaclync Feb 7, 2025
b727822
Update color and related design in modal after design confirmation.
jaclync Feb 7, 2025
8d038e7
Revert "Add shadow layers to product card border modifier based on de…
jaclync Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WooCommerce/Classes/POS/Presentation/Item Selector/ItemListErrorCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct ItemListErrorCardView: View {
.padding(Constants.accessoryButtonPadding * (1 / scale))
}
.frame(maxWidth: .infinity, idealHeight: Constants.productCardSize * scale)
.background(Color.posSecondaryBackground)
.background(Constants.backgroundColor)
.posItemCardBorderStyles()
}
}
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/Classes/POS/Presentation/Item Selector/ParentProductCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct ParentProductCardView: View {
Spacer()
}
.frame(maxWidth: .infinity, idealHeight: dimension)
.background(Color.posSecondaryBackground)
.background(Constants.backgroundColor)
.posItemCardBorderStyles()
}
}
Expand Down
2 changes: 2 additions & 0 deletions WooCommerce/Classes/POS/Presentation/Item Selector/PointOfSaleItemListCardConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Foundation
import SwiftUICore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: 👀 was this a SwiftUI import maybe?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was from an auto-fix action in Xcode, but I agree SwiftUI import is more standard and avoid confusion in the future why it's SwiftUICore here. Updated in 5dd6465


enum PointOfSaleItemListCardConstants {
static let productCardSize: CGFloat = 112
Expand All @@ -11,4 +12,5 @@ enum PointOfSaleItemListCardConstants {
static let itemDetailFont: POSFontStyle = .posLargeDetailRegular
static let accessoryButtonMaxWidth: CGFloat = 136
static let accessoryButtonPadding: CGFloat = 16
static let backgroundColor: Color = .posSurfaceContainerLowest
}
2 changes: 1 addition & 1 deletion WooCommerce/Classes/POS/Presentation/Item Selector/SimpleProductCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct SimpleProductCardView: View {
Spacer()
}
.frame(maxWidth: .infinity, idealHeight: dimension)
.background(Color.posSecondaryBackground)
.background(Constants.backgroundColor)
.posItemCardBorderStyles()
}
}
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/Classes/POS/Presentation/Item Selector/VariationCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct VariationCardView: View {
Spacer()
}
.frame(maxWidth: .infinity, idealHeight: dimension)
.background(Color.posSecondaryBackground)
.background(Constants.backgroundColor)
.posItemCardBorderStyles()
}
}
Expand Down