Skip to content

Commit 877d6b1

Browse files
committed
Add POS prefix to color names in catalog to avoid conflicts with other future color palettes in the main bundle. Update color code.
1 parent e328a31 commit 877d6b1

File tree

32 files changed

+31
-31
lines changed

32 files changed

+31
-31
lines changed

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,53 @@ import SwiftUI
22

33
extension Color {
44
// MARK: - Primary Colors
5-
static var posPrimary: Color { Color("primary") }
6-
static var posOnPrimary: Color { Color("onPrimary") }
7-
static var posPrimaryContainer: Color { Color("primaryContainer") }
8-
static var posOnPrimaryContainer: Color { Color("onPrimaryContainer") }
5+
static var posPrimary: Color { Color(.posPrimary) }
6+
static var posOnPrimary: Color { Color(.posOnPrimary) }
7+
static var posPrimaryContainer: Color { Color(.posPrimaryContainer) }
8+
static var posOnPrimaryContainer: Color { Color(.posOnPrimaryContainer) }
99

1010
// MARK: - Secondary Container Colors
11-
static var posSecondaryContainer: Color { Color("secondaryContainer") }
12-
static var posOnSecondaryContainer: Color { Color("onSecondaryContainer") }
11+
static var posSecondaryContainer: Color { Color(.posSecondaryContainer) }
12+
static var posOnSecondaryContainer: Color { Color(.posOnSecondaryContainer) }
1313

1414
// MARK: - Disabled Container Colors
15-
static var posDisabledContainer: Color { Color("disabledContainer") }
16-
static var posOnDisabledContainer: Color { Color("onDisabledContainer") }
15+
static var posDisabledContainer: Color { Color(.posDisabledContainer) }
16+
static var posOnDisabledContainer: Color { Color(.posOnDisabledContainer) }
1717

1818
// MARK: - Surface Colors
19-
static var posSurface: Color { Color("surface") }
20-
static var posOnSurface: Color { Color("onSurface") }
21-
static var posSurfaceDim: Color { Color("surfaceDim") }
22-
static var posSurfaceBright: Color { Color("surfaceBright") }
23-
static var posSurfaceContainerLowest: Color { Color("surfaceContainerLowest") }
24-
static var posSurfaceContainerLow: Color { Color("surfaceContainerLow") }
25-
static var posSurfaceContainerHighest: Color { Color("surfaceContainerHighest") }
19+
static var posSurface: Color { Color(.posSurface) }
20+
static var posOnSurface: Color { Color(.posOnSurface) }
21+
static var posSurfaceDim: Color { Color(.posSurfaceDim) }
22+
static var posSurfaceBright: Color { Color(.posSurfaceBright) }
23+
static var posSurfaceContainerLowest: Color { Color(.posSurfaceContainerLowest) }
24+
static var posSurfaceContainerLow: Color { Color(.posSurfaceContainerLow) }
25+
static var posSurfaceContainerHighest: Color { Color(.posSurfaceContainerHighest) }
2626

2727
// MARK: - Surface Variant Colors
28-
static var posOnSurfaceVariantLowest: Color { Color("onSurfaceVariantLowest") }
29-
static var posOnSurfaceVariantHighest: Color { Color("onSurfaceVariantHighest") }
28+
static var posOnSurfaceVariantLowest: Color { Color(.posOnSurfaceVariantLowest) }
29+
static var posOnSurfaceVariantHighest: Color { Color(.posOnSurfaceVariantHighest) }
3030

3131
// MARK: - Inverse Surface Colors
32-
static var posInverseSurface: Color { Color("inverseSurface") }
33-
static var posOnInverseSurface: Color { Color("onInverseSurface") }
32+
static var posInverseSurface: Color { Color(.posInverseSurface) }
33+
static var posOnInverseSurface: Color { Color(.posOnInverseSurface) }
3434

3535
// MARK: - Outline Colors
36-
static var posOutline: Color { Color("outline") }
37-
static var posOutlineVariant: Color { Color("outlineVariant") }
36+
static var posOutline: Color { Color(.posOutline) }
37+
static var posOutlineVariant: Color { Color(.posOutlineVariant) }
3838

3939
// MARK: - Status Colors
40-
static var posError: Color { Color("error") }
41-
static var posOnError: Color { Color("onError") }
42-
static var posSuccess: Color { Color("success") }
43-
static var posOnSuccess: Color { Color("onSuccess") }
44-
static var posAlert: Color { Color("alert") }
45-
static var posOnAlert: Color { Color("onAlert") }
40+
static var posError: Color { Color(.posError) }
41+
static var posOnError: Color { Color(.posOnError) }
42+
static var posSuccess: Color { Color(.posSuccess) }
43+
static var posOnSuccess: Color { Color(.posOnSuccess) }
44+
static var posAlert: Color { Color(.posAlert) }
45+
static var posOnAlert: Color { Color(.posOnAlert) }
4646

4747
// MARK: - Text Colors
48-
static var posTextPrimary: Color { Color("textPrimary") }
49-
static var posTextSecondary: Color { Color("textSecondary") }
50-
static var posTextTertiary: Color { Color("textTertiary") }
48+
static var posTextPrimary: Color { Color(.posTextPrimary) }
49+
static var posTextSecondary: Color { Color(.posTextSecondary) }
50+
static var posTextTertiary: Color { Color(.posTextTertiary) }
5151

5252
// MARK: - Other
53-
static var posShadow: Color { Color("shadow") }
53+
static var posShadow: Color { Color(.posShadow) }
5454
}

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/alert.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posAlert.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/disabledContainer.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posDisabledContainer.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/error.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posError.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/inverseSurface.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posInverseSurface.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/onAlert.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnAlert.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/onDisabledContainer.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnDisabledContainer.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/onError.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnError.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/onInverseSurface.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnInverseSurface.colorset/Contents.json

File renamed without changes.

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/onPrimary.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnPrimary.colorset/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)