Skip to content

Commit

Permalink
Include default theme jsons
Browse files Browse the repository at this point in the history
  • Loading branch information
@bummoblizard
bummoblizard committed Mar 16, 2024
1 parent 3007f4d commit 8299542
Show file tree
Hide file tree
Showing 3 changed files with 700 additions and 21 deletions.
33 changes: 12 additions & 21 deletions CodeApp/Views/SettingsThemeConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,19 @@ struct SettingsThemeConfiguration: View {
@EnvironmentObject var App: MainApp
@EnvironmentObject var themeManager: ThemeManager

static let defaultLightPlusTheme = Theme(
name: "Light+", url: URL(string: "https://thebaselab.com")!, isDark: false,
preview: (
.init(hexString: "#FFFFFF"), .init(hexString: "#2C2C2C"), .init(hexString: "#0D7ACC"),
.init(hexString: "#F3F3F3")
))
static let defaultDarkPlusTheme = Theme(
name: "Dark+", url: URL(string: "https://thebaselab.com")!, isDark: true,
preview: (
.init(hexString: "#1E1E1E"), .init(hexString: "#333333"), .init(hexString: "#0D7ACC"),
.init(hexString: "#252526")
))

var themeSection: some View {
List {
Section("Dark Themes") {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 20) {

ForEach(
[SettingsThemeConfiguration.defaultDarkPlusTheme]
+ themeManager.themes.sorted { $0.name < $1.name }.filter {
$0.isDark
},
themeManager.themes
.filter { $0.name == "Dark+" }
+ themeManager.themes
.filter { $0.isDark }
.filter { $0.name != "Dark+" }
.sorted { $0.name < $1.name },
id: \.id
) { item in
ThemePreview(item: item)
Expand All @@ -51,10 +40,12 @@ struct SettingsThemeConfiguration: View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 20) {
ForEach(
[SettingsThemeConfiguration.defaultLightPlusTheme]
+ themeManager.themes.sorted { $0.name < $1.name }.filter {
!$0.isDark
},
themeManager.themes
.filter { $0.name == "Light+" }
+ themeManager.themes
.filter { !$0.isDark }
.filter { $0.name != "Light+" }
.sorted { $0.name < $1.name },
id: \.id
) { item in
ThemePreview(item: item)
Expand Down
330 changes: 330 additions & 0 deletions Themes/vs-dark-plus-theme.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,330 @@
{
"name": "Dark+",
"type": "dark",
"tokenColors": [
{ "settings": { "foreground": "#D4D4D4", "background": "#1E1E1E" } },
{
"name": "Function declarations",
"scope": [
"entity.name.function",
"support.function",
"support.constant.handlebars",
"source.powershell variable.other.member",
"entity.name.operator.custom-literal"
],
"settings": { "foreground": "#DCDCAA" }
},
{
"name": "Types declaration and references",
"scope": [
"meta.return-type",
"support.class",
"support.type",
"entity.name.type",
"entity.name.namespace",
"entity.other.attribute",
"entity.name.scope-resolution",
"entity.name.class",
"storage.type.numeric.go",
"storage.type.byte.go",
"storage.type.boolean.go",
"storage.type.string.go",
"storage.type.uintptr.go",
"storage.type.error.go",
"storage.type.rune.go",
"storage.type.cs",
"storage.type.generic.cs",
"storage.type.modifier.cs",
"storage.type.variable.cs",
"storage.type.annotation.java",
"storage.type.generic.java",
"storage.type.java",
"storage.type.object.array.java",
"storage.type.primitive.array.java",
"storage.type.primitive.java",
"storage.type.token.java",
"storage.type.groovy",
"storage.type.annotation.groovy",
"storage.type.parameters.groovy",
"storage.type.generic.groovy",
"storage.type.object.array.groovy",
"storage.type.primitive.array.groovy",
"storage.type.primitive.groovy"
],
"settings": { "foreground": "#4EC9B0" }
},
{
"name": "Types declaration and references, TS grammar specific",
"scope": [
"meta.type.cast.expr",
"meta.type.new.expr",
"support.constant.math",
"support.constant.dom",
"support.constant.json",
"entity.other.inherited-class"
],
"settings": { "foreground": "#4EC9B0" }
},
{
"name": "Control flow / Special keywords",
"scope": [
"keyword.control",
"source.cpp keyword.operator.new",
"keyword.operator.delete",
"keyword.other.using",
"keyword.other.operator",
"entity.name.operator"
],
"settings": { "foreground": "#C586C0" }
},
{
"name": "Variable and parameter name",
"scope": [
"variable",
"meta.definition.variable.name",
"support.variable",
"entity.name.variable"
],
"settings": { "foreground": "#9CDCFE" }
},
{
"name": "Constants and enums",
"scope": ["variable.other.constant", "variable.other.enummember"],
"settings": { "foreground": "#51B6C4" }
},
{
"name": "Object keys, TS grammar specific",
"scope": "meta.object-literal.key",
"settings": { "foreground": "#9CDCFE" }
},
{
"name": "CSS property value",
"scope": [
"support.constant.property-value",
"support.constant.font-name",
"support.constant.media-type",
"support.constant.media",
"constant.other.color.rgb-value",
"constant.other.rgb-value",
"support.constant.color"
],
"settings": { "foreground": "#CE9178" }
},
{
"name": "Regular expression groups",
"scope": [
"punctuation.definition.group.regexp",
"punctuation.definition.group.assertion.regexp",
"punctuation.definition.character-class.regexp",
"punctuation.character.set.begin.regexp",
"punctuation.character.set.end.regexp",
"keyword.operator.negation.regexp",
"support.other.parenthesis.regexp"
],
"settings": { "foreground": "#CE9178" }
},
{
"scope": [
"constant.character.character-class.regexp",
"constant.other.character-class.set.regexp",
"constant.other.character-class.regexp",
"constant.character.set.regexp"
],
"settings": { "foreground": "#d16969" }
},
{
"scope": ["keyword.operator.or.regexp", "keyword.control.anchor.regexp"],
"settings": { "foreground": "#DCDCAA" }
},
{
"scope": "keyword.operator.quantifier.regexp",
"settings": { "foreground": "#d7ba7d" }
},
{ "scope": "constant.character", "settings": { "foreground": "#569cd6" } },
{
"scope": "constant.character.escape",
"settings": { "foreground": "#d7ba7d" }
},
{ "scope": "entity.name.label", "settings": { "foreground": "#C8C8C8" } },
{
"scope": ["meta.embedded", "source.groovy.embedded"],
"settings": { "foreground": "#D4D4D4" }
},
{ "scope": "emphasis", "settings": { "fontStyle": "italic" } },
{ "scope": "strong", "settings": { "fontStyle": "bold" } },
{ "scope": "header", "settings": { "foreground": "#000080" } },
{ "scope": "comment", "settings": { "foreground": "#6A9955" } },
{ "scope": "constant.language", "settings": { "foreground": "#569cd6" } },
{
"scope": [
"constant.numeric",
"entity.name.operator.custom-literal.number",
"keyword.operator.plus.exponent",
"keyword.operator.minus.exponent"
],
"settings": { "foreground": "#b5cea8" }
},
{ "scope": "constant.regexp", "settings": { "foreground": "#646695" } },
{ "scope": "entity.name.tag", "settings": { "foreground": "#569cd6" } },
{ "scope": "entity.name.tag.css", "settings": { "foreground": "#d7ba7d" } },
{
"scope": "entity.other.attribute-name",
"settings": { "foreground": "#9cdcfe" }
},
{
"scope": [
"entity.other.attribute-name.class.css",
"entity.other.attribute-name.class.mixin.css",
"entity.other.attribute-name.id.css",
"entity.other.attribute-name.parent-selector.css",
"entity.other.attribute-name.pseudo-class.css",
"entity.other.attribute-name.pseudo-element.css",
"source.css.less entity.other.attribute-name.id",
"entity.other.attribute-name.attribute.scss",
"entity.other.attribute-name.scss"
],
"settings": { "foreground": "#d7ba7d" }
},
{ "scope": "invalid", "settings": { "foreground": "#f44747" } },
{ "scope": "markup.underline", "settings": { "fontStyle": "underline" } },
{
"scope": "markup.bold",
"settings": { "fontStyle": "bold", "foreground": "#569cd6" }
},
{
"scope": "markup.heading",
"settings": { "fontStyle": "bold", "foreground": "#569cd6" }
},
{ "scope": "markup.italic", "settings": { "fontStyle": "italic" } },
{ "scope": "markup.inserted", "settings": { "foreground": "#b5cea8" } },
{ "scope": "markup.deleted", "settings": { "foreground": "#ce9178" } },
{ "scope": "markup.changed", "settings": { "foreground": "#569cd6" } },
{
"scope": "punctuation.definition.quote.begin.markdown",
"settings": { "foreground": "#6A9955" }
},
{
"scope": "punctuation.definition.list.begin.markdown",
"settings": { "foreground": "#6796e6" }
},
{ "scope": "markup.inline.raw", "settings": { "foreground": "#ce9178" } },
{
"name": "brackets of XML/HTML tags",
"scope": "punctuation.definition.tag",
"settings": { "foreground": "#808080" }
},
{
"scope": ["meta.preprocessor", "entity.name.function.preprocessor"],
"settings": { "foreground": "#569cd6" }
},
{
"scope": "meta.preprocessor.string",
"settings": { "foreground": "#ce9178" }
},
{
"scope": "meta.preprocessor.numeric",
"settings": { "foreground": "#b5cea8" }
},
{
"scope": "meta.structure.dictionary.key.python",
"settings": { "foreground": "#9cdcfe" }
},
{ "scope": "meta.diff.header", "settings": { "foreground": "#569cd6" } },
{ "scope": "storage", "settings": { "foreground": "#569cd6" } },
{ "scope": "storage.type", "settings": { "foreground": "#569cd6" } },
{
"scope": ["storage.modifier", "keyword.operator.noexcept"],
"settings": { "foreground": "#569cd6" }
},
{
"scope": [
"string",
"entity.name.operator.custom-literal.string",
"meta.embedded.assembly"
],
"settings": { "foreground": "#ce9178" }
},
{ "scope": "string.tag", "settings": { "foreground": "#ce9178" } },
{ "scope": "string.value", "settings": { "foreground": "#ce9178" } },
{ "scope": "string.regexp", "settings": { "foreground": "#d16969" } },
{
"name": "String interpolation",
"scope": [
"punctuation.definition.template-expression.begin",
"punctuation.definition.template-expression.end",
"punctuation.section.embedded"
],
"settings": { "foreground": "#569cd6" }
},
{
"name": "Reset JavaScript string interpolation expression",
"scope": "meta.template.expression",
"settings": { "foreground": "#d4d4d4" }
},
{
"scope": [
"support.type.vendored.property-name",
"support.type.property-name",
"variable.css",
"variable.scss",
"variable.other.less",
"source.coffee.embedded"
],
"settings": { "foreground": "#9cdcfe" }
},
{ "scope": "keyword", "settings": { "foreground": "#569cd6" } },
{ "scope": "keyword.operator", "settings": { "foreground": "#d4d4d4" } },
{
"scope": [
"keyword.operator.new",
"keyword.operator.expression",
"keyword.operator.cast",
"keyword.operator.sizeof",
"keyword.operator.alignof",
"keyword.operator.typeid",
"keyword.operator.alignas",
"keyword.operator.instanceof",
"keyword.operator.logical.python",
"keyword.operator.wordlike"
],
"settings": { "foreground": "#569cd6" }
},
{ "scope": "keyword.other.unit", "settings": { "foreground": "#b5cea8" } },
{
"scope": [
"punctuation.section.embedded.begin.php",
"punctuation.section.embedded.end.php"
],
"settings": { "foreground": "#569cd6" }
},
{
"scope": "support.function.git-rebase",
"settings": { "foreground": "#9cdcfe" }
},
{
"scope": "constant.sha.git-rebase",
"settings": { "foreground": "#b5cea8" }
},
{
"name": "coloring of the Java import and package identifiers",
"scope": [
"storage.modifier.import.java",
"variable.language.wildcard.java",
"storage.modifier.package.java"
],
"settings": { "foreground": "#d4d4d4" }
},
{
"name": "this.self",
"scope": "variable.language",
"settings": { "foreground": "#569cd6" }
}
],
"colors": {
"editor.background": "#1E1E1E",
"activityBar.background": "#333333",
"statusBar.background": "#0D7ACC",
"sideBar.background": "#252526"
},
"semanticHighlighting": true
}
Loading

0 comments on commit 8299542

Please sign in to comment.