From bcdc0a8fce5c637ea1336ff5da6b0c578b948a38 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 21 Apr 2022 22:03:05 +0200 Subject: [PATCH] IntelliJ Themes: added "Monokai Pro" and "Xcode-Dark" themes --- CHANGELOG.md | 7 +- .../IJThemesClassGenerator.java | 4 +- .../flatlaf/demo/intellijthemes/themes.json | 15 + flatlaf-intellij-themes/README.md | 2 + .../intellijthemes/FlatAllIJThemes.java | 2 + .../intellijthemes/FlatMonokaiProIJTheme.java | 54 ++ .../intellijthemes/FlatXcodeDarkIJTheme.java | 54 ++ .../themes/Monokai_Pro.LICENSE.txt | 19 + .../themes/Monokai_Pro.default.theme.json | 684 ++++++++++++++++++ .../themes/Xcode-Dark.LICENSE.txt | 21 + .../themes/Xcode-Dark.theme.json | 232 ++++++ 11 files changed, 1089 insertions(+), 5 deletions(-) create mode 100644 flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java create mode 100644 flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java create mode 100644 flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt create mode 100644 flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json create mode 100644 flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt create mode 100644 flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fc5f273..dcdd8121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,10 @@ FlatLaf Change Log - TabbedPane: Selected tab underline color now changes depending on whether the focus is within the tab content. (issue #398) -- IntelliJ Themes: TabbedPane now use different background color for selected - tabs in all "Arc" themes, in "Hiberbee Dark" and in all "Material UI Lite" - themes. +- IntelliJ Themes: + - Added "Monokai Pro" and "Xcode-Dark" themes. + - TabbedPane now use different background color for selected tabs in all "Arc" + themes, in "Hiberbee Dark" and in all "Material UI Lite" themes. #### Fixed bugs diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java index eb9fcadd..0f0a7da6 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java @@ -43,7 +43,7 @@ public class IJThemesClassGenerator markdownTable.append( "-----|------\n" ); for( IJThemeInfo ti : themesManager.bundledThemes ) { - if( ti.sourceCodeUrl == null || ti.sourceCodePath == null ) + if( ti.sourceCodeUrl == null ) continue; generateClass( ti, toPath, allInfos, markdownTable ); @@ -77,7 +77,7 @@ public class IJThemesClassGenerator themeName += " (Material)"; StringBuilder buf = new StringBuilder(); - for( String n : name.split( " " ) ) { + for( String n : name.split( "[ \\-]" ) ) { if( n.length() == 0 || n.equals( "-" ) ) continue; diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json index 728512bb..f11677b2 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json @@ -178,6 +178,13 @@ "sourceCodeUrl": "https://github.com/bmikaili/intellij-monocai-theme", "sourceCodePath": "blob/master/resources/Monocai.theme.json" }, + "Monokai_Pro.default.theme.json": { + "name": "Monokai Pro", + "dark": true, + "license": "MIT", + "licenseFile": "Monokai_Pro.LICENSE.txt", + "sourceCodeUrl": "https://github.com/subtheme-dev/monokai-pro" + }, "nord.theme.json": { "name": "Nord", "dark": true, @@ -225,6 +232,14 @@ "sourceCodeUrl": "https://github.com/vuesion/intellij-theme", "sourceCodePath": "blob/master/resources/META-INF/vuesion_theme.theme.json" }, + "Xcode-Dark.theme.json": { + "name": "Xcode-Dark", + "dark": true, + "license": "MIT", + "licenseFile": "Xcode-Dark.LICENSE.txt", + "sourceCodeUrl": "https://github.com/antelle/intellij-xcode-dark-theme", + "sourceCodePath": "blob/master/resources/Xcode-Dark.theme.json" + }, "material-theme-ui-lite/Arc Dark.theme.json": { "name": "Material Theme UI Lite / Arc Dark", diff --git a/flatlaf-intellij-themes/README.md b/flatlaf-intellij-themes/README.md index 398bf2e9..50d69670 100644 --- a/flatlaf-intellij-themes/README.md +++ b/flatlaf-intellij-themes/README.md @@ -65,12 +65,14 @@ Name | Class [Light Flat](https://github.com/nerzhulart/LightFlatTheme) | `com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme` [Material Design Dark](https://github.com/xinkunZ/NotReallyMDTheme) | `com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme` [Monocai](https://github.com/bmikaili/intellij-monocai-theme) | `com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme` +[Monokai Pro](https://github.com/subtheme-dev/monokai-pro) | `com.formdev.flatlaf.intellijthemes.FlatMonokaiProIJTheme` [Nord](https://github.com/arcticicestudio/nord-jetbrains) | `com.formdev.flatlaf.intellijthemes.FlatNordIJTheme` [One Dark](https://github.com/one-dark/jetbrains-one-dark-theme) | `com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme` [Solarized Dark](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme` [Solarized Light](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedLightIJTheme` [Spacegray](https://github.com/mturlo/intellij-spacegray) | `com.formdev.flatlaf.intellijthemes.FlatSpacegrayIJTheme` [Vuesion](https://github.com/vuesion/intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatVuesionIJTheme` +[Xcode-Dark](https://github.com/antelle/intellij-xcode-dark-theme) | `com.formdev.flatlaf.intellijthemes.FlatXcodeDarkIJTheme` Material Theme UI Lite: diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java index 443ee0d8..4ffc6e56 100644 --- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java @@ -52,12 +52,14 @@ public class FlatAllIJThemes new FlatIJLookAndFeelInfo( "Light Flat", "com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme", false ), new FlatIJLookAndFeelInfo( "Material Design Dark", "com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Monocai", "com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme", true ), + new FlatIJLookAndFeelInfo( "Monokai Pro", "com.formdev.flatlaf.intellijthemes.FlatMonokaiProIJTheme", true ), new FlatIJLookAndFeelInfo( "Nord", "com.formdev.flatlaf.intellijthemes.FlatNordIJTheme", true ), new FlatIJLookAndFeelInfo( "One Dark", "com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Solarized Dark", "com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Solarized Light", "com.formdev.flatlaf.intellijthemes.FlatSolarizedLightIJTheme", false ), new FlatIJLookAndFeelInfo( "Spacegray", "com.formdev.flatlaf.intellijthemes.FlatSpacegrayIJTheme", true ), new FlatIJLookAndFeelInfo( "Vuesion", "com.formdev.flatlaf.intellijthemes.FlatVuesionIJTheme", true ), + new FlatIJLookAndFeelInfo( "Xcode-Dark", "com.formdev.flatlaf.intellijthemes.FlatXcodeDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Arc Dark (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Arc Dark Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkContrastIJTheme", true ), new FlatIJLookAndFeelInfo( "Atom One Dark (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneDarkIJTheme", true ), diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java new file mode 100644 index 00000000..7be776bc --- /dev/null +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatMonokaiProIJTheme.java @@ -0,0 +1,54 @@ +/* + * Copyright 2020 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.intellijthemes; + +// +// DO NOT MODIFY +// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator +// + +import com.formdev.flatlaf.IntelliJTheme; + +/** + * @author Karl Tauber + */ +public class FlatMonokaiProIJTheme + extends IntelliJTheme.ThemeLaf +{ + public static final String NAME = "Monokai Pro"; + + public static boolean setup() { + try { + return setup( new FlatMonokaiProIJTheme() ); + } catch( RuntimeException ex ) { + return false; + } + } + + public static void installLafInfo() { + installLafInfo( NAME, FlatMonokaiProIJTheme.class ); + } + + public FlatMonokaiProIJTheme() { + super( Utils.loadTheme( "Monokai_Pro.default.theme.json" ) ); + } + + @Override + public String getName() { + return NAME; + } +} diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java new file mode 100644 index 00000000..30f7cba3 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatXcodeDarkIJTheme.java @@ -0,0 +1,54 @@ +/* + * Copyright 2020 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.intellijthemes; + +// +// DO NOT MODIFY +// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator +// + +import com.formdev.flatlaf.IntelliJTheme; + +/** + * @author Karl Tauber + */ +public class FlatXcodeDarkIJTheme + extends IntelliJTheme.ThemeLaf +{ + public static final String NAME = "Xcode-Dark"; + + public static boolean setup() { + try { + return setup( new FlatXcodeDarkIJTheme() ); + } catch( RuntimeException ex ) { + return false; + } + } + + public static void installLafInfo() { + installLafInfo( NAME, FlatXcodeDarkIJTheme.class ); + } + + public FlatXcodeDarkIJTheme() { + super( Utils.loadTheme( "Xcode-Dark.theme.json" ) ); + } + + @Override + public String getName() { + return NAME; + } +} diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt new file mode 100644 index 00000000..7aa3caf0 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.LICENSE.txt @@ -0,0 +1,19 @@ +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json new file mode 100644 index 00000000..c0cf60d4 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monokai_Pro.default.theme.json @@ -0,0 +1,684 @@ +{ + "name": "Monokai Pro", + "dark": true, + "author": "Subtheme", + "editorScheme": "/schemes/default.xml", + "ui": { + "*": { + "acceleratorSelectionForeground": "#ffd866", + "background": "#2d2a2e", + "borderColor": "#363337", + "disabledBackground": "#221f22", + "disabledForeground": "#5b595c", + "disabledText": "#5b595c", + "focusColor": "#5b595c", + "focusedBorderColor": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#221f22", + "inactiveForeground": "#939293", + "infoForeground": "#939293", + "selectionBackground": "#403e41", + "selectionBackgroundInactive": "#403e41", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#403e41", + "selectionInactiveForeground": "#ffd866", + "separatorColor": "#2d2a2e" + }, + "ActionButton": { + "hoverBackground": "#363337", + "hoverBorderColor": "#363337", + "pressedBackground": "#363337", + "pressedBorderColor": "#363337" + }, + "Borders": { + "ContrastBorderColor": "#363337", + "color": "#363337" + }, + "Button": { + "arc": 0, + "background": "#403e41", + "default": { + "endBackground": "#403e41", + "endBorderColor": "#403e41", + "foreground": "#ffd866", + "focusColor": "#ffd866", + "focusedBorderColor": "#403e41", + "shadowColor": "#403e41", + "startBackground": "#403e41", + "startBorderColor": "#403e41" + }, + "disabledBorderColor": "#403e41", + "disabledText": "#5b595c", + "endBackground": "#403e41", + "endBorderColor": "#403e41", + "focusedBorderColor": "#403e41", + "foreground": "#fcfcfa", + "shadowColor": "#403e41", + "shadowWidth": 0, + "startBackground": "#403e41", + "startBorderColor": "#403e41" + }, + "CheckBox": { + "background": "#2d2a2e", + "disabledText": "#5b595c", + "foreground": "#fcfcfa", + "select": "#ffd866" + }, + "CheckBoxMenuItem": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "ColorChooser": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "swatchesDefaultRecentColor": "#fcfcfa" + }, + "ComboBoxButton": { + "background": "#363337" + }, + "ComboBox": { + "ArrowButton": { + "background": "#403e41", + "disabledIconColor": "#5b595c", + "iconColor": "#fcfcfa", + "nonEditableBackground": "#2d2a2e" + }, + "background": "#363337", + "disabledBackground": "#221f22", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "modifiedItemForeground": "#ffd866", + "nonEditableBackground": "#363337", + "selectionBackground": "#2d2a2e", + "selectionForeground": "#ffd866" + }, + "ComboPopup": { + "border": "#2d2a2e" + }, + "CompletionPopup": { + "foreground": "#fcfcfa", + "matchForeground": "#ffd866", + "selectionInactiveBackground": "#2d2a2e", + "selectionBackground": "#2d2a2e" + }, + "Component": { + "arc": 4, + "borderColor": "#363337", + "disabledBorderColor": "#363337", + "focusColor": "#ffd866", + "focusedBorderColor": "#ffd866", + "hoverIconColor": "#ffd866", + "infoForeground": "#939293", + "iconColor": "#fcfcfa" + }, + "Counter": { + "background": "#ffd866", + "foreground": "#19181a" + }, + "Debugger": { + "Variables": { + "collectingDataForeground": "#939293", + "changedValueForeground": "#ffd866", + "errorMessageForeground": "#ff6188", + "evaluatingExpressionForeground": "#939293", + "exceptionForeground": "#78dce8", + "modifyingValueForeground": "#ffd866", + "valueForeground": "#ffd866" + } + }, + "DebuggerTabs": { + "underlinedTabBackground": "#5b595c" + }, + "DebuggerPopup": { + "borderColor": "#5b595c" + }, + "DefaultTabs": { + "background": "#2d2a2e", + "borderColor": "#2d2a2e", + "hoverBackground": "#363337", + "inactiveUnderlineColor": "#ffd866", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#2d2a2e", + "underlineHeight": 2 + }, + "DragAndDrop": { + "areaBackground": "#2d2a2e", + "areaBorderColor": "#2d2a2e", + "areaForeground": "#fcfcfa" + }, + "Editor": { + "background": "#221f22", + "foreground": "#fcfcfa", + "shortcutForeground": "#939293" + }, + "EditorPane": { + "background": "#221f22", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#2d2a2e", + "inactiveForeground": "#5b595c", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "EditorTabs": { + "borderColor": "#363337", + "inactiveUnderlineColor": "#ffd866", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#363337", + "underlinedTabForeground": "#c1c0c0" + }, + "FileColor": { + "Yellow": "00000000" + }, + "FormattedTextField": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveBackground": "#403e41", + "inactiveForeground": "#5b595c", + "selectionForeground": "#ffd866", + "selectionBackground": "#403e41" + }, + "Group": { + "disabledSeparatorColor": "#2d2a2e", + "separatorColor": "#2d2a2e" + }, + "GutterTooltip": { + "infoForeground": "#fcfcfa", + "lineSeparatorColor": "#2d2a2e" + }, + "HelpTooltip": { + "borderColor": "#2d2a2e", + "infoForeground": "#939293" + }, + "InformationHint": { + "borderColor": "#2d2a2e" + }, + "InplaceRefactoringPopup": { + "borderColor": "#2d2a2e" + }, + "Label": { + "background": "#2d2a2e", + "disabledForeground": "#5b595c", + "disabledText": "#5b595c", + "foreground": "#939293", + "infoForeground": "#939293", + "selectedForeground": "#ffd866" + }, + "Link": { + "activeForeground": "#ffd866", + "hoverForeground": "#ffd866", + "pressedForeground": "#ffd866", + "secondaryForeground": "#939293", + "visitedForeground": "#ffd866" + }, + "List": { + "background": "#221f22", + "foreground": "#fcfcfa", + "selectionBackground": "#363337", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#363337", + "selectionInactiveForeground": "#ffd866" + }, + "MemoryIndicator": { + "allocatedBackground": "#403e41", + "usedBackground": "#5b595c" + }, + "Menu": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#fcfcfa", + "background": "#2d2a2e", + "borderColor": "#363337", + "disabledBackground": "#403e41", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "separatorColor": "#2d2a2e", + "selectionForeground": "#ffd866" + }, + "MenuBar": { + "borderColor": "#363337", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "highlight": "#2d2a2e", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866", + "shadow": "#221f22" + }, + "MenuItem": { + "acceleratorForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "NavBar": { + "borderColor": "#363337" + }, + "Notification": { + "background": "#363337", + "borderColor": "#221f22", + "errorBackground": "#221f22", + "errorBorderColor": "#221f22", + "foreground": "#fcfcfa", + "MoreButton": { + "background": "#403e41", + "foreground": "#fcfcfa", + "innerBorderColor": "#363337" + }, + "ToolWindow": { + "errorBackground": "#363337", + "errorBorderColor": "#363337", + "informativeBackground": "#363337", + "informativeBorderColor": "#363337", + "warningBackground": "#363337", + "warningBorderColor": "#363337" + } + }, + "OptionPane": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "messageForeground": "#fcfcfa" + }, + "Panel": { + "background": "#2d2a2e", + "foreground": "#939293" + }, + "ParameterInfo": { + "background": "#403e41", + "borderColor": "#363337", + "currentOverloadBackground": "#403e41", + "currentParameterForeground": "#ffd866", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "infoForeground": "#939293", + "lineSeparatorColor": "#363337" + }, + "PasswordField": { + "background": "#403e41", + "capsLockIconColor": "#ffd866", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "Plugins": { + "background": "#2d2a2e", + "disabledForeground": "#939293", + "eapTagBackground": "#5b595c", + "lightSelectionBackground": "#363337", + "hoverBackground": "#363337", + "tagForeground": "#ffd866", + "tagBackground": "#5b595c", + "Button": { + "installBackground": "#221f22", + "installBorderColor": "#221f22", + "installForeground": "#fcfcfa", + "installFocusedBackground": "#221f22", + "installFillForeground": "#939293", + "installFillBackground": "#221f22", + "updateBackground": "#221f22", + "updateBorderColor": "#221f22", + "updateForeground": "#fcfcfa" + }, + "SearchField": { + "background": "#363337", + "borderColor": "#363337" + }, + "SectionHeader": { + "background": "#2d2a2e", + "foreground": "#939293" + }, + "Tab": { + "hoverBackground": "#363337", + "selectedForeground": "#fcfcfa", + "selectedBackground": "#363337" + } + }, + "Popup": { + "Advertiser": { + "background": "#2d2a2e", + "borderColor": "#2d2a2e", + "foreground": "#ffd866" + }, + "borderColor": "#221f22", + "inactiveBorderColor": "#2d2a2e", + "innerBorderColor": "#2d2a2e", + "Header": { + "activeBackground": "#2d2a2e", + "inactiveBackground": "#221f22" + }, + "paintBorder": true, + "separatorForeground": "#fcfcfa", + "separatorColor": "#2d2a2e", + "Toolbar": { + "background": "#221f22", + "borderColor": "#363337" + } + }, + "PopupMenu": { + "background": "#2d2a2e", + "foreground": "#fcfcfa", + "translucentBackground": "#2d2a2e", + "selectionBackground": "#403e41" + }, + "PopupMenuSeparator": { + "height": 10, + "stripeIndent": 5 + }, + "ProgressBar": { + "background": "#2d2a2e", + "foreground": "#ffd866", + "indeterminateEndColor": "#ffd866", + "indeterminateStartColor": "#ffd866", + "progressColor": "#ffd866", + "selectionBackground": "#5b595c", + "trackColor": "#5b595c" + }, + "RadioButton": { + "background": "#2d2a2e", + "disabledText": "#5b595c", + "foreground": "#fcfcfa" + }, + "RadioButtonMenuItem": { + "acceleratorForeground": "#939293", + "acceleratorSelectionForeground": "#939293", + "background": "#2d2a2e", + "disabledBackground": "#2d2a2e", + "disabledForeground": "#5b595c", + "foreground": "#fcfcfa", + "selectionBackground": "#403e41", + "selectionForeground": "#ffd866" + }, + "SearchEverywhere": { + "Advertiser": { + "background": "#221f22", + "foreground": "#939293" + }, + "Header": { + "background": "#2d2a2e" + }, + "List": { + "separatorColor": "#2d2a2e", + "separatorForeground": "#939293" + }, + "SearchField": { + "background": "#2d2a2e", + "borderColor": "#221f22", + "infoForeground": "#939293" + }, + "Tab": { + "selectedForeground": "#ffd866", + "selectedBackground": "#5b595c" + } + }, + "SearchMatch": { + "endBackground": "#ffd866", + "startBackground": "#ffd866" + }, + "Separator": { + "separatorColor": "#363337" + }, + "SidePanel": { + "background": "#221f22" + }, + "Slider": { + "background": "#2d2a2e", + "buttonBorderColor": "#ffd866", + "buttonColor": "#ffd866", + "foreground": "#fcfcfa", + "tickColor": "#403e41", + "trackColor": "#403e41" + }, + "SpeedSearch": { + "background": "#5b595c", + "borderColor": "#2d2a2e", + "errorForeground": "#fcfcfa", + "foreground": "#fcfcfa" + }, + "Spinner": { + "background": "#2d2a2e" + }, + "SplitPane": { + "background": "#2d2a2e", + "highlight": "#221f22" + }, + "SplitPaneDivider": { + "draggingColor": "#403e41" + }, + "StatusBar": { + "borderColor": "#363337", + "hoverBackground": "#363337" + }, + "TabbedPane": { + "background": "#2d2a2e", + "contentAreaColor": "#5b595c", + "disabledForeground": "#5b595c", + "disabledUnderlineColor": "#5b595c", + "focus": "#403e41", + "focusColor": "#403e41", + "foreground": "#fcfcfa", + "hoverColor": "#363337", + "tabSelectionHeight": 2, + "underlineColor": "#ffd866" + }, + "Table": { + "background": "#221f22", + "dropLineColor": "#ffd866", + "dropLineShortColor": "#ffd866", + "focusCellBackground": "#221f22", + "focusCellForeground": "#ffd866", + "foreground": "#fcfcfa", + "gridColor": "#221f22", + "lightSelectionForeground": "#ffd866", + "lightSelectionInactiveForeground": "#fcfcfa", + "lightSelectionInactiveBackground": "#363337", + "selectionBackground": "#363337", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#363337", + "selectionInactiveForeground": "#fcfcfa", + "sortIconColor": "#fcfcfa", + "stripeColor": "#221f22" + }, + "TableHeader": { + "background": "#2d2a2e", + "bottomSeparatorColor": "#363337", + "cellBorder": "4,0,4,0", + "foreground": "#fcfcfa", + "focusCellBackground": "#403e41", + "separatorColor": "#363337" + }, + "textText": "#939293", + "TextArea": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TextField": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TextPane": { + "background": "#363337", + "caretForeground": "#ffd866", + "foreground": "#fcfcfa", + "inactiveForeground": "#5b595c", + "selectionBackground": "#5b595c", + "selectionForeground": "#ffd866" + }, + "TitlePane": { + "background": "#221f22", + "Button.hoverBackground": "#5b595c", + "inactiveBackground": "#2d2a2e", + "infoForeground": "#939293", + "inactiveInfoForeground": "#939293" + }, + "TitledBorder": { + "titleColor": "#2d2a2e" + }, + "ToggleButton": { + "borderColor": "#403e41", + "buttonColor": "#fcfcfa", + "disabledText": "#5b595c", + "foreground": "#939293", + "offForeground": "#2d2a2e", + "offBackground": "#2d2a2e", + "onBackground": "#ffd866", + "onForeground": "#ffd866" + }, + "ToolBar": { + "background": "#221f22", + "borderHandleColor": "#939293", + "floatingForeground": "#939293", + "foreground": "#fcfcfa" + }, + "ToolTip": { + "Actions": { + "background": "#2d2a2e", + "infoForeground": "#939293" + }, + "background": "#2d2a2e", + "borderColor": "#5b595c", + "foreground": "#fcfcfa", + "infoForeground": "#939293", + "shortcutForeground": "#939293" + }, + "ToolWindow": { + "Button": { + "hoverBackground": "#363337", + "selectedForeground": "#ffd866", + "selectedBackground": "#363337" + }, + "Header": { + "background": "#2d2a2e", + "borderColor": "#363337", + "inactiveBackground": "#2d2a2e" + }, + "HeaderCloseButton": { + "background": "#2d2a2e" + }, + "HeaderTab": { + "hoverBackground": "#363337", + "hoverInactiveBackground": "#363337", + "inactiveUnderlineColor": "#ffd866", + "selectedInactiveBackground": "#2d2a2e", + "underlineColor": "#ffd866", + "underlinedTabBackground": "#363337", + "underlinedTabInactiveBackground": "#363337" + } + }, + "Tree": { + "background": "#221f22", + "foreground": "#939293", + "hash": "#2d2a2e", + "modifiedItemForeground": "#ffd866", + "rowHeight": 22, + "selectionBackground": "#2d2a2e", + "selectionForeground": "#ffd866", + "selectionInactiveBackground": "#2d2a2e" + }, + "UiDesigner": { + "Panel": { + "background": "#2d2a2e" + }, + "Preview": { + "background": "#2d2a2e" + } + }, + "ValidationTooltip": { + "errorBackground": "#363337", + "errorBorderColor": "#363337", + "warningBackground": "#363337", + "warningBorderColor": "#363337" + }, + "VersionControl": { + "FileHistory": { + "Commit": { + "selectedBranchBackground": "#2d2a2e" + } + }, + "GitLog": { + "localBranchIconColor": "#ffd866", + "otherIconColor": "#939293", + "remoteBranchIconColor": "#fcfcfa", + "tagIconColor": "#939293" + }, + "HgLog": { + "branchIconColor": "#ffd866", + "bookmarkIconColor": "#ffd866", + "closedBranchIconColor": "#5b595c", + "localTagIconColor": "#939293", + "mqTagIconColor": "#939293", + "tagIconColor": "#939293", + "tipIconColor": "#939293" + }, + "Log": { + "Commit": { + "unmatchedForeground": "#939293", + "currentBranchBackground": "#363337" + } + }, + "RefLabel": { + "foreground": "#ffd866", + "backgroundBase": "#5b595c" + } + }, + "Viewport": { + "background": "#221f22", + "foreground": "#fcfcfa" + }, + "WelcomeScreen": { + "background": "#2d2a2e", + "borderColor": "#363337", + "captionBackground": "#221f22", + "captionForeground": "#fcfcfa", + "footerBackground": "#221f22", + "footerForeground": "#fcfcfa", + "headerBackground": "#2d2a2e", + "headerForeground": "#fcfcfa", + "Projects": { + "background": "#221f22", + "selectionBackground": "#2d2a2e", + "selectionInactiveBackground": "#2d2a2e" + }, + "separatorColor": "#363337" + }, + "window": "#2d2a2e", + "Window": { + "border": "0,0,0,0,#363337" + }, + "windowBorder": "#363337", + "windowText": "#939293" + }, + "icons": { + "ColorPalette": { + "Checkbox.Background.Default.Dark": "##403e41", + "Checkbox.Background.Disabled.Dark": "##221f22", + "Checkbox.Background.Selected.Dark": "##403e41", + "Checkbox.Border.Default.Dark": "##403e41", + "Checkbox.Border.Disabled.Dark": "##221f22", + "Checkbox.Border.Selected.Dark": "##403e41", + "Checkbox.Focus.Thin.Default.Dark": "##403e41", + "Checkbox.Focus.Thin.Selected.Dark": "##221f22", + "Checkbox.Focus.Wide.Dark": "##403e41", + "Checkbox.Foreground.Disabled.Dark": "##939293", + "Checkbox.Foreground.Selected.Dark": "##fcfcfa" + } + } +} \ No newline at end of file diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt new file mode 100644 index 00000000..740ed613 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Antelle + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json new file mode 100644 index 00000000..969724e9 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Xcode-Dark.theme.json @@ -0,0 +1,232 @@ +{ + "name": "Xcode-Dark", + "dark": true, + "author": "Antelle", + "editorScheme": "/Xcode-Dark.xml", + "ui": { + "*": { + "background": "#323333", + "foreground": "#DFDFE0", + + "infoForeground": "#A9A9AA", + + "selectionBackground": "#1D7BED", + "selectionForeground": "#F9FCFF", + "selectionInactiveBackground": "#555657", + "selectionBackgroundInactive": "#555657", + + "lightSelectionBackground": "#2B4059", + "lightSelectionForeground": "#FFFFFF", + "lightSelectionInactiveBackground": "#555657", + "lightSelectionInactiveForeground": "#DFDFE0", + + "disabledBackground": "#323333", + "inactiveBackground": "#313233", + + "disabledForeground": "#737374", + "disabledText": "#737374", + "inactiveForeground": "#737374", + + "acceleratorForeground": "#D0D0D9", + "acceleratorSelectionForeground": "#D0D0D9", + + "errorForeground": "#843937", + + "borderColor": "#414141", + "disabledBorderColor": "#414141", + + "focusColor": "#24648D", + "focusedBorderColor": "#4C8CB5", + + "separatorForeground": "#5A5B5C", + "separatorColor": "#5A5B5C", + "lineSeparatorColor": "#5A5B5C", + + "modifiedItemForeground": "#1E4D86" + }, + + "ActionButton": { + "hoverBackground": "#5A5B5C", + "hoverBorderColor": "#5A5B5C", + "pressedBackground": "#414141", + "pressedBorderColor": "#414141" + }, + + "Button": { + "startBackground": "#424242", + "endBackground": "#424242", + "startBorderColor": "#525252", + "endBorderColor": "#525252", + "shadowColor": "#363636", + + "default": { + "foreground": "#DDE9FA", + "startBackground": "#206DE3", + "endBackground": "#1C61CA", + "startBorderColor": "#6099EC", + "endBorderColor": "#1C61CA", + "focusedBorderColor": "#45A1F4", + "focusColor": "#245F84", + "shadowColor": "#363636" + } + }, + + "Borders": { + "color": "#393A3B", + "ContrastBorderColor": "#4b4c4d" + }, + + "ComboBox": { + "nonEditableBackground": "#4f5051", + "background": "#414141", + "ArrowButton": { + "iconColor": "#DBDBDB", + "background": "#1E67D7", + "disabledIconColor": "#6B6B6C", + "nonEditableBackground": "#4f5051" + } + }, + + "ComboPopup.border": "1,1,1,1,3F3F3F", + + "Component": { + "errorFocusColor": "#843937", + "inactiveErrorFocusColor": "#433239", + "warningFocusColor": "#8F7B2E", + "inactiveWarningFocusColor": "#434136", + "iconColor": "#DFDFE0", + "hoverIconColor": "#FFFFFF" + }, + + "Counter": { + "background": "#909090", + "foreground": "#000000" + }, + + "DebuggerPopup.borderColor": "#414141", + + "DefaultTabs": { + "borderColor": "#484949", + "background": "#2A2B2B", + "inactiveUnderlineColor": "#24648D", + "hoverBackground": "#262727", + "underlineColor": "#1D7BED", + "underlineHeight": 2, + "underlinedTabBackground": "#3D3E3F" + }, + + "DragAndDrop": { + "areaForeground": "#DFDFE0", + "areaBackground": "#363737", + "areaBorderColor": "#414141" + }, + + "EditorTabs": { + "inactiveColoredFileBackground": "#2d281d" + }, + + "FileColor": { + "Yellow": "#3D3B37", + "Green": "#383C38", + "Blue": "#343A3E", + "Violet": "#3C3A3D", + "Orange": "#3D3A36", + "Rose": "#3D383B" + }, + + "Link": { + "activeForeground": "#428EE1", + "hoverForeground": "#7094FF", + "pressedForeground": "#FC4741", + "visitedForeground": "#7094FF" + }, + + "Notification": { + "errorForeground": "#DFDFE0", + "errorBackground": "#843937", + "errorBorderColor": "#982B31", + + "MoreButton.innerBorderColor": "#4b4c4d", + + "ToolWindow": { + "informativeForeground": "#DFDFE0", + "informativeBackground": "#225DA1", + "informativeBorderColor": "#1C61CA", + + "warningForeground": "#DFDFE0", + "warningBackground": "#A98938", + "warningBorderColor": "#FEC42E", + + "errorForeground": "#DFDFE0", + "errorBackground": "#843937", + "errorBorderColor": "#982B31" + } + }, + + "ProgressBar": { + "trackColor": "#252525", + "progressColor": "#CDCCCC", + "indeterminateStartColor": "#CDCCCC", + "indeterminateEndColor": "#B4B3B3", + "failedColor": "#DF1A21", + "failedEndColor": "#982B31", + "passedColor": "#3AA87B", + "passedEndColor": "#368E68" + }, + + "SearchMatch": { + "startBackground": "#f5bc2d", + "endBackground": "#e9b32b" + }, + + "SpeedSearch": { + "errorForeground": "#DF1A21" + }, + + "ToggleButton": { + "onBackground": "#1D7BED" + }, + + "CompletionPopup": { + "matchForeground": "#FDA14F", + "selectionBackground": "#1D7BED" + }, + + "Popup": { + "Header": { + "activeBackground": "#4A4E52", + "inactiveBackground": "#4A4E52" + } + }, + + "SearchEverywhere": { + "Tab": { + "selectedForeground": "#F9FCFF", + "selectedBackground": "#555A5E" + } + }, + + "icons": { + "ColorPalette": { + "Actions.Grey": "#969798", + "Actions.Red": "#FC545B", + "Actions.Yellow": "#e0c24c", + "Actions.Green": "#71bf47", + "Actions.Blue": "#3062d1", + "Actions.GreyInline.Dark": "#6F6F70", + + "Objects.Grey": "#6F6F70", + "Objects.RedStatus": "#FC4741", + "Objects.Red": "#FC545B", + "Objects.Pink": "#F5539E", + "Objects.Yellow": "#e0c24c", + "Objects.Green": "#71bf47", + "Objects.Blue": "#3062d1", + "Objects.Purple": "#A453A5", + "Objects.BlackText": "#000000", + "Objects.YellowDark": "#89744D", + "Objects.GreenAndroid": "#5D7554" + } + } + } +}