Merge pull request #56 from doki-theme/v11

v11 - Astolfo, Maika, Rias, & Rei
doki-theme · Apr 3, 2021 · d8d6189 · d8d6189
2 parents b546e97 + 06eae10
commit d8d6189
Show file tree

Hide file tree

Showing 35 changed files with 354 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Change Log
 
+# 11.0.0 [Astolfo, Maika, Rias, & Rei]
+
+## 4 New Themes
+
+From the Fate series:
+
+- Astolfo (Dark)
+
+From the Highschool DxD series:
+
+- Rias: Onyx (a darker theme)
+  - 2 Stickers:
+    - A Mild One
+    - A Cultured One
+
+From the Blend S series:
+
+- Sakuranomiya Maika (Dark)
+
+From the Neon Genesis Evangelion series:
+
+- Ayanami Rei (Dark)
+
+## Other stuff
+
+- Added [GitLens](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens) theming integration.
+- Updated activation events to enhance user startup experience.
+
+![v14 Girls](https://doki.assets.unthrottled.io/misc/v14_girls.png)
+
 # 10.0.0 [Glass Pane Wallpapers!]
 
 - Changed the behavior of the wallpapers to look like they are behind a glass pane!

diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ I think you will find best girl.
 
 You can choose themes from various, Anime, Manga, or Visual Novels:
 
+- Blend S
 - DanganRonpa
 - Darling in the Franxx
 - Doki-Doki Literature Club
@@ -49,6 +50,7 @@ You can choose themes from various, Anime, Manga, or Visual Novels:
 - [Configuration](#configuration)
     - [Background Images](#background-images)
     - [Stickers](#sticker)
+    - [Suggestive Content](#suggestive-content)
     - [Asset Removal](#remove-assets)
     - [Show Changelog](#changelog)
 - [Miscellaneous](#miscellaneous)
@@ -81,6 +83,24 @@ This feature will set the background image to the current theme's official wallp
 
 ![Ibuki's Dark Sticker](./readmeStuff/sticker.png)
 
+## Suggestive Content
+
+<div align="center">
+    <img src="https://doki.assets.unthrottled.io/misc/suggestive/cultured.gif" ></img>
+</div>
+
+So I thought it was a good idea to add a bit of culture to this plugin.
+<sup><sup>Ya boi is horny on main.</sup></sup>
+
+I will give you a bit of a warning before you install suggestive content.
+Some of us are professional Otaku, who want to remain, well...professional.
+Don't worry if you choose to continue, I won't ask you again for that specific theme.
+
+Applies for the following content:
+
+- Rias Onyx: Secondary Content
+
+
 ## Remove Assets
 
 Removes both the sticker and wallpaper from your vscode and restores the supported status.

diff --git a/albums/bs_album.md b/albums/bs_album.md
@@ -0,0 +1,3 @@
+### Sakuranomiya Maika
+
+![maika dark code](../screenshots/blendS/maika_dark_code.png)
diff --git a/albums/complete_theme_album.md b/albums/complete_theme_album.md
@@ -8,6 +8,9 @@ Darling in the Franxx
 
 Fate
 ---
+## Astolfo
+
+![astolfo dark code](../screenshots/fate/astolfo_dark_code.png)
 
 ### Tohsaka Rin
 
@@ -20,6 +23,13 @@ Fate
 
 ![ishtar light code](../screenshots/fate/ishtar_light_code.png)
 
+Blend S
+---
+
+### Sakuranomiya Maika
+
+![maika dark code](../screenshots/blendS/maika_dark_code.png)
+
 Rascal does not dream of bunny girl senpai
 ---
 
@@ -119,6 +129,10 @@ DanganRonpa
 Neon Genesis Evangelion
 ---
 
+### Ayanami Rei
+
+![rei_dark code](../screenshots/eva/rei_dark_code.png)
+
 ### Misato Katsuragi
 ![misato_dark code](../screenshots/eva/misato_dark_code.png)
 
@@ -145,6 +159,9 @@ High School DxD
 
 ### Rias Gremory
 ![rias code](../screenshots/highSchoolDxD/rias_dark_code.png)
+![rias code](../screenshots/highSchoolDxD/rias_onyx_code.png)
+
+### [Rias Onyx Secondary [Suggestive Content] (Click to view)](../screenshots/highSchoolDxD/rias_onyx_secondary_code.png)
 
 Lucky Star
 ---

diff --git a/albums/dxd_album.md b/albums/dxd_album.md
@@ -3,3 +3,6 @@ High School DxD
 
 ### Rias Gremory
 ![rias code](../screenshots/highSchoolDxD/rias_dark_code.png)
+![rias code](../screenshots/highSchoolDxD/rias_onyx_code.png)
+
+### [Rias Onyx Secondary [Suggestive Content] (Click to view)](../screenshots/highSchoolDxD/rias_onyx_secondary_code.png)
diff --git a/albums/eva_album.md b/albums/eva_album.md
@@ -1,6 +1,10 @@
 Neon Genesis Evangelion
 ---
 
+### Ayanami Rei
+
+![rei_dark code](../screenshots/eva/rei_dark_code.png)
+
 ### Misato Katsuragi
 ![misato_dark code](../screenshots/eva/misato_dark_code.png)
 

diff --git a/albums/fate_themes.md b/albums/fate_themes.md
@@ -1,3 +1,7 @@
+## Astolfo
+
+![astolfo dark code](../screenshots/fate/astolfo_dark_code.png)
+
 ### Tohsaka Rin
 
 ![rin dark code](../screenshots/fate/rin_dark_code.png)

diff --git a/albums/grouping.md b/albums/grouping.md
@@ -1,6 +1,8 @@
 Themes grouped by album
 ---
 
+[Blend S](bs_album.md)
+
 [DanganRonpa Album](dr_themes.md)
 
 [Darling in the Franxx](dif_album.md)

diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json
@@ -20,6 +20,7 @@
     "list.activeSelectionForeground": "&selectionForeground&",
     "list.focusForeground": "&selectionForeground&",
     "pickerGroup.foreground": "&infoForeground&",
+    "gitlens.trailingLineForegroundColor": "&infoForeground&99",
     "input.placeholderForeground": "&infoForeground&",
     "list.deemphasizedForeground": "&infoForeground&",
     "list.inactiveSelectionBackground": "&selectionInactive&99",
@@ -63,6 +64,7 @@
     "editorGroupHeader.tabsBackground": "&editorBackground&",
     "dropdown.background": "&editorBackground&",
     "editorLineNumber.foreground": "&lineNumberColor&",
+    "gitlens.gutterForegroundColor": "&lineNumberColor&",
     "editorCursor.foreground": "&accentColor&",
     "editorWidget.border": "&accentColor&",
     "list.highlightForeground": "&accentColor&",
@@ -88,6 +90,7 @@
     "button.background": "&buttonColor&",
     "button.foreground": "&buttonFont&",
     "editor.lineHighlightBackground": "&caretRow&77",
+    "gitlens.trailingLineBackgroundColor": "&caretRow&77",
     "editor.lineHighlightBorder": "&caretRow&00",
     "sideBarSectionHeader.background": "&caretRow&77",
     "activityBar.background": "&caretRow&",
@@ -109,6 +112,7 @@
     "scrollbar.shadow": "#1111113a",
     "titleBar.activeBackground": "&headerColor&",
     "titleBar.inactiveBackground": "&headerColor&",
+    "gitlens.gutterBackgroundColor": "&codeBlock&",
     "peekViewEditor.background": "&codeBlock&",
     "peekViewEditorGutter.background": "&codeBlock&",
     "terminal.ansiRed": "#E356A7",
@@ -122,6 +126,8 @@
     "debugIcon.breakpointStackframeForeground": "&selectionInactive&",
     "editor.focusedStackFrameHighlightBackground": "&selectionInactive&",
     "diffEditor.removedTextBackground": "&diff.deleted&50",
-    "diffEditor.insertedTextBackground": "&diff.inserted&50"
+    "diffEditor.insertedTextBackground": "&diff.inserted&50",
+    "gitlens.gutterUncommittedForegroundColor": "&diff.modified&",
+    "gitlens.lineHighlightBackgroundColor": "&diff.inserted&50"
   }
 }
diff --git a/buildSrc/assets/themes/blendS/maika/dark/maika.dark.vsCode.definition.json b/buildSrc/assets/themes/blendS/maika/dark/maika.dark.vsCode.definition.json
@@ -0,0 +1,7 @@
+{
+  "id": "6106e529-efef-444d-9db0-a9b0b444cf1b",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}
diff --git a/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json b/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json
@@ -0,0 +1,7 @@
+{
+  "id": "c262185d-9682-413b-9143-85a2dda76b2f",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}
diff --git a/buildSrc/assets/themes/fate/astolfo/dark/astolfo.dark.vsCode.definition.json b/buildSrc/assets/themes/fate/astolfo/dark/astolfo.dark.vsCode.definition.json
@@ -0,0 +1,10 @@
+{
+  "id": "930c70c8-474e-4e2d-a223-d1e2b9da4fb1",
+  "overrides": {},
+  "laf": {
+    "extends": "dark-contrast",
+    "ui": {}
+  },
+  "syntax": {},
+  "colors": {}
+}
diff --git a/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json b/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json
@@ -0,0 +1,7 @@
+{
+  "id": "ea9a13f6-fa7f-46a4-ba6e-6cefe1f55160",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}
diff --git a/buildSrc/src/BuildThemes.ts b/buildSrc/src/BuildThemes.ts
@@ -255,7 +255,7 @@ evaluateTemplates(
         path.resolve(
           repoDirectory,
           themeOutputDirectory,
-          `${dokiTheme.definition.name}${themePostfix}`
+          `${getName(dokiTheme.definition)}${themePostfix}`
         ),
         JSON.stringify(vsCodeTheme, null, 2)
       );
@@ -280,7 +280,7 @@ evaluateTemplates(
 
     const commands = stickerInstallCommands.map((commandAndDefinition) => ({
       command: commandAndDefinition.command,
-      title: `Doki-Theme: Install ${commandAndDefinition.definition.name}'s${
+      title: `Doki-Theme: Install ${getName(commandAndDefinition.definition)}'s${
         commandAndDefinition.command.endsWith("secondary") ? " Secondary" : ""
       } ${
         commandAndDefinition.command.indexOf('wallpaper') >=0 ? 'Wallpaper' : 'Sticker'
@@ -293,7 +293,7 @@ evaluateTemplates(
       label: `Doki Theme: ${getGroupName(dokiDefinition)} ${
         dokiDefinition.displayName
       }`,
-      path: `./${themeOutputDirectory}/${dokiDefinition.name}${themePostfix}`,
+      path: `./${themeOutputDirectory}/${getName(dokiDefinition)}${themePostfix}`,
       uiTheme: dokiDefinition.dark ? "vs-dark" : "vs",
     })).sort((a, b) => {
       if(a.id === sakurajimaMaiID) {
@@ -360,13 +360,17 @@ function getCommandNames(dokiDefinition: MasterDokiThemeDefinition): string[] {
     .map((type) => {
       if (type === "default") {
         return [
-          `doki-theme.theme.${dokiDefinition.name}`,
-          `doki-theme.theme.wallpaper.${dokiDefinition.name}`
+          `doki-theme.theme.${getName(dokiDefinition)}`,
+          `doki-theme.theme.wallpaper.${getName(dokiDefinition)}`
         ];
       }
       return [
-        `doki-theme.theme.${dokiDefinition.name}.secondary`,
-        `doki-theme.theme.wallpaper.${dokiDefinition.name}.secondary`,
+        `doki-theme.theme.${getName(dokiDefinition)}.secondary`,
+        `doki-theme.theme.wallpaper.${getName(dokiDefinition)}.secondary`,
       ];
     }).reduce((accum, next) => accum.concat(next), []);
 }
+function getName(dokiDefinition: MasterDokiThemeDefinition) {
+  return dokiDefinition.name.replace(':', '');
+}
+