Skip to content

Commit e4043b5

Browse files
kailuokailuo
authored
Merge pull request #8 from v2ex/settings-dark-mode
Initial support for themes
2 parents 76ec15d + 553e705 commit e4043b5

File tree

19 files changed

+375
-81
lines changed

19 files changed

+375
-81
lines changed

‎.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*.swift]
7+
indent_style = space
8+
indent_size = 4
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true

‎Launcher.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -667,15 +667,14 @@
667667
CODE_SIGN_IDENTITY = "Developer ID Application";
668668
CODE_SIGN_STYLE = Manual;
669669
COMBINE_HIDPI_IMAGES = YES;
670-
CURRENT_PROJECT_VERSION = 102;
670+
CURRENT_PROJECT_VERSION = 104;
671671
DEVELOPMENT_ASSET_PATHS = "\"Launcher/Preview Content\"";
672672
DEVELOPMENT_TEAM = 3SCMMGZXY8;
673673
ENABLE_HARDENED_RUNTIME = YES;
674674
ENABLE_PREVIEWS = YES;
675675
FRAMEWORK_SEARCH_PATHS = (
676676
"$(inherited)",
677677
"$(PROJECT_DIR)",
678-
"$(PROJECT_DIR)/Frameworks",
679678
);
680679
GENERATE_INFOPLIST_FILE = YES;
681680
INFOPLIST_FILE = Info.plist;
@@ -686,7 +685,7 @@
686685
"@executable_path/../Frameworks",
687686
);
688687
MACOSX_DEPLOYMENT_TARGET = 11.3;
689-
MARKETING_VERSION = 1.0.1;
688+
MARKETING_VERSION = 1.0.2;
690689
OTHER_CODE_SIGN_FLAGS = "";
691690
PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher;
692691
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -705,15 +704,14 @@
705704
CODE_SIGN_IDENTITY = "Developer ID Application";
706705
CODE_SIGN_STYLE = Manual;
707706
COMBINE_HIDPI_IMAGES = YES;
708-
CURRENT_PROJECT_VERSION = 102;
707+
CURRENT_PROJECT_VERSION = 104;
709708
DEVELOPMENT_ASSET_PATHS = "\"Launcher/Preview Content\"";
710709
DEVELOPMENT_TEAM = 3SCMMGZXY8;
711710
ENABLE_HARDENED_RUNTIME = YES;
712711
ENABLE_PREVIEWS = YES;
713712
FRAMEWORK_SEARCH_PATHS = (
714713
"$(inherited)",
715714
"$(PROJECT_DIR)",
716-
"$(PROJECT_DIR)/Frameworks",
717715
);
718716
GENERATE_INFOPLIST_FILE = YES;
719717
INFOPLIST_FILE = Info.plist;
@@ -724,7 +722,7 @@
724722
"@executable_path/../Frameworks",
725723
);
726724
MACOSX_DEPLOYMENT_TARGET = 11.3;
727-
MARKETING_VERSION = 1.0.1;
725+
MARKETING_VERSION = 1.0.2;
728726
OTHER_CODE_SIGN_FLAGS = "";
729727
PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher;
730728
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -743,7 +741,7 @@
743741
CODE_SIGN_IDENTITY = "Developer ID Application";
744742
CODE_SIGN_STYLE = Manual;
745743
COMBINE_HIDPI_IMAGES = YES;
746-
CURRENT_PROJECT_VERSION = 102;
744+
CURRENT_PROJECT_VERSION = 104;
747745
DEVELOPMENT_TEAM = 3SCMMGZXY8;
748746
ENABLE_HARDENED_RUNTIME = YES;
749747
GENERATE_INFOPLIST_FILE = YES;
@@ -757,7 +755,7 @@
757755
"@executable_path/../Frameworks",
758756
);
759757
MACOSX_DEPLOYMENT_TARGET = 11.3;
760-
MARKETING_VERSION = 1.0.1;
758+
MARKETING_VERSION = 1.0.2;
761759
PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher.helper;
762760
PRODUCT_NAME = "$(TARGET_NAME)";
763761
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -776,7 +774,7 @@
776774
CODE_SIGN_IDENTITY = "Developer ID Application";
777775
CODE_SIGN_STYLE = Manual;
778776
COMBINE_HIDPI_IMAGES = YES;
779-
CURRENT_PROJECT_VERSION = 102;
777+
CURRENT_PROJECT_VERSION = 104;
780778
DEVELOPMENT_TEAM = 3SCMMGZXY8;
781779
ENABLE_HARDENED_RUNTIME = YES;
782780
GENERATE_INFOPLIST_FILE = YES;
@@ -790,7 +788,7 @@
790788
"@executable_path/../Frameworks",
791789
);
792790
MACOSX_DEPLOYMENT_TARGET = 11.3;
793-
MARKETING_VERSION = 1.0.1;
791+
MARKETING_VERSION = 1.0.2;
794792
PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher.helper;
795793
PRODUCT_NAME = "$(TARGET_NAME)";
796794
PROVISIONING_PROFILE_SPECIFIER = "";

