Skip to content

Commit cc47993

Browse files
crazytonylicrazytonyli
authored
Add app-specific accent colors (#25789)
1 parent 3f1bfb0 commit cc47993

9 files changed

Lines changed: 112 additions & 6 deletions

File tree

‎Sources/Jetpack/Resources/Assets.xcassets/AccentColor.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.0000000000",
8+
"blue" : "0.0313725490",
9+
"green" : "0.6196078431",
10+
"red" : "0.0235294118"
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.0000000000",
26+
"blue" : "0.1215686275",
27+
"green" : "0.7058823529",
28+
"red" : "0.1843137255"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎Sources/WordPress/Resources/Assets.xcassets/AccentColor.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.0000000000",
8+
"blue" : "0.9137254902",
9+
"green" : "0.3450980392",
10+
"red" : "0.2196078431"
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.0000000000",
26+
"blue" : "0.9529411765",
27+
"green" : "0.4352941176",
28+
"red" : "0.3294117647"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,12 @@
517517
0C5A651A2D9B21CE00C25301 /* Reader.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Reader.debug.xcconfig; sourceTree = "<group>"; };
518518
0C5A651B2D9B21CE00C25301 /* Reader.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Reader.release.xcconfig; sourceTree = "<group>"; };
519519
0C96AC202D92FC17000779B8 /* Common.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.release.xcconfig; sourceTree = "<group>"; };
520+
0CACC0012E6F000000000001 /* WordPressApp.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressApp.debug.xcconfig; sourceTree = "<group>"; };
521+
0CACC0012E6F000000000002 /* WordPressApp.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressApp.release.xcconfig; sourceTree = "<group>"; };
522+
0CACC0012E6F000000000003 /* WordPressApp.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressApp.alpha.xcconfig; sourceTree = "<group>"; };
523+
0CACC0012E6F000000000004 /* JetpackApp.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JetpackApp.debug.xcconfig; sourceTree = "<group>"; };
524+
0CACC0012E6F000000000005 /* JetpackApp.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JetpackApp.release.xcconfig; sourceTree = "<group>"; };
525+
0CACC0012E6F000000000006 /* JetpackApp.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JetpackApp.alpha.xcconfig; sourceTree = "<group>"; };
520526
0CED01702D95B897003015CF /* WordPress.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WordPress.framework; sourceTree = BUILT_PRODUCTS_DIR; };
521527
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
522528
1D6058910D05DD3D006BFB54 /* WordPress.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WordPress.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1501,9 +1507,15 @@
15011507
F14B5F70208E648200439554 /* WordPress.debug.xcconfig */,
15021508
F14B5F71208E648200439554 /* WordPress.release.xcconfig */,
15031509
F14B5F73208E648300439554 /* WordPress.alpha.xcconfig */,
1510+
0CACC0012E6F000000000001 /* WordPressApp.debug.xcconfig */,
1511+
0CACC0012E6F000000000002 /* WordPressApp.release.xcconfig */,
1512+
0CACC0012E6F000000000003 /* WordPressApp.alpha.xcconfig */,
15041513
24350E7C264DB76E009BB2B6 /* Jetpack.debug.xcconfig */,
15051514
24351059264DC1E2009BB2B6 /* Jetpack.release.xcconfig */,
15061515
2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */,
1516+
0CACC0012E6F000000000004 /* JetpackApp.debug.xcconfig */,
1517+
0CACC0012E6F000000000005 /* JetpackApp.release.xcconfig */,
1518+
0CACC0012E6F000000000006 /* JetpackApp.alpha.xcconfig */,
15071519
0C5A651A2D9B21CE00C25301 /* Reader.debug.xcconfig */,
15081520
0C5A651B2D9B21CE00C25301 /* Reader.release.xcconfig */,
15091521
0C5A65192D9B21CE00C25301 /* Reader.alpha.xcconfig */,
@@ -3652,7 +3664,7 @@
36523664
};
36533665
1D6058940D05DD3E006BFB54 /* Debug */ = {
36543666
isa = XCBuildConfiguration;
3655-
baseConfigurationReference = F14B5F70208E648200439554 /* WordPress.debug.xcconfig */;
3667+
baseConfigurationReference = 0CACC0012E6F000000000001 /* WordPressApp.debug.xcconfig */;
36563668
buildSettings = {
36573669
APPLICATION_EXTENSION_API_ONLY = NO;
36583670
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
@@ -3708,7 +3720,7 @@
37083720
};
37093721
1D6058950D05DD3E006BFB54 /* Release */ = {
37103722
isa = XCBuildConfiguration;
3711-
baseConfigurationReference = F14B5F71208E648200439554 /* WordPress.release.xcconfig */;
3723+
baseConfigurationReference = 0CACC0012E6F000000000002 /* WordPressApp.release.xcconfig */;
37123724
buildSettings = {
37133725
APPLICATION_EXTENSION_API_ONLY = NO;
37143726
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
@@ -4594,7 +4606,7 @@
45944606
};
45954607
8546B4441BEAD39700193C07 /* Release-Alpha */ = {
45964608
isa = XCBuildConfiguration;
4597-
baseConfigurationReference = F14B5F73208E648300439554 /* WordPress.alpha.xcconfig */;
4609+
baseConfigurationReference = 0CACC0012E6F000000000003 /* WordPressApp.alpha.xcconfig */;
45984610
buildSettings = {
45994611
APPLICATION_EXTENSION_API_ONLY = NO;
46004612
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
@@ -5002,7 +5014,7 @@
50025014
};
50035015
FABB264E2602FC2C00C8785C /* Debug */ = {
50045016
isa = XCBuildConfiguration;
5005-
baseConfigurationReference = 24350E7C264DB76E009BB2B6 /* Jetpack.debug.xcconfig */;
5017+
baseConfigurationReference = 0CACC0012E6F000000000004 /* JetpackApp.debug.xcconfig */;
50065018
buildSettings = {
50075019
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
50085020
CLANG_ENABLE_OBJC_ARC = YES;
@@ -5059,7 +5071,7 @@
50595071
};
50605072
FABB264F2602FC2C00C8785C /* Release */ = {
50615073
isa = XCBuildConfiguration;
5062-
baseConfigurationReference = 24351059264DC1E2009BB2B6 /* Jetpack.release.xcconfig */;
5074+
baseConfigurationReference = 0CACC0012E6F000000000005 /* JetpackApp.release.xcconfig */;
50635075
buildSettings = {
50645076
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
50655077
CLANG_ENABLE_OBJC_ARC = YES;
@@ -5114,7 +5126,7 @@
51145126
};
51155127
FABB26512602FC2C00C8785C /* Release-Alpha */ = {
51165128
isa = XCBuildConfiguration;
5117-
baseConfigurationReference = 2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */;
5129+
baseConfigurationReference = 0CACC0012E6F000000000006 /* JetpackApp.alpha.xcconfig */;
51185130
buildSettings = {
51195131
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy;
51205132
CLANG_ENABLE_OBJC_ARC = YES;

‎config/JetpackApp.alpha.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "Jetpack.alpha.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

‎config/JetpackApp.debug.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "Jetpack.debug.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

‎config/JetpackApp.release.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "Jetpack.release.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

‎config/WordPressApp.alpha.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "WordPress.alpha.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

‎config/WordPressApp.debug.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "WordPress.debug.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

‎config/WordPressApp.release.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "WordPress.release.xcconfig"
2+
3+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor

0 commit comments

Comments
 (0)