Skip to content

Commit c3c6d36

Browse files
EcarrionEcarrion
authored
Merge pull request #7582 from woocommerce/issue/move-asset-catalog
Move ColorPalette to WooFoundation
2 parents cbef1af + 7532164 commit c3c6d36

File tree

138 files changed

+31
-19
lines changed

Some content is hidden

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

138 files changed

+31
-19
lines changed

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,8 +1514,6 @@
15141514
D82DFB4C225F303200EFE2CB /* EmptyListMessageWithActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D82DFB4B225F303200EFE2CB /* EmptyListMessageWithActionTests.swift */; };
15151515
D831E2DC230E0558000037D0 /* Authentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = D831E2DB230E0558000037D0 /* Authentication.swift */; };
15161516
D831E2E0230E0BA7000037D0 /* Logs.swift in Sources */ = {isa = PBXBuildFile; fileRef = D831E2DF230E0BA7000037D0 /* Logs.swift */; };
1517-
D83A6A782379097A00419D48 /* MurielColorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83A6A772379097A00419D48 /* MurielColorTests.swift */; };
1518-
D83A6A7A23792B2400419D48 /* UIColor+Muriel-Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83A6A7923792B2400419D48 /* UIColor+Muriel-Tests.swift */; };
15191517
D83C129F22250BF0004CA04C /* OrderTrackingTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D83C129D22250BEF004CA04C /* OrderTrackingTableViewCell.xib */; };
15201518
D83C12A022250BF0004CA04C /* OrderTrackingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83C129E22250BEF004CA04C /* OrderTrackingTableViewCell.swift */; };
15211519
D83F5930225B269C00626E75 /* DatePickerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83F592E225B269C00626E75 /* DatePickerTableViewCell.swift */; };
@@ -1579,7 +1577,6 @@
15791577
D88D5A3D230B5E85007B6E01 /* ServiceLocatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88D5A3C230B5E85007B6E01 /* ServiceLocatorTests.swift */; };
15801578
D88FDB4525DD223B00CB0DBD /* Hardware.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D88FDB4425DD223B00CB0DBD /* Hardware.framework */; };
15811579
D88FDB4625DD223B00CB0DBD /* Hardware.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D88FDB4425DD223B00CB0DBD /* Hardware.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1582-
D8915DBF23729CFB00F63762 /* ColorPalette.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8915DBE23729CFB00F63762 /* ColorPalette.xcassets */; };
15831580
D89C004725B467C7000E4683 /* ULAccountMismatchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D89C004625B467C7000E4683 /* ULAccountMismatchViewModel.swift */; };
15841581
D89C009425B4E9E2000E4683 /* ULAccountMismatchViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D89C009325B4E9E2000E4683 /* ULAccountMismatchViewControllerTests.swift */; };
15851582
D89C009A25B4EEA4000E4683 /* WrongAccountErrorViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D89C009925B4EEA4000E4683 /* WrongAccountErrorViewModelTests.swift */; };
@@ -3371,8 +3368,6 @@
33713368
D82DFB4B225F303200EFE2CB /* EmptyListMessageWithActionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = EmptyListMessageWithActionTests.swift; path = WooCommerceTests/ViewRelated/EmptyListMessageWithActionTests.swift; sourceTree = SOURCE_ROOT; };
33723369
D831E2DB230E0558000037D0 /* Authentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Authentication.swift; sourceTree = "<group>"; };
33733370
D831E2DF230E0BA7000037D0 /* Logs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logs.swift; sourceTree = "<group>"; };
3374-
D83A6A772379097A00419D48 /* MurielColorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MurielColorTests.swift; path = WooCommerceTests/ViewRelated/MurielColorTests.swift; sourceTree = SOURCE_ROOT; };
3375-
D83A6A7923792B2400419D48 /* UIColor+Muriel-Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIColor+Muriel-Tests.swift"; path = "WooCommerceTests/ViewRelated/UIColor+Muriel-Tests.swift"; sourceTree = SOURCE_ROOT; };
33763371
D83C129D22250BEF004CA04C /* OrderTrackingTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderTrackingTableViewCell.xib; sourceTree = "<group>"; };
33773372
D83C129E22250BEF004CA04C /* OrderTrackingTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderTrackingTableViewCell.swift; sourceTree = "<group>"; };
33783373
D83F592E225B269C00626E75 /* DatePickerTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerTableViewCell.swift; sourceTree = "<group>"; };
@@ -3434,7 +3429,6 @@
34343429
D88CA757237D1C27005D2F44 /* Ghost+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Ghost+Woo.swift"; sourceTree = "<group>"; };
34353430
D88D5A3C230B5E85007B6E01 /* ServiceLocatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceLocatorTests.swift; sourceTree = "<group>"; };
34363431
D88FDB4425DD223B00CB0DBD /* Hardware.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Hardware.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3437-
D8915DBE23729CFB00F63762 /* ColorPalette.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ColorPalette.xcassets; sourceTree = "<group>"; };
34383432
D89C004625B467C7000E4683 /* ULAccountMismatchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ULAccountMismatchViewModel.swift; sourceTree = "<group>"; };
34393433
D89C009325B4E9E2000E4683 /* ULAccountMismatchViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ULAccountMismatchViewControllerTests.swift; sourceTree = "<group>"; };
34403434
D89C009925B4EEA4000E4683 /* WrongAccountErrorViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrongAccountErrorViewModelTests.swift; sourceTree = "<group>"; };
@@ -6373,7 +6367,6 @@
63736367
D8AB131D225DC25F002BB5D1 /* MockOrders.swift */,
63746368
2667BFDA252E659A008099D4 /* MockOrderItem.swift */,
63756369
262A2C2A2537A3330086C1BE /* MockRefunds.swift */,
6376-
D83A6A772379097A00419D48 /* MurielColorTests.swift */,
63776370
D8736B5022EB69E300A14A29 /* OrderDetailsViewModelTests.swift */,
63786371
D8C11A5F22E2479800D4A88D /* OrderPaymentDetailsViewModelTests.swift */,
63796372
45B9C64423A945C0007FC4C5 /* PriceInputFormatterTests.swift */,
@@ -6386,7 +6379,6 @@
63866379
4569D3C825DC065B00CDC3E2 /* SiteAddressTests.swift */,
63876380
B517EA19218B2D2600730EC4 /* StringFormatterTests.swift */,
63886381
B56BBD15214820A70053A32D /* SyncCoordinatorTests.swift */,
6389-
D83A6A7923792B2400419D48 /* UIColor+Muriel-Tests.swift */,
63906382
CE50345621B1F26C007573C6 /* ZendeskManagerTests.swift */,
63916383
0277AEA4256CAA4200F45C4A /* MockShippingLabel.swift */,
63926384
DE26B5282775C76B00A2EA0A /* MockSyncingCoordinator.swift */,
@@ -6644,7 +6636,6 @@
66446636
03180BE52763AA8F00B938A8 /* Woo-Release-macOS.entitlements */,
66456637
24C579D124F476300076E1B4 /* Woo-Alpha.entitlements */,
66466638
03180BE62763AA8F00B938A8 /* Woo-Alpha-macOS.entitlements */,
6647-
D8915DBE23729CFB00F63762 /* ColorPalette.xcassets */,
66486639
);
66496640
path = Resources;
66506641
sourceTree = "<group>";
@@ -8812,7 +8803,6 @@
88128803
CEE006062077D1280079161F /* SummaryTableViewCell.xib in Resources */,
88138804
CE8CCD44239AC06E009DBD22 /* RefundDetailsViewController.xib in Resources */,
88148805
4567389E2745497C00743054 /* OrderStatusFilterViewController.xib in Resources */,
8815-
D8915DBF23729CFB00F63762 /* ColorPalette.xcassets in Resources */,
88168806
CE24BCD0212DE8A6001CD12E /* HeadlineLabelTableViewCell.xib in Resources */,
88178807
B559EBB020A0BF8F00836CD4 /* LICENSE in Resources */,
88188808
CCCC29DD25E5757C0046B96F /* RenameAttributesViewController.xib in Resources */,
@@ -10229,7 +10219,6 @@
1022910219
0225C42824768A4C00C5B4F0 /* FilterProductListViewModelTests.swift in Sources */,
1023010220
D85136C9231E12B600DD0539 /* ReviewViewModelTests.swift in Sources */,
1023110221
57C5FF7C25091DE50074EC26 /* OrderListSyncActionUseCaseTests.swift in Sources */,
10232-
D83A6A782379097A00419D48 /* MurielColorTests.swift in Sources */,
1023310222
020BE77723B4A9D9007FE54C /* AztecLinkFormatBarCommandTests.swift in Sources */,
1023410223
020BE77323B4A567007FE54C /* AztecInsertMoreFormatBarCommandTests.swift in Sources */,
1023510224
B57C5C9E21B80E8300FF82B2 /* SessionManager+Internal.swift in Sources */,
@@ -10513,7 +10502,6 @@
1051310502
AEA622B727468790002A9B57 /* AddOrderCoordinatorTests.swift in Sources */,
1051410503
D802549126552FE1001B2CC1 /* CardPresentModalScanningForReaderTests.swift in Sources */,
1051510504
A655725D258B91AE008AE7CA /* OrderListCellViewModelTests.swift in Sources */,
10516-
D83A6A7A23792B2400419D48 /* UIColor+Muriel-Tests.swift in Sources */,
1051710505
022C658C2863BBAC00EC35A9 /* ProductFormViewController+ProductImageUploaderTests.swift in Sources */,
1051810506
093B265927DF15100026F92D /* BulkUpdatePriceViewControllerTests.swift in Sources */,
1051910507
2614EB1C24EB611200968D4B /* TopBannerViewTests.swift in Sources */,