‎Launcher/Assets.xcassets/ConsoleOutputsBackground.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "display-p3",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0.208",
9-
"green" : "0.165",
10-
"red" : "0.051"
8+
"blue" : "0x35",
9+
"green" : "0x2A",
10+
"red" : "0x0D"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "display-p3",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0.902",
27-
"green" : "0.965",
28-
"red" : "0.988"
26+
"blue" : "0xE6",
27+
"green" : "0xF6",
28+
"red" : "0xFB"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ConsoleOutputsBackgroundIndexed.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "display-p3",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0.255",
9-
"green" : "0.208",
10-
"red" : "0.086"
8+
"blue" : "0x41",
9+
"green" : "0x35",
10+
"red" : "0x15"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "display-p3",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0.843",
27-
"green" : "0.910",
28-
"red" : "0.925"
26+
"blue" : "0xD6",
27+
"green" : "0xE8",
28+
"red" : "0xEB"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ConsoleOutputsForeground.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "display-p3",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0.675",
9-
"green" : "0.671",
10-
"red" : "0.620"
8+
"blue" : "0xAC",
9+
"green" : "0xAB",
10+
"red" : "0x9E"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "display-p3",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0.455",
27-
"green" : "0.427",
28-
"red" : "0.361"
26+
"blue" : "0x74",
27+
"green" : "0x6C",
28+
"red" : "0x5C"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ConsoleOutputsForegroundIndexed.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "display-p3",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0.698",
9-
"green" : "0.706",
10-
"red" : "0.667"
8+
"blue" : "0xB1",
9+
"green" : "0xB4",
10+
"red" : "0xAA"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "display-p3",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0.451",
27-
"green" : "0.427",
28-
"red" : "0.357"
26+
"blue" : "0x73",
27+
"green" : "0x6C",
28+
"red" : "0x5B"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ProjectSidebarBackground.colorset/Contents.json renamed to ‎Launcher/Assets.xcassets/DeviceTheme/ConsoleBackground.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "1.000",
9-
"green" : "1.000",
10-
"red" : "1.000"
8+
"blue" : "0xE6",
9+
"green" : "0xF6",
10+
"red" : "0xFB"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "1.000",
27-
"green" : "1.000",
28-
"red" : "1.000"
26+
"blue" : "0x35",
27+
"green" : "0x2A",
28+
"red" : "0x0D"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ProjectSidebarForeground.colorset/Contents.json renamed to ‎Launcher/Assets.xcassets/DeviceTheme/ConsoleBackgroundAlternate.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "1.000",
9-
"green" : "1.000",
10-
"red" : "1.000"
8+
"blue" : "0xD6",
9+
"green" : "0xE8",
10+
"red" : "0xEB"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "1.000",
27-
"green" : "1.000",
28-
"red" : "1.000"
26+
"blue" : "0x41",
27+
"green" : "0x35",
28+
"red" : "0x15"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/ProjectSidebarForegroundAlternative.colorset/Contents.json renamed to ‎Launcher/Assets.xcassets/DeviceTheme/ConsoleForeground.colorset/Contents.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "1.000",
9-
"green" : "1.000",
10-
"red" : "1.000"
8+
"blue" : "0x74",
9+
"green" : "0x6C",
10+
"red" : "0x5C"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "1.000",
27-
"green" : "1.000",
28-
"red" : "1.000"
26+
"blue" : "0xAC",
27+
"green" : "0xAB",
28+
"red" : "0x9E"
2929
}
3030
},
3131
"idiom" : "universal"

‎Launcher/Assets.xcassets/DeviceTheme/ConsoleForegroundAlternate.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" : "0x73",
9+
"green" : "0x6C",
10+
"red" : "0x5B"
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" : "0xB1",
27+
"green" : "0xB4",
28+
"red" : "0xAA"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎Launcher/Assets.xcassets/DeviceTheme/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎Launcher/Assets.xcassets/ReverseDeviceTheme/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎Launcher/Assets.xcassets/ReverseDeviceTheme/ReverseConsoleBackground.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" : "0x35",
9+
"green" : "0x2A",
10+
"red" : "0x0D"
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" : "0xE6",
27+
"green" : "0xF6",
28+
"red" : "0xFB"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

0 commit comments

Comments
 (0)