Merge pull request #28 from doki-theme/v6

v6.0.0 [Fate, Gate, and more Konosuba]

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+# 6.0.0 [Fate, Gate, Konosuba]
+
+## 5 New Themes!
+
+Girls from the Fate series:
+
+- Ishtar (Light/Dark)
+- Tohsaka Rin (Dark)
+
+From the Gate series:
+
+- Rory Mercury (Dark)
+
+Last addition to the Konosuba series:
+
+- Aqua (Dark)
+
+![v11 Girls](https://doki.assets.unthrottled.io/misc/v11_girls.png)
+
+## Other Stuff
+
+- Updated placeholder text
+- Updated Darkness's dark accent foreground.
+
 # 5.0.0 [Kanna Kamui]
 
 - Added Miss Kobayashi's Dragon Maid's `Kanna` as a dark theme!

README.md

@@ -19,10 +19,10 @@ Themes grouped [by anime](./albums/grouping.md)
 ## About!
 
 This plugin is for serious Otaku programmers.
-With over **20** themes, based off of various waifus,
-I think you will find your best girl.
+With over **20** themes, based off of various waifu,
+I think you will find best girl.
 
-Variety is the spice of life! So you can choose themes from various, Anime, Manga, or Visual Novels:
+You can choose themes from various, Anime, Manga, or Visual Novels such as:
 
 - Doki-Doki Literature Club
 - Re:Zero
@@ -32,6 +32,9 @@ Variety is the spice of life! So you can choose themes from various, Anime, Mang
 - High School DxD
 - Lucky Star
 - Sword Art Online
+- Fate
+- Gate
+- Miss Kobayashi's Dragon Maid
 
 Sticker in the way? No worries! You can configure them to be on or off at your leisure.
 

albums/complete_theme_album.md

@@ -1,3 +1,56 @@
+Fate
+---
+
+### Tohsaka Rin
+
+![rin dark code](../screenshots/fate/rin_dark_code.png)
+![rin dark code](../screenshots/fate/rin_dark_wallpaper.png)
+
+### Ishtar
+
+
+![ishtar dark code](../screenshots/fate/ishtar_dark_code.png)
+![ishtar dark code](../screenshots/fate/ishtar_dark_wallpaper.png)
+
+![ishtar light code](../screenshots/fate/ishtar_light_code.png)
+![ishtar light code](../screenshots/fate/ishtar_light_wallpaper.png)
+
+
+Gate
+---
+
+### Rory Mercury
+
+![rory dark code](../screenshots/gate/rory_dark_code.png)
+![rory dark code](../screenshots/gate/rory_dark_wallpaper.png)
+
+
+Miscellaneous
+---
+
+### Hatsune Miku
+![miku code](../screenshots/miscellaneous/miku_code.png)
+![miku code](../screenshots/miscellaneous/miku_wallpaper.png)
+
+KonoSuba
+---
+
+### Megumin
+![megumin code](../screenshots/konosuba/megumin_code.png)
+![megumin code](../screenshots/konosuba/megumin_wallpaper.png)
+
+### Aqua
+
+![aqua code](../screenshots/konosuba/aqua_dark_code.png)
+![aqua background](../screenshots/konosuba/aqua_dark_wallpaper.png)
+
+### Darkness
+![darkness code](../screenshots/konosuba/darkness_dark_code.png)
+![darkness code](../screenshots/konosuba/darkness_dark_wallpaper.png)
+![darkness code](../screenshots/konosuba/darkness_light_code.png)
+![darkness code](../screenshots/konosuba/darkness_light_wallpaper.png)
+
+
 Re:Zero
 ---
 
@@ -44,26 +97,6 @@ Neon Genesis Evangelion
 ![misato_dark code](../screenshots/eva/misato_dark_code.png)
 ![misato_dark code](../screenshots/eva/misato_dark_wallpaper.png)
 
-Miscellaneous
----
-
-### Hatsune Miku
-![miku code](../screenshots/miscellaneous/miku_code.png)
-![miku code](../screenshots/miscellaneous/miku_wallpaper.png)
-
-KonoSuba
----
-
-### Megumin
-![megumin code](../screenshots/konosuba/megumin_code.png)
-![megumin code](../screenshots/konosuba/megumin_wallpaper.png)
-
-### Darkness
-![darkness code](../screenshots/konosuba/darkness_dark_code.png)
-![darkness code](../screenshots/konosuba/darkness_dark_wallpaper.png)
-![darkness code](../screenshots/konosuba/darkness_light_code.png)
-![darkness code](../screenshots/konosuba/darkness_light_wallpaper.png)
-
 Sword Art Online
 ---
 ### Yuuki Asuna

albums/fate_themes.md

@@ -0,0 +1,13 @@
+### Tohsaka Rin
+
+![rin dark code](../screenshots/fate/rin_dark_code.png)
+![rin dark code](../screenshots/fate/rin_dark_wallpaper.png)
+
+### Ishtar
+
+
+![ishtar dark code](../screenshots/fate/ishtar_dark_code.png)
+![ishtar dark code](../screenshots/fate/ishtar_dark_wallpaper.png)
+
+![ishtar light code](../screenshots/fate/ishtar_light_code.png)
+![ishtar light code](../screenshots/fate/ishtar_light_wallpaper.png)

albums/gate_themes.md

@@ -0,0 +1,4 @@
+### Rory Mercury
+
+![rory dark code](../screenshots/gate/rory_dark_code.png)
+![rory dark code](../screenshots/gate/rory_dark_wallpaper.png)

albums/grouping.md

@@ -5,6 +5,10 @@ Themes grouped by album
 
 [Re:Zero Album](r0_album.md)
 
+[Fate](fate_themes.md)
+
+[Gate](gate_themes.md)
+
 [DanganRonpa Album](dr_themes.md)
 
 [Miss Kobayashi's Dragon Maid](dm_album.md)

albums/ks_album.md

@@ -2,6 +2,13 @@
 ![megumin code](../screenshots/konosuba/megumin_code.png)
 ![megumin code](../screenshots/konosuba/megumin_wallpaper.png)
 
+
+### Aqua
+
+![aqua code](../screenshots/konosuba/aqua_dark_code.png)
+![aqua background](../screenshots/konosuba/aqua_dark_wallpaper.png)
+
+
 ### Darkness
 ![darkness code](../screenshots/konosuba/darkness_dark_code.png)
 ![darkness code](../screenshots/konosuba/darkness_dark_wallpaper.png)

buildSrc/GroupMappings.ts

@@ -4,6 +4,8 @@ import {StringDictonary} from "./BuildThemes";
 const GroupToNameMapping: StringDictonary<string> = {
   "Kill la Kill": "KillLaKill: ",
   "Re Zero": "Re:Zero: ",
+  "Fate": "Fate: ",
+  "Gate": "Gate: ",
   "Literature Club": "DDLC: ",
   "KonoSuba": "KonoSuba: ",
   "Miss Kobayashi's Dragon Maid": "DM: ",

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": "5.0.0",
+  "version": "6.0.0",
   "license": "MIT",
   "icon": "Doki-Theme.png",
   "galleryBanner": {
@@ -37,9 +37,14 @@
     "onCommand:extension.theme.Kanna",
     "onCommand:extension.theme.Kanna.secondary",
     "onCommand:extension.theme.Misato Katsuragi",
+    "onCommand:extension.theme.Ishtar Dark",
+    "onCommand:extension.theme.Ishtar Light",
+    "onCommand:extension.theme.Tohsaka Rin",
+    "onCommand:extension.theme.Rory Mercury",
     "onCommand:extension.theme.Rias",
     "onCommand:extension.theme.Ryuko",
     "onCommand:extension.theme.Satsuki",
+    "onCommand:extension.theme.Aqua",
     "onCommand:extension.theme.Darkness Dark",
     "onCommand:extension.theme.Darkness Light",
     "onCommand:extension.theme.Megumin",
@@ -100,6 +105,22 @@
         "command": "extension.theme.Misato Katsuragi",
         "title": "Doki-Theme: Install Misato Katsuragi's Stickers"
       },
+      {
+        "command": "extension.theme.Ishtar Dark",
+        "title": "Doki-Theme: Install Ishtar Dark's Stickers"
+      },
+      {
+        "command": "extension.theme.Ishtar Light",
+        "title": "Doki-Theme: Install Ishtar Light's Stickers"
+      },
+      {
+        "command": "extension.theme.Tohsaka Rin",
+        "title": "Doki-Theme: Install Tohsaka Rin's Stickers"
+      },
+      {
+        "command": "extension.theme.Rory Mercury",
+        "title": "Doki-Theme: Install Rory Mercury's Stickers"
+      },
       {
         "command": "extension.theme.Rias",
         "title": "Doki-Theme: Install Rias's Stickers"
@@ -112,6 +133,10 @@
         "command": "extension.theme.Satsuki",
         "title": "Doki-Theme: Install Satsuki's Stickers"
       },
+      {
+        "command": "extension.theme.Aqua",
+        "title": "Doki-Theme: Install Aqua's Stickers"
+      },
       {
         "command": "extension.theme.Darkness Dark",
         "title": "Doki-Theme: Install Darkness Dark's Stickers"
@@ -250,6 +275,30 @@
         "path": "./generatedThemes/Misato Katsuragi.theme.json",
         "uiTheme": "vs-dark"
       },
+      {
+        "id": "62a4f26f-34b2-46f8-a10c-798e48c1ce9d",
+        "label": "Doki Theme: Fate:  Ishtar",
+        "path": "./generatedThemes/Ishtar Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "325c5d4d-5614-4c58-b296-18924f2f6928",
+        "label": "Doki Theme: Fate:  Ishtar",
+        "path": "./generatedThemes/Ishtar Light.theme.json",
+        "uiTheme": "vs"
+      },
+      {
+        "id": "3546f7be-b84f-4b8e-8cad-effa3f4603af",
+        "label": "Doki Theme: Fate:  Rin",
+        "path": "./generatedThemes/Tohsaka Rin.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "355d711c-2fa6-4df2-9504-dd44d8f5e350",
+        "label": "Doki Theme: Gate:  Rory",
+        "path": "./generatedThemes/Rory Mercury.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
         "label": "Doki Theme: DxD:  Rias",
@@ -268,6 +317,12 @@
         "path": "./generatedThemes/Satsuki.theme.json",
         "uiTheme": "vs"
       },
+      {
+        "id": "15e51483-1ccd-46b7-90cf-885cccaaaf2c",
+        "label": "Doki Theme: KonoSuba:  Aqua",
+        "path": "./generatedThemes/Aqua.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "774ec7ad-d6a0-4d9c-b195-2f54d72ab664",
         "label": "Doki Theme: KonoSuba:  Darkness",

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 = "v5.0.0";
+const DOKI_THEME_VERSION = "v6.0.0";
 
 export function attemptToNotifyUpdates(context: vscode.ExtensionContext) {
   const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);

themes/definitions/fate/ishtar/dark/ishtar.dark.vsCode.definition.json

@@ -0,0 +1,16 @@
+{
+  "id": "62a4f26f-34b2-46f8-a10c-798e48c1ce9d",
+  "overrides": {},
+  "laf": {
+    "extends": "dark",
+    "ui": {
+      "activityBarBadge.foreground": "&accentContrastColor&",
+      "statusBar.foreground": "&accentContrastColor&",
+      "badge.foreground": "&accentContrastColor&"
+    }
+  },
+  "syntax": {},
+  "colors": {
+    "constantsColor":"&htmlTagColor&"
+  }
+}

themes/definitions/fate/ishtar/light/ishtar.light.vsCode.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "325c5d4d-5614-4c58-b296-18924f2f6928",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

themes/definitions/fate/rin/dark/rin.dark.vsCode.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "3546f7be-b84f-4b8e-8cad-effa3f4603af",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

themes/definitions/gate/rory/dark/rory.dark.vsCode.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "355d711c-2fa6-4df2-9504-dd44d8f5e350",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

themes/definitions/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json

@@ -0,0 +1,9 @@
+{
+  "id": "15e51483-1ccd-46b7-90cf-885cccaaaf2c",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {
+    "constantsColor":"&secondaryAccentColor&"
+  }
+}

themes/definitions/konoSuba/darkness/dark/darkness.dark.vsCode.definition.json

@@ -8,7 +8,14 @@
       }
     }
   },
-  "laf": {},
+  "laf": {
+    "extends": "dark",
+    "ui": {
+      "activityBarBadge.foreground": "&accentContrastColor&",
+      "statusBar.foreground": "&accentContrastColor&",
+      "badge.foreground": "&accentContrastColor&"
+    }
+  },
   "syntax": {},
   "colors": {}
 }

themes/templates/base.laf.template.json

@@ -17,14 +17,16 @@
     "minimap.selectionHighlight": "&selectionBackground&",
     "list.activeSelectionForeground": "&selectionForeground&",
     "list.focusForeground": "&selectionForeground&",
+    "pickerGroup.foreground": "&infoForeground&",
+    "input.placeholderForeground": "&infoForeground&",
+    "list.deemphasizedForeground": "&infoForeground&",
     "list.inactiveSelectionBackground": "&selectionInactive&",
     "list.inactiveSelectionForeground": "&foregroundColor&",
     "editor.background": "&editorBackground&",
     "tab.activeBackground": "&highlightColor&",
     "panelSectionHeader.background": "&headerColor&",
     "focusBorder": "&borderColor&",
     "pickerGroup.border": "&borderColor&",
-    "pickerGroup.foreground": "&borderColor&",
     "tab.border": "&borderColor&",
     "tree.indentGuidesStroke": "&borderColor&",
     "sideBar.border": "&borderColor&",