‎WooFoundation/WooFoundation.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
265C99D828B93F04005E6117 /* ColorPalette.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 265C99D728B93F04005E6117 /* ColorPalette.xcassets */; };
11+
265C99DD28B941D5005E6117 /* UIColor+Muriel-Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 265C99DC28B941D5005E6117 /* UIColor+Muriel-Tests.swift */; };
12+
265C99DF28B94271005E6117 /* MurielColorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 265C99DE28B94271005E6117 /* MurielColorTests.swift */; };
1013
26AF1F5328B8362800937BA9 /* UIColor+SemanticColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AF1F4F28B8362800937BA9 /* UIColor+SemanticColors.swift */; };
1114
26AF1F5428B8362800937BA9 /* ColorStudio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AF1F5028B8362800937BA9 /* ColorStudio.swift */; };
1215
26AF1F5528B8362800937BA9 /* UIColor+ColorStudio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AF1F5128B8362800937BA9 /* UIColor+ColorStudio.swift */; };
@@ -40,6 +43,9 @@
4043
/* End PBXContainerItemProxy section */
4144

4245
/* Begin PBXFileReference section */
46+
265C99D728B93F04005E6117 /* ColorPalette.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ColorPalette.xcassets; sourceTree = "<group>"; };
47+
265C99DC28B941D5005E6117 /* UIColor+Muriel-Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Muriel-Tests.swift"; sourceTree = "<group>"; };
48+
265C99DE28B94271005E6117 /* MurielColorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MurielColorTests.swift; sourceTree = "<group>"; };
4349
26AF1F4F28B8362800937BA9 /* UIColor+SemanticColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+SemanticColors.swift"; sourceTree = "<group>"; };
4450
26AF1F5028B8362800937BA9 /* ColorStudio.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorStudio.swift; sourceTree = "<group>"; };
4551
26AF1F5128B8362800937BA9 /* UIColor+ColorStudio.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+ColorStudio.swift"; sourceTree = "<group>"; };
@@ -93,13 +99,24 @@
9399
/* End PBXFrameworksBuildPhase section */
94100

