Skip to content

Commit 919de50

Browse files
lukepistrollukepistrol
authored
Merge pull request #974 from lukepistrol/feat/solarized-default-themes
[feat] Default Themes: Solarized (dark/light)
2 parents 6da1e0e + 9ab0411 commit 919de50

File tree

4 files changed

+261
-1
lines changed

4 files changed

+261
-1
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
28A51006281701B40087B0CC /* codeedit-github-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 28A51004281701B40087B0CC /* codeedit-github-dark.json */; };
6464
28B0A19827E385C300B73177 /* NavigatorSidebarToolbarTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28B0A19727E385C300B73177 /* NavigatorSidebarToolbarTop.swift */; };
6565
28B8F884280FFE4600596236 /* NSTableView+Background.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28B8F883280FFE4600596236 /* NSTableView+Background.swift */; };
66+
28F43DE029738792008BBA45 /* codeedit-solarized-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */; };
67+
28F43DE2297388C5008BBA45 /* codeedit-solarized-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */; };
6668
28FFE1BF27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28FFE1BE27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift */; };
6769
2B7A583527E4BA0100D25D4E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468438427DC76E200F8E88E /* AppDelegate.swift */; };
6870
2B7AC06B282452FB0082A5B8 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B7AC06A282452FB0082A5B8 /* Media.xcassets */; };
@@ -439,6 +441,8 @@
439441
28A51004281701B40087B0CC /* codeedit-github-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-github-dark.json"; sourceTree = "<group>"; };
440442
28B0A19727E385C300B73177 /* NavigatorSidebarToolbarTop.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarTop.swift; sourceTree = "<group>"; tabWidth = 4; };
441443
28B8F883280FFE4600596236 /* NSTableView+Background.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTableView+Background.swift"; sourceTree = "<group>"; };
444+
28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-dark.json"; sourceTree = "<group>"; tabWidth = 2; };
445+
28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-light.json"; sourceTree = "<group>"; tabWidth = 2; };
442446
28FFE1BE27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarBottom.swift; sourceTree = "<group>"; tabWidth = 4; };
443447
2B15CA0028254139004E8F22 /* OpenWithCodeEdit.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = OpenWithCodeEdit.entitlements; sourceTree = "<group>"; };
444448
2B7AC06A282452FB0082A5B8 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
@@ -880,6 +884,8 @@
880884
28069DA527F5BD320016BC47 /* DefaultThemes */ = {
881885
isa = PBXGroup;
882886
children = (
887+
28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */,
888+
28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */,
883889
28A50FFF281673530087B0CC /* codeedit-xcode-dark.json */,
884890
28A51000281673530087B0CC /* codeedit-xcode-light.json */,
885891
28A51004281701B40087B0CC /* codeedit-github-dark.json */,
@@ -2414,10 +2420,12 @@
24142420
283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */,
24152421
B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */,
24162422
28A51006281701B40087B0CC /* codeedit-github-dark.json in Resources */,
2423+
28F43DE029738792008BBA45 /* codeedit-solarized-dark.json in Resources */,
24172424
58A5DFA529339F6400D1BD5D /* default_keybindings.json in Resources */,
24182425
28A51002281673530087B0CC /* codeedit-xcode-light.json in Resources */,
24192426
28A51005281701B40087B0CC /* codeedit-github-light.json in Resources */,
24202427
D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */,
2428+
28F43DE2297388C5008BBA45 /* codeedit-solarized-light.json in Resources */,
24212429
28A51001281673530087B0CC /* codeedit-xcode-dark.json in Resources */,
24222430
B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */,
24232431
474397C52893AC4B00518C8C /* codeedit-midnight.json in Resources */,

‎CodeEdit/DefaultThemes/codeedit-solarized-dark.json‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"author": "CodeEdit",
3+
"description": "Solarized dark theme.",
4+
"displayName": "Solarized Dark",
5+
"distributionURL": "https://github.com/CodeEditApp/CodeEdit",
6+
"editor": {
7+
"attributes": {
8+
"color": "#6C71C4"
9+
},
10+
"background": {
11+
"color": "#002B36"
12+
},
13+
"characters": {
14+
"color": "#DC322F"
15+
},
16+
"commands": {
17+
"color": "#CB4B16"
18+
},
19+
"comments": {
20+
"color": "#586E75"
21+
},
22+
"insertionPoint": {
23+
"color": "#839496"
24+
},
25+
"invisibles": {
26+
"color": "#073642"
27+
},
28+
"keywords": {
29+
"color": "#859900"
30+
},
31+
"lineHighlight": {
32+
"color": "#073642"
33+
},
34+
"numbers": {
35+
"color": "#DC322F"
36+
},
37+
"selection": {
38+
"color": "#586E75"
39+
},
40+
"strings": {
41+
"color": "#2AA198"
42+
},
43+
"text": {
44+
"color": "#839496"
45+
},
46+
"types": {
47+
"color": "#268BD2"
48+
},
49+
"values": {
50+
"color": "#D33682"
51+
},
52+
"variables": {
53+
"color": "#B58900"
54+
}
55+
},
56+
"license": "MIT",
57+
"name": "codeedit-solarized-dark",
58+
"terminal": {
59+
"background": {
60+
"color": "#002B36"
61+
},
62+
"black": {
63+
"color": "#073642"
64+
},
65+
"blue": {
66+
"color": "#268BD2"
67+
},
68+
"boldText": {
69+
"color": "#839496"
70+
},
71+
"brightBlack": {
72+
"color": "#002B36"
73+
},
74+
"brightBlue": {
75+
"color": "#839496"
76+
},
77+
"brightCyan": {
78+
"color": "#93A1A1"
79+
},
80+
"brightGreen": {
81+
"color": "#586E75"
82+
},
83+
"brightMagenta": {
84+
"color": "#6C71C4"
85+
},
86+
"brightRed": {
87+
"color": "#CB4B16"
88+
},
89+
"brightWhite": {
90+
"color": "#FDF6E3"
91+
},
92+
"brightYellow": {
93+
"color": "#657B83"
94+
},
95+
"cursor": {
96+
"color": "#839496"
97+
},
98+
"cyan": {
99+
"color": "#2AA198"
100+
},
101+
"green": {
102+
"color": "#859900"
103+
},
104+
"magenta": {
105+
"color": "#D33682"
106+
},
107+
"red": {
108+
"color": "#DC322F"
109+
},
110+
"selection": {
111+
"color": "#073642"
112+
},
113+
"text": {
114+
"color": "#839496"
115+
},
116+
"white": {
117+
"color": "#EEE8D5"
118+
},
119+
"yellow": {
120+
"color": "#B58900"
121+
}
122+
},
123+
"type": "dark",
124+
"version": "0.0.1"
125+
}

‎CodeEdit/DefaultThemes/codeedit-solarized-light.json‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"author": "CodeEdit",
3+
"description": "Solarized light theme.",
4+
"displayName": "Solarized Light",
5+
"distributionURL": "https://github.com/CodeEditApp/CodeEdit",
6+
"editor": {
7+
"attributes": {
8+
"color": "#6C71C4"
9+
},
10+
"background": {
11+
"color": "#FDF6E3"
12+
},
13+
"characters": {
14+
"color": "#DC322F"
15+
},
16+
"commands": {
17+
"color": "#CB4B16"
18+
},
19+
"comments": {
20+
"color": "#93A1A1"
21+
},
22+
"insertionPoint": {
23+
"color": "#657B83"
24+
},
25+
"invisibles": {
26+
"color": "#EEE8D5"
27+
},
28+
"keywords": {
29+
"color": "#859900"
30+
},
31+
"lineHighlight": {
32+
"color": "#EEE8D5"
33+
},
34+
"numbers": {
35+
"color": "#DC322F"
36+
},
37+
"selection": {
38+
"color": "#93A1A1"
39+
},
40+
"strings": {
41+
"color": "#2AA198"
42+
},
43+
"text": {
44+
"color": "#657B83"
45+
},
46+
"types": {
47+
"color": "#268BD2"
48+
},
49+
"values": {
50+
"color": "#D33682"
51+
},
52+
"variables": {
53+
"color": "#B58900"
54+
}
55+
},
56+
"license": "MIT",
57+
"name": "codeedit-solarized-light",
58+
"terminal": {
59+
"background": {
60+
"color": "#FDF6E3"
61+
},
62+
"black": {
63+
"color": "#073642"
64+
},
65+
"blue": {
66+
"color": "#268BD2"
67+
},
68+
"boldText": {
69+
"color": "#586E75"
70+
},
71+
"brightBlack": {
72+
"color": "#002B36"
73+
},
74+
"brightBlue": {
75+
"color": "#839496"
76+
},
77+
"brightCyan": {
78+
"color": "#93A1A1"
79+
},
80+
"brightGreen": {
81+
"color": "#586E75"
82+
},
83+
"brightMagenta": {
84+
"color": "#6C71C4"
85+
},
86+
"brightRed": {
87+
"color": "#CB4B16"
88+
},
89+
"brightWhite": {
90+
"color": "#FDF6E3"
91+
},
92+
"brightYellow": {
93+
"color": "#657B83"
94+
},
95+
"cursor": {
96+
"color": "#657B83"
97+
},
98+
"cyan": {
99+
"color": "#2AA198"
100+
},
101+
"green": {
102+
"color": "#859900"
103+
},
104+
"magenta": {
105+
"color": "#D33682"
106+
},
107+
"red": {
108+
"color": "#DC322F"
109+
},
110+
"selection": {
111+
"color": "#EEE8D5"
112+
},
113+
"text": {
114+
"color": "#657B83"
115+
},
116+
"white": {
117+
"color": "#EEE8D5"
118+
},
119+
"yellow": {
120+
"color": "#B58900"
121+
}
122+
},
123+
"type": "light",
124+
"version": "0.0.1"
125+
}

‎CodeEdit/Features/AppPreferences/Sections/ThemePreferences/Model/ThemeModel.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ final class ThemeModel: ObservableObject {
214214
"codeedit-xcode-light",
215215
"codeedit-github-dark",
216216
"codeedit-github-light",
217-
"codeedit-midnight"
217+
"codeedit-midnight",
218+
"codeedit-solarized-dark",
219+
"codeedit-solarized-light"
218220
]
219221
for themeName in bundledThemeNames {
220222
guard let defaultUrl = Bundle.main.url(forResource: themeName, withExtension: "json") else {

0 commit comments

Comments
 (0)