Merge pull request #206 from doki-theme/cleanups

Cleanups
doki-theme · Feb 26, 2023 · cfc48df · cfc48df
2 parents 7c6924b + 5f12b40
commit cfc48df
Show file tree

Hide file tree

Showing 29 changed files with 49 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 88.5-1.6.1 [Cleanups]
+
+- Cleaned up build process to use correct colors.
+- Renamed stuff to reflect `main` branch rename. 
+
 ## 88.4-1.6.0 [VS Code Web Support]
 
 - Extension now supported in [VSCode for the web](https://code.visualstudio.com/docs/editor/vscode-web).
@@ -292,15 +297,15 @@ Anime is trash...._and so am I_.
 # 14.1.0 [Custom Assets]
 
 Added the ability for you to add your own assets to be used by the themes!
-Please see the [README.md](https://github.com/doki-theme/doki-theme-vscode/tree/master#custom-assets) for more details.
+Please see the [README.md](https://github.com/doki-theme/doki-theme-vscode/tree/main#custom-assets) for more details.
 
 | **Custom Sticker** | **Custom Background** |
 | --- | --- |
-| ![custom_sticker](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_sticker.gif) | ![custom_background](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_background.gif) | 
+| ![custom_sticker](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_sticker.gif) | ![custom_background](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_background.gif) | 
 
 | **Custom Wallpaper** |
 | --- |
-| ![custom_wallpaper](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_wallpaper.png)|
+| ![custom_wallpaper](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_wallpaper.png)|
 
 # 14.0.0 [NekoPara Release]
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -151,7 +151,7 @@ original JetBrains plugin which uses all the colors defined. There is also Doki
 the IDE as well.
 
 Please follow
-the [theme creation contributions in the JetBrains Plugin repository](https://github.com/doki-theme/doki-theme-jetbrains/blob/master/CONTRIBUTING.md#creating-new-themes)
+the [theme creation contributions in the JetBrains Plugin repository](https://github.com/doki-theme/doki-theme-jetbrains/blob/main/CONTRIBUTING.md#creating-new-themes)
 for more details on how to build new themes.
 
 ## Creating Themes Required Software

diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json
@@ -18,7 +18,7 @@
     "quickInput.list.focusBackground": "&selectionBackground&AA",
     "quickInput.foreground": "&foregroundColor&",
     "peekViewTitleLabel.foreground": "&foregroundColor&",
-    "selection.background": "&accentColor&",
+    "selection.background": "&selectionBackground&",
     "editorGutter.modifiedBackground": "&diff.modified&",
     "editorGutter.addedBackground": "&diff.inserted&",
     "editorGutter.deletedBackground": "&diff.deleted&",

diff --git a/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json b/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json b/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json b/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json b/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark-contrast",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json b/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json b/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json
@@ -4,8 +4,7 @@
   "laf": {
     "extends": "dark",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&",
-      "selection.background": "&selectionBackground&"
+      "editor.selectionBackground": "&selectionBackground&"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json b/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json b/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json
@@ -4,7 +4,7 @@
   "laf": {
     "extends": "light",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&33"
+      "editor.selectionBackground": "&selectionBackground&66"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json b/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json
@@ -7,7 +7,7 @@
       "editor.lineHighlightBackground": "&headerColor&77",
       "sideBarSectionHeader.background": "&headerColor&",
       "activityBar.background": "&headerColor&",
-      "editor.selectionBackground": "&selectionBackground&33"
+      "editor.selectionBackground": "&selectionBackground&aa"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json b/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json
@@ -4,7 +4,7 @@
   "laf": {
     "extends": "light",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&33"
+      "editor.selectionBackground": "&selectionBackground&aa"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark-contrast",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark-contrast",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json b/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json
@@ -4,8 +4,7 @@
   "laf": {
     "extends": "dark-contrast",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&",
-      "selection.background": "&selectionBackground&"
+      "editor.selectionBackground": "&selectionBackground&"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json b/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json
@@ -4,8 +4,7 @@
   "laf": {
     "extends": "dark",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&",
-      "selection.background": "&selectionBackground&"
+      "editor.selectionBackground": "&selectionBackground&"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json b/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json b/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json b/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json
@@ -12,7 +12,7 @@
       "scrollbarSlider.hoverBackground": "&accentColorSecondary&9A",
       "scrollbarSlider.background": "&accentColorSecondary&5A",
       "scrollbarSlider.activeBackground": "&accentColorSecondary&9A",
-      "editor.selectionBackground": "&selectionBackground&33"
+      "editor.selectionBackground": "&selectionBackground&aa"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json b/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json
@@ -4,8 +4,7 @@
   "laf": {
     "extends": "dark-contrast",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&88",
-      "selection.background": "&selectionBackground&"
+      "editor.selectionBackground": "&selectionBackground&88"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json b/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "light",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json b/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json
@@ -4,8 +4,7 @@
   "laf": {
     "extends": "dark-contrast",
     "ui": {
-      "editor.selectionBackground": "&selectionBackground&",
-      "selection.background": "&selectionBackground&"
+      "editor.selectionBackground": "&selectionBackground&"
     }
   },
   "syntax": {},

diff --git a/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json b/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json
@@ -3,9 +3,7 @@
   "overrides": {},
   "laf": {
     "extends": "dark-contrast",
-    "ui": {
-      "selection.background": "&selectionBackground&"
-    }
+    "ui": {}
   },
   "syntax": {},
   "colors": {}

diff --git a/buildSrc/src/MassModifier.ts b/buildSrc/src/MassModifier.ts
@@ -4,7 +4,7 @@ import fs from "fs";
 
 console.log(path.resolve('.'));
 
-walkDir(path.resolve('.','assets','themes'))
+walkDir(path.resolve('.', 'assets', 'themes'))
   .then((files) => files.filter((file) => file.endsWith("vsCode.definition.json"))
   )
   .then((dokiFileDefinitionPaths) => {
@@ -24,25 +24,27 @@ walkDir(path.resolve('.','assets','themes'))
   .then((defs) => {
 
     console.log(
-        Object.keys(
-            defs.map(a => a.dokiThemeDefinition.characterId).reduce((acc, id) => {
+      Object.keys(
+        defs.map(a => a.dokiThemeDefinition.characterId).reduce((acc, id) => {
           acc[id] = id;
           return acc;
         }, {})).length
     );
     defs.forEach(({
       dokiFileDefinitionPath,
       dokiThemeDefinition,
-    })=>{
-      console.log(`${dokiThemeDefinition.id}: ${dokiThemeDefinition.laf?.ui?.['selection.background']}`);
-
-      // delete dokiThemeDefinition.backgrounds;
-      // fs.writeFileSync(
-      //   dokiFileDefinitionPath,
-      //   JSON.stringify(
-      //     dokiThemeDefinition, null, 2
+    }) => {
+      const selectionBackground = dokiThemeDefinition.laf?.ui?.['selection.background'];
+      console.log(`${dokiThemeDefinition.id}: ${selectionBackground}`);
+      // if (selectionBackground === '&selectionBackground&') {
+      //   delete dokiThemeDefinition.laf?.ui?.['selection.background'];
+      //   fs.writeFileSync(
+      //     dokiFileDefinitionPath,
+      //     JSON.stringify(
+      //       dokiThemeDefinition, null, 2
+      //     )
       //   )
-      // )
+      // }
     });
 
   });
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "Doki Theme",
   "description": "Cute anime character themes!",
   "publisher": "unthrottled",
-  "version": "88.1.14",
+  "version": "88.1.15",
   "license": "MIT",
   "icon": "Doki-Theme-v2.png",
   "galleryBanner": {

diff --git a/src/NotificationService.ts b/src/NotificationService.ts
@@ -3,7 +3,7 @@ import { VSCodeGlobals } from "./VSCodeGlobals";
 import { attemptToGreetUser } from "./WelcomeService";
 
 const SAVED_VERSION = "doki.theme.version";
-const DOKI_THEME_VERSION = "v88.4-1.6.0";
+const DOKI_THEME_VERSION = "v88.5-1.6.1";
 
 export function attemptToNotifyUpdates(context: vscode.ExtensionContext) {
   const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);