v15 - NekoPara OneeSan Vol. (#96)

* Added v13 definitions * updated defs * Updated changelog, bump version to v15, & added screens. * updated theme ordering.
doki-theme · Aug 7, 2021 · 0b26867 · 0b26867
1 parent 85b404e
commit 0b26867
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+# 15.0.0 [NekoPara OneeSan Vol.]
+
+## 4 New Themes!!
+
+- Maple (Light/Dark)
+- Cinnamon (Dark)
+- Azuki (Dark)
+
+![v18 Girls](https://doki.assets.unthrottled.io/misc/v18_girls.png)
+
 # 14.2.0 [Auto-Checksum Fix]
 
 - Plugin automatically fixes VSCode's checksums on bundled/custom asset installation/removal. Just close all instances of VSCode and start it back up to get rid of the annoying `Unsupported` error.

diff --git a/albums/complete_theme_album.md b/albums/complete_theme_album.md
@@ -49,6 +49,19 @@ NekoPara
 
 ![coconut_dark_code code](../screenshots/nekoPara/coconut_dark_code.png)
 
+### Maple
+
+![maple_dark_code code](../screenshots/nekoPara/maple_dark_code.png)
+![maple_light_code code](../screenshots/nekoPara/maple_light_code.png)
+
+### Cinnamon
+
+![cinnamon_dark_code code](../screenshots/nekoPara/cinnamon_dark_code.png)
+
+### Azuki
+
+![azuki_dark_code code](../screenshots/nekoPara/azuki_dark_code.png)
+
 
 Don't Toy With Me, Miss Nagatoro
 ---

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

diff --git a/buildSrc/assets/themes/nekoPara/azuki/dark/azuki.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/azuki/dark/azuki.dark.vsCode.definition.json
@@ -0,0 +1,18 @@
+{
+  "id": "83e94920-9ae2-4838-9b85-4c3fa22b67b8",
+  "overrides": {},
+  "laf": {
+    "extends": "dark-contrast",
+    "ui": {
+      "editor.selectionBackground": "&selectionBackground&AA",
+      "selection.background": "&selectionBackground&AA"
+    }
+  },
+  "syntax": {},
+  "colors": {},
+  "backgrounds": {
+    "default": {
+      "anchor": "right"
+    }
+  }
+}
diff --git a/buildSrc/assets/themes/nekoPara/cinnamon/dark/cinnamon.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/cinnamon/dark/cinnamon.dark.vsCode.definition.json
@@ -0,0 +1,17 @@
+{
+  "id": "84dc0d3c-1c83-4dde-87b9-e1ea27cd34b0",
+  "overrides": {},
+  "laf": {
+    "extends": "dark-contrast",
+    "ui": {
+      "selection.background": "&selectionBackground&CC"
+    }
+  },
+  "syntax": {},
+  "colors": {},
+  "backgrounds": {
+    "default": {
+      "anchor": "right"
+    }
+  }
+}
diff --git a/buildSrc/assets/themes/nekoPara/maple/dark/maple.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/maple/dark/maple.dark.vsCode.definition.json
@@ -0,0 +1,17 @@
+{
+  "id": "13407818-da66-432b-94e3-fd2192e98118",
+  "overrides": {},
+  "laf": {
+    "extends": "dark",
+    "ui": {
+      "selection.background": "&selectionBackground&CC"
+    }
+  },
+  "syntax": {},
+  "colors": {},
+  "backgrounds": {
+    "default": {
+      "anchor": "right"
+    }
+  }
+}
diff --git a/buildSrc/assets/themes/nekoPara/maple/light/maple.light.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/maple/light/maple.light.vsCode.definition.json
@@ -0,0 +1,17 @@
+{
+  "id": "ea7a8b00-2d86-4e06-81a2-5c14a46264d5",
+  "overrides": {},
+  "laf": {
+    "extends": "light",
+    "ui": {
+      "selection.background": "&selectionBackground&aa"
+    }
+  },
+  "syntax": {},
+  "colors": {},
+  "backgrounds": {
+    "default": {
+      "anchor": "right"
+    }
+  }
+}
diff --git a/buildSrc/src/BuildThemes.ts b/buildSrc/src/BuildThemes.ts
@@ -69,7 +69,7 @@ function buildLAFColors(
   const resolvedMasterNameColors = resolveNamedColors(
     masterTemplates,
     dokiThemeTemplateJson,
-  );  
+  );
 
   const evaluatedColors: StringDictionary<string> = {
     ...resolvedMasterNameColors,
@@ -78,7 +78,7 @@ function buildLAFColors(
   };
   return applyNamedColors(resolvedLafTemplate, {
     ...evaluatedColors,
-    editorAccentColor: dokiThemeTemplateJson.overrides?.editorScheme?.colors?.accentColor || 
+    editorAccentColor: dokiThemeTemplateJson.overrides?.editorScheme?.colors?.accentColor ||
     evaluatedColors.accentColor,
   });
 }
@@ -292,7 +292,7 @@ evaluateTemplates(
       }`,
     }));
 
-    const sakurajimaMaiID = '0527c6fc-316a-4f80-9459-d92ced0e6492';
+    const shimaRinID = '5fb9c0a4-e613-457c-97a5-6204f9076cef';
     const themes = dokiDefinitions.map((dokiDefinition) => ({
       id: dokiDefinition.id,
       label: `Doki Theme: ${getGroupName(dokiDefinition)} ${
@@ -301,9 +301,9 @@ evaluateTemplates(
       path: `./${themeOutputDirectory}/${getName(dokiDefinition)}${themePostfix}`,
       uiTheme: dokiDefinition.dark ? "vs-dark" : "vs",
     })).sort((a, b) => {
-      if(a.id === sakurajimaMaiID) {
+      if(a.id === shimaRinID) {
         return -1;
-      } else if (b.id === sakurajimaMaiID) {
+      } else if (b.id === shimaRinID) {
         return 1;
       } else {
         return a.label.localeCompare(b.label);

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "The Doki Theme",
   "description": "A bunch of themes with cute anime girls. Code with your waifu!",
   "publisher": "unthrottled",
-  "version": "14.2.0",
+  "version": "15.0.0",
   "license": "MIT",
   "icon": "Doki-Theme.png",
   "galleryBanner": {
@@ -140,10 +140,18 @@
     "onCommand:doki-theme.theme.wallpaper.Hanekawa Tsubasa",
     "onCommand:doki-theme.theme.Miia",
     "onCommand:doki-theme.theme.wallpaper.Miia",
+    "onCommand:doki-theme.theme.Azuki",
+    "onCommand:doki-theme.theme.wallpaper.Azuki",
     "onCommand:doki-theme.theme.Chocola",
     "onCommand:doki-theme.theme.wallpaper.Chocola",
+    "onCommand:doki-theme.theme.Cinnamon",
+    "onCommand:doki-theme.theme.wallpaper.Cinnamon",
     "onCommand:doki-theme.theme.Coconut",
     "onCommand:doki-theme.theme.wallpaper.Coconut",
+    "onCommand:doki-theme.theme.Maple Dark",
+    "onCommand:doki-theme.theme.wallpaper.Maple Dark",
+    "onCommand:doki-theme.theme.Maple Light",
+    "onCommand:doki-theme.theme.wallpaper.Maple Light",
     "onCommand:doki-theme.theme.Vanilla",
     "onCommand:doki-theme.theme.wallpaper.Vanilla",
     "onCommand:doki-theme.theme.Yukinoshita Yukino",
@@ -645,6 +653,14 @@
         "command": "doki-theme.theme.wallpaper.Miia",
         "title": "Doki-Theme: Install Miia's Wallpaper"
       },
+      {
+        "command": "doki-theme.theme.Azuki",
+        "title": "Doki-Theme: Install Azuki's Sticker"
+      },
+      {
+        "command": "doki-theme.theme.wallpaper.Azuki",
+        "title": "Doki-Theme: Install Azuki's Wallpaper"
+      },
       {
         "command": "doki-theme.theme.Chocola",
         "title": "Doki-Theme: Install Chocola's Sticker"
@@ -653,6 +669,14 @@
         "command": "doki-theme.theme.wallpaper.Chocola",
         "title": "Doki-Theme: Install Chocola's Wallpaper"
       },
+      {
+        "command": "doki-theme.theme.Cinnamon",
+        "title": "Doki-Theme: Install Cinnamon's Sticker"
+      },
+      {
+        "command": "doki-theme.theme.wallpaper.Cinnamon",
+        "title": "Doki-Theme: Install Cinnamon's Wallpaper"
+      },
       {
         "command": "doki-theme.theme.Coconut",
         "title": "Doki-Theme: Install Coconut's Sticker"
@@ -661,6 +685,22 @@
         "command": "doki-theme.theme.wallpaper.Coconut",
         "title": "Doki-Theme: Install Coconut's Wallpaper"
       },
+      {
+        "command": "doki-theme.theme.Maple Dark",
+        "title": "Doki-Theme: Install Maple Dark's Sticker"
+      },
+      {
+        "command": "doki-theme.theme.wallpaper.Maple Dark",
+        "title": "Doki-Theme: Install Maple Dark's Wallpaper"
+      },
+      {
+        "command": "doki-theme.theme.Maple Light",
+        "title": "Doki-Theme: Install Maple Light's Sticker"
+      },
+      {
+        "command": "doki-theme.theme.wallpaper.Maple Light",
+        "title": "Doki-Theme: Install Maple Light's Wallpaper"
+      },
       {
         "command": "doki-theme.theme.Vanilla",
         "title": "Doki-Theme: Install Vanilla's Sticker"
@@ -784,9 +824,9 @@
     ],
     "themes": [
       {
-        "id": "0527c6fc-316a-4f80-9459-d92ced0e6492",
-        "label": "Doki Theme: BunnySenpai:  Mai",
-        "path": "./generatedThemes/Mai Dark.theme.json",
+        "id": "5fb9c0a4-e613-457c-97a5-6204f9076cef",
+        "label": "Doki Theme: YuruCamp:  Rin",
+        "path": "./generatedThemes/Shima Rin.theme.json",
         "uiTheme": "vs-dark"
       },
       {
@@ -795,6 +835,12 @@
         "path": "./generatedThemes/Maika.theme.json",
         "uiTheme": "vs-dark"
       },
+      {
+        "id": "0527c6fc-316a-4f80-9459-d92ced0e6492",
+        "label": "Doki Theme: BunnySenpai:  Mai",
+        "path": "./generatedThemes/Mai Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "98878c8e-9f91-4e25-930d-dd7d280d9e35",
         "label": "Doki Theme: BunnySenpai:  Mai",
@@ -993,18 +1039,42 @@
         "path": "./generatedThemes/Miia.theme.json",
         "uiTheme": "vs-dark"
       },
+      {
+        "id": "83e94920-9ae2-4838-9b85-4c3fa22b67b8",
+        "label": "Doki Theme: NekoPara:  Azuki",
+        "path": "./generatedThemes/Azuki.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "93035c21-9eb7-4b0e-92d0-35d66d16c8e0",
         "label": "Doki Theme: NekoPara:  Chocola",
         "path": "./generatedThemes/Chocola.theme.json",
         "uiTheme": "vs-dark"
       },
+      {
+        "id": "84dc0d3c-1c83-4dde-87b9-e1ea27cd34b0",
+        "label": "Doki Theme: NekoPara:  Cinnamon",
+        "path": "./generatedThemes/Cinnamon.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "432fdab1-b8fa-412e-8cca-1844f18a1a43",
         "label": "Doki Theme: NekoPara:  Coconut",
         "path": "./generatedThemes/Coconut.theme.json",
         "uiTheme": "vs-dark"
       },
+      {
+        "id": "13407818-da66-432b-94e3-fd2192e98118",
+        "label": "Doki Theme: NekoPara:  Maple",
+        "path": "./generatedThemes/Maple Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "ea7a8b00-2d86-4e06-81a2-5c14a46264d5",
+        "label": "Doki Theme: NekoPara:  Maple",
+        "path": "./generatedThemes/Maple Light.theme.json",
+        "uiTheme": "vs"
+      },
       {
         "id": "31d5574d-f56b-408f-81dc-9d44feeb62c2",
         "label": "Doki Theme: NekoPara:  Vanilla",
@@ -1118,12 +1188,6 @@
         "label": "Doki Theme: Vocaloid:  Miku",
         "path": "./generatedThemes/Hatsune Miku.theme.json",
         "uiTheme": "vs-dark"
-      },
-      {
-        "id": "5fb9c0a4-e613-457c-97a5-6204f9076cef",
-        "label": "Doki Theme: YuruCamp:  Rin",
-        "path": "./generatedThemes/Shima Rin.theme.json",
-        "uiTheme": "vs-dark"
       }
     ]
   },

diff --git a/screenshots/nekoPara/azuki_dark_code.png b/screenshots/nekoPara/azuki_dark_code.png
diff --git a/screenshots/nekoPara/cinnamon_dark_code.png b/screenshots/nekoPara/cinnamon_dark_code.png
diff --git a/screenshots/nekoPara/maple_dark_code.png b/screenshots/nekoPara/maple_dark_code.png
diff --git a/screenshots/nekoPara/maple_light_code.png b/screenshots/nekoPara/maple_light_code.png
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 = "v14.2.0";
+const DOKI_THEME_VERSION = "v15.0.0";
 
 export function attemptToNotifyUpdates(context: vscode.ExtensionContext) {
   const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);