Merge pull request #6 from pudding0503/main

⭐️ Release v2.0.0

Author: bitcookies

.vscode/launch.json

@@ -2,6 +2,7 @@
 // Use IntelliSense to learn about possible attributes.
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+
 {
 	"version": "0.2.0",
     "configurations": [

CHANGELOG.md

@@ -1,8 +1,15 @@
+## 2.0.0
+
++ Release new theme of pudding light aquarium 🎉
++ Optimized all theme color schemes
++ Update icon
++ Customized tmTheme
+
 ## 1.1.4
 
 + Optimized colors for macOS
 + Adjust selection background
-+ Adjust minimap background
++ Adjust mini map background
 + Adjust highlight background
 
 ## 1.1.3

README.md

@@ -1,7 +1,7 @@
 <p align="center">
  <img width="100px" src="https://bitcookies.nousbuild.com/pudding-vscode-theme/icon.png" align="center" alt="Pudding Icon" />
  <h2 align="center">Pudding Theme</h2>
- <p align="center">A Pudding Color Theme for Visual Studio Code</p>
+ <p align="center">A Pudding illustrations Color Theme for Visual Studio Code</p>
 </p>
 <p align="center">
   <a href="https://github.com/bitcookies/pudding-vscode-theme/releases">
@@ -18,12 +18,12 @@
   </a>
 </p>
 <p align="center">
-  <a href="README.zh-CN.md">简体中文</a> | <a href="README.md">English</a>
+  <a href="https://github.com/bitcookies/pudding-vscode-theme/blob/main/README.zh-CN.md">简体中文</a> | <a href="https://github.com/bitcookies/pudding-vscode-theme/blob/main/README.md">English</a>
 </p>
 
 ## 1. Pudding Theme
 
-The Visual Studio Code *Pudding Theme* currently comes in two colorways, a Light Theme and a Dark Theme.
+Visual Studio Code Pudding theme is constantly updated with a variety of color themes.
 
 ![screenshot](https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-1.jpg)
 
@@ -33,31 +33,59 @@ The Visual Studio Code *Pudding Theme* currently comes in two colorways, a Light
 
 The color scheme of this theme comes from the original cartoon character, **Pudding**. The colors in the painted image of Pudding were extracted and then used to develop this pudding theme.
 
-![screenshot](https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-2.png)
-
 Since this color scheme was originally intended for painting, there may be some problems with inappropriate colors when applied to program themes such as Visual Studio Code, and subsequent updates will be made to optimize and adjust the best style of the theme.
 
-### 2.2 Suggestion
-
-*Choosing a light theme during the day, and a dark theme at night* is not a good choice.
+### 2.2 Themes
 
-The choice between light and dark themes does not depend on whether it is day or night, **but on the intensity of light in your current environment**. 
-
-Even at night, if you are in a bright environment, it is still recommended that you use a light color theme. Because in a bright environment, using a dark theme, your eyes will keep adjusting between the two brightnesses, which will easily cause eye fatigue.
+|                            Theme                             |          Name          |
+| :----------------------------------------------------------: | :--------------------: |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-2.png" width="400px"> |      Pudding Dark      |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-3.png" width="400px"> |     Pudding Light      |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-4.png" width="400px"> | Pudding Light Aquarium |
 
 ## 3. Install
 
 1. Go to [VS Marketplace](https://marketplace.visualstudio.com/items?itemName=Bitcookies.pudding-vscode-theme).
 2. Click on the "Install" button.
-3. Then [select a theme](https://code.visualstudio.com/docs/getstarted/themes#_selecting-the-color-theme). Currently the following themes are available:
-
-   + `Pudding Light`
+3. Then [select a theme](https://code.visualstudio.com/docs/getstarted/themes#_selecting-the-color-theme). Currently the following themes are available.
 
-   - `Pudding Dark`
+   - Pudding Light
+   - Pudding Light Aquarium
+   - Pudding Dark
 
 With the update of the pudding clothing stand, the future will launch more thematic color scheme.
 
-## 4. Feedback
+## 4. Customized tmTheme
+
+### 4.1 Select Color Sublime
+
+Visit [Color Sublime](https://colorsublime.github.io) to pick your favorite tmTheme style and download it. After downloading, please delete the entire `<key>settings</key>` section at the beginning of the tmTheme file, as these settings will override the theme's color scheme.
+
+Please delete the code at the beginning of the tmTheme file that looks like this.
+
+```
+<dict>
+	<key>settings</key>
+		<dict>
+			<key>background</key>
+                <string>#222222</string>
+                ......
+                ......
+                <key>invisibles</key>
+                <string>#3b3a32</string>
+        </dict>
+</dict>
+```
+
+### 4.2 Replace Color Sublime
+
+After Clone this code repository, put the modified tmTheme file into `themes/tmTheme/` directory, then find the theme color scheme json file you want to modify under `themes/`, open it and modify the tokenColors link at the bottom to introduce your tmTheme file.
+
+```json
+"tokenColors": "./tmTheme/your.tmTheme"
+```
+
+## 5. Feedback
 
 The theme of the color scheme must still have a lot of shortcomings, if possible, you can give some feedback and comments here. Or, your favorite clothing apparel and colors, you can make suggestions for feedback:
 
@@ -66,9 +94,7 @@ The theme of the color scheme must still have a lot of shortcomings, if possible
 
 In the future I will also paint more characters clothing style, with the update of the pudding clothing stand, the future will launch more thematic color scheme.
 
-## 5. Future Theme
-
-We'll be releasing new plugin icons and more new color themes after `v2.0`, so stay tuned!
+## 6. Future Theme
 
 Here are possible future theme color scheme illustrations.
 
@@ -81,7 +107,7 @@ Here are possible future theme color scheme illustrations.
 | <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/2-giftbox.jpg" width="240px"> |    Gift Box    | [View](https://www.pixiv.net/artworks/95340507) |  [View](https://www.behance.net/gallery/134497941/Gift-Box)  |
 | <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/1-classroom.jpg" width="240px"> |   Classroom    | [View](https://www.pixiv.net/artworks/95340455) | [View](https://www.behance.net/gallery/134497441/Classroom)  |
 
-## 6. License
+## 7. License
 
 The code is available under the [MIT license](https://github.com/bitcookies/winrar-keygen/blob/master/LICENSE), but not including characters.
 

README.zh-CN.md

@@ -1,7 +1,7 @@
 <p align="center">
  <img width="100px" src="https://bitcookies.nousbuild.com/pudding-vscode-theme/icon.png" align="center" alt="Pudding Icon" />
- <h2 align="center"></h2>
- <p align="center">布丁插画穿衣风格的 Visual Studio Code 主题</p>
+ <h2 align="center">布丁 VSCode 主题</h2>
+ <p align="center">布丁插画风格的 Visual Studio Code 主题</p>
 </p>
 <p align="center">
   <a href="https://github.com/bitcookies/pudding-vscode-theme/releases">
@@ -17,15 +17,13 @@
   	<img alt="Issues" src="https://img.shields.io/github/issues/bitcookies/pudding-vscode-theme?color=F48D73" />
   </a>
 </p>
-
-
 <p align="center">
-  <a href="README.zh-CN.md">简体中文</a> | <a href="README.md">English</a>
+  <a href="https://github.com/bitcookies/pudding-vscode-theme/blob/main/README.zh-CN.md">简体中文</a> | <a href="https://github.com/bitcookies/pudding-vscode-theme/blob/main/README.md">English</a>
 </p>
 
 ## 1. VSCode 布丁主题
 
-Visual Studio Code 布丁主题目前共有两款配色，一款亮色主题，一款深色主题：
+Visual Studio Code 布丁主题正在不断更新多款配色主题：
 
 ![screenshot](https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-1.jpg)
 
@@ -35,27 +33,60 @@ Visual Studio Code 布丁主题目前共有两款配色，一款亮色主题，
 
 此主题的配色方案，来自于原创的二次元人物 —— **布丁（Pudding）**。提取布丁绘画形象中的颜色，然后使用这些绘画配色开发了这款布丁主题。
 
-![screenshot](https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-2.png)
-
 由于此配色最初是为了绘画，因此应用到 Visual Studio Code 等的程序主题中，可能存在一些颜色不合适的问题，后续将会不断进行更新优化，调整主题的最佳样式。
 
-### 2.2 主题建议
-
-“白天选择浅色主题，晚上选择深色主题”，这并不是一个好的选择。
+### 2.2 主题列表
 
-浅色和深色主题的选择，不取决于白天还是晚上，**而取决于你当前所处环境的光线强度**。
-
-即使在夜间，如果你处于明亮的环境中，依然建议你使用浅色主题。因为在明亮环境中，使用深色主题，眼睛会不停在两种亮度下调整，容易造成眼睛的疲劳。
+|                            Theme                             |          Name          |
+| :----------------------------------------------------------: | :--------------------: |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-2.png" width="400px"> |      Pudding Dark      |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-3.png" width="400px"> |     Pudding Light      |
+| <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/screenshot-4.png" width="400px"> | Pudding Light Aquarium |
 
 ## 3. 安装
 
 1. 转到 [VS 市场](https://marketplace.visualstudio.com/items?itemName=Bitcookies.pudding-vscode-theme)。
 2. 单击 “安装” 按钮。
 3. 然后[选择一个主题](https://code.visualstudio.com/docs/getstarted/themes#_selecting-the-color-theme)。目前有以下主题可用：
-   - `Pudding Light`
-   - `Pudding Dark`
+   - Pudding Light
+   - Pudding Light Aquarium
+   - Pudding Dark
+
+随着布丁插画的不断更新，未来也会继续退出更多主题配色。
+
+## 4. 自定义
+
+主题配色很好看，但是语法高亮样式不太适合我，这该怎么办呢？从 `v2.0` 版本开始，你可以自定义语法高亮样式了。
 
-## 4. 反馈
+### 4.1 挑选 Color Sublime
+
+访问 [Color Sublime](https://colorsublime.github.io) 挑选自己喜欢的 tmTheme 样式并下载。下载完成后，请删除掉 tmTheme 文件开头的 `<key>settings</key>` 部分的全部内容，因为这些设置会覆盖掉主题的配色。
+
+请删掉 tmTheme 文件开头形如这样的代码：
+
+```
+<dict>
+	<key>settings</key>
+		<dict>
+			<key>background</key>
+                <string>#222222</string>
+                ......
+                ......
+                <key>invisibles</key>
+                <string>#3b3a32</string>
+        </dict>
+</dict>
+```
+
+### 4.2 替换 Color Sublime
+
+Clone 此代码仓库后，将修改后的 tmTheme 文件放到 `themes/tmTheme/` 目录下，然后在 `themes/` 下找到你想要修改的主题配色 json 文件，打开后修改最底部的 tokenColors 链接，引入你的 tmTheme 文件即可。
+
+```json
+"tokenColors": "./tmTheme/your.tmTheme"
+```
+
+## 5. 反馈
 
 主题的配色一定还会存在很多的不足，如果可以的话，您可以在此反馈一些建议和意见。或者是，你喜欢的衣装服饰和颜色，都可以进行建议反馈：
 
@@ -64,9 +95,7 @@ Visual Studio Code 布丁主题目前共有两款配色，一款亮色主题，
 
 未来我也会绘画更多的人物衣装样式，随着布丁衣装立绘的更新，未来会推出更多主题配色。
 
-## 5. 未来的主题配色
-
-我们将在 `v2.0` 后推出新的插件图标，以及更多新的配色主题，敬请期待！
+## 6. 未来的主题配色
 
 下面是未来可能的主题配色插画：
 
@@ -79,8 +108,8 @@ Visual Studio Code 布丁主题目前共有两款配色，一款亮色主题，
 | <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/2-giftbox.jpg" width="240px"> |    《礼物盒》    | [查看](https://www.pixiv.net/artworks/95340507) |  [查看](https://www.behance.net/gallery/134497941/Gift-Box)  |
 | <img src="https://bitcookies.nousbuild.com/pudding-vscode-theme/1-classroom.jpg" width="240px"> |   《课后教室》   | [查看](https://www.pixiv.net/artworks/95340455) | [查看](https://www.behance.net/gallery/134497441/Classroom)  |
 
-## 6. 许可
+## 7. 许可
 
 主题代码使用 [MIT license](https://github.com/bitcookies/winrar-keygen/blob/master/LICENSE)，但不包含立绘。
 
-布丁人物立绘版权归作者所有：[Haoning Wu](https://github.com/pudding0503)。
+布丁人物立绘版权归作者所有：[Haoning Wu](https://github.com/pudding0503)

icon.png

@@ -2,13 +2,13 @@
     "name": "pudding-vscode-theme",
     "displayName": "Pudding Theme",
     "description": "Pudding Color Theme for Visual Studio Code",
-    "version": "1.1.4",
+    "version": "2.0.0",
     "preview": false,
 	"publisher": "Bitcookies",
     "license": "MIT",
     "icon": "icon.png",
     "galleryBanner": {
-        "color": "#F7B6B7",
+        "color": "#1e1e1e",
         "theme": "dark"
     },
 	"repository": {
@@ -19,16 +19,18 @@
 		"url": "https://github.com/bitcookies/pudding-vscode-theme/issues"
 	},
     "engines": {
-        "vscode": "^1.60.0"
+        "vscode": "^1.69.2"
     },
     "categories": [
         "Themes"
     ],
     "keywords": [
 		"theme",
-		"pudding",
-		"light",
-		"dark"
+        "color-theme",
+		"light-theme",
+		"dark-theme",
+        "pudding",
+        "illustration"
 	],
     "contributes": {
         "themes": [
@@ -37,6 +39,11 @@
                 "uiTheme": "vs",
                 "path": "./themes/pudding-light.json"
             },
+            {
+                "label": "Pudding Light Aquarium",
+                "uiTheme": "vs",
+                "path": "./themes/pudding-light-aquarium.json"
+            },
             {
                 "label": "Pudding Dark",
                 "uiTheme": "vs-dark",