95101
/* Begin PBXGroup section */
102+
265C99DB28B941D5005E6117 /* Colors */ = {
103+
isa = PBXGroup;
104+
children = (
105+
265C99DE28B94271005E6117 /* MurielColorTests.swift */,
106+
265C99DC28B941D5005E6117 /* UIColor+Muriel-Tests.swift */,
107+
);
108+
name = Colors;
109+
path = WooFoundationTests/Colors;
110+
sourceTree = SOURCE_ROOT;
111+
};
96112
26AF1F4E28B8362800937BA9 /* Colors */ = {
97113
isa = PBXGroup;
98114
children = (
99115
26AF1F4F28B8362800937BA9 /* UIColor+SemanticColors.swift */,
100116
26AF1F5028B8362800937BA9 /* ColorStudio.swift */,
101117
26AF1F5128B8362800937BA9 /* UIColor+ColorStudio.swift */,
102118
26AF1F5228B8362800937BA9 /* UIColor+SystemColors.swift */,
119+
265C99D728B93F04005E6117 /* ColorPalette.xcassets */,
103120
);
104121
path = Colors;
105122
sourceTree = "<group>";
@@ -124,6 +141,7 @@
124141
686BE913288EE2BC00967C86 /* Utilities */ = {
125142
isa = PBXGroup;
126143
children = (
144+
265C99DB28B941D5005E6117 /* Colors */,
127145
686BE914288EE2CA00967C86 /* TypedPredicateTests.swift */,
128146
);
129147
path = Utilities;
@@ -337,6 +355,7 @@
337355
isa = PBXResourcesBuildPhase;
338356
buildActionMask = 2147483647;
339357
files = (
358+
265C99D828B93F04005E6117 /* ColorPalette.xcassets in Resources */,
340359
);
341360
runOnlyForDeploymentPostprocessing = 0;
342361
};
@@ -442,6 +461,8 @@
442461
buildActionMask = 2147483647;
443462
files = (
444463
686BE915288EE2CA00967C86 /* TypedPredicateTests.swift in Sources */,
464+
265C99DF28B94271005E6117 /* MurielColorTests.swift in Sources */,
465+
265C99DD28B941D5005E6117 /* UIColor+Muriel-Tests.swift in Sources */,
445466
);
446467
runOnlyForDeploymentPostprocessing = 0;
447468
};

WooCommerce/Resources/ColorPalette.xcassets/Blue0.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue0.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue10.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue10.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue100.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue100.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue20.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue20.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue30.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue30.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue40.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue40.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue5.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue5.colorset/Contents.json

File renamed without changes.

WooCommerce/Resources/ColorPalette.xcassets/Blue50.colorset/Contents.json renamed to WooFoundation/WooFoundation/Colors/ColorPalette.xcassets/Blue50.colorset/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)