diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts index fb1dd191..0eba86b9 100644 --- a/flatlaf-demo/build.gradle.kts +++ b/flatlaf-demo/build.gradle.kts @@ -30,6 +30,7 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( project( ":flatlaf-extras" ) ) + implementation( project( ":flatlaf-intellij-themes" ) ) implementation( "com.miglayout:miglayout-swing:5.2" ) implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) } @@ -38,6 +39,7 @@ tasks { jar { dependsOn( ":flatlaf-core:jar" ) dependsOn( ":flatlaf-extras:jar" ) + dependsOn( ":flatlaf-intellij-themes:jar" ) manifest { attributes( "Main-Class" to "com.formdev.flatlaf.demo.FlatLafDemo" ) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java index ffbfab7e..5203817f 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java @@ -60,7 +60,7 @@ public class DemoPrefs if( IntelliJTheme.ThemeLaf.class.getName().equals( lafClassName ) ) { String theme = state.get( KEY_LAF_THEME, "" ); if( theme.startsWith( RESOURCE_PREFIX ) ) - IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( theme.substring( RESOURCE_PREFIX.length() ) ) ); + IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( IJThemesPanel.THEMES_PACKAGE + theme.substring( RESOURCE_PREFIX.length() ) ) ); else if( theme.startsWith( FILE_PREFIX ) ) FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( theme.substring( FILE_PREFIX.length() ) ) ) ); else diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java index 43b26e42..eb8c4c35 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java @@ -60,6 +60,8 @@ import net.miginfocom.swing.*; public class IJThemesPanel extends JPanel { + public static final String THEMES_PACKAGE = "/com/formdev/flatlaf/intellijthemes/themes/"; + private final IJThemesManager themesManager = new IJThemesManager(); private final List themes = new ArrayList<>(); private final HashMap categories = new HashMap<>(); @@ -237,7 +239,7 @@ public class IJThemesPanel showInformationDialog( "Failed to load '" + themeInfo.themeFile + "'.", ex ); } } else { - IntelliJTheme.install( getClass().getResourceAsStream( themeInfo.resourceName ) ); + IntelliJTheme.install( getClass().getResourceAsStream( THEMES_PACKAGE + themeInfo.resourceName ) ); DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.RESOURCE_PREFIX + themeInfo.resourceName ); } @@ -260,7 +262,7 @@ public class IJThemesPanel // save theme try { - Files.copy( getClass().getResourceAsStream( themeInfo.resourceName ), + Files.copy( getClass().getResourceAsStream( THEMES_PACKAGE + themeInfo.resourceName ), file.toPath(), StandardCopyOption.REPLACE_EXISTING ); } catch( IOException ex ) { showInformationDialog( "Failed to save theme to '" + file + "'.", ex ); @@ -273,7 +275,7 @@ public class IJThemesPanel File licenseFile = new File( file.getParentFile(), StringUtils.removeTrailing( file.getName(), ".theme.json" ) + themeInfo.licenseFile.substring( themeInfo.licenseFile.indexOf( '.' ) ) ); - Files.copy( getClass().getResourceAsStream( themeInfo.licenseFile ), + Files.copy( getClass().getResourceAsStream( THEMES_PACKAGE + themeInfo.licenseFile ), licenseFile.toPath(), StandardCopyOption.REPLACE_EXISTING ); } catch( IOException ex ) { showInformationDialog( "Failed to save theme license to '" + file + "'.", ex ); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java index 184dbc32..bad7a17a 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java @@ -46,7 +46,7 @@ public class IJThemesUpdater else if( fromUrl.contains( "gitlab.com" ) ) fromUrl = fromUrl.replace( "/blob/", "/raw/" ); - String toPath = "src/main/resources/com/formdev/flatlaf/demo/intellijthemes/" + ti.resourceName; + String toPath = "../flatlaf-intellij-themes/src/main/resources" + IJThemesPanel.THEMES_PACKAGE + ti.resourceName; download( fromUrl, toPath ); } diff --git a/flatlaf-intellij-themes/build.gradle.kts b/flatlaf-intellij-themes/build.gradle.kts new file mode 100644 index 00000000..5e35d531 --- /dev/null +++ b/flatlaf-intellij-themes/build.gradle.kts @@ -0,0 +1,137 @@ +/* + * 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. + */ + +plugins { + `java-library` + `maven-publish` + id( "com.jfrog.bintray" ) + id( "com.jfrog.artifactory" ) +} + +dependencies { + implementation( project( ":flatlaf-core" ) ) +} + +tasks { + assemble { + dependsOn( + "sourcesJar", + "javadocJar" + ) + } + + javadoc { + options { + this as StandardJavadocDocletOptions + tags = listOf( "uiDefault", "clientProperty" ) + } + isFailOnError = false + } + + register( "sourcesJar", Jar::class ) { + archiveClassifier.set( "sources" ) + + from( sourceSets.main.get().allJava ) + } + + register( "javadocJar", Jar::class ) { + archiveClassifier.set( "javadoc" ) + + from( javadoc ) + } +} + +publishing { + publications { + create( "maven" ) { + artifactId = "flatlaf-intellij-themes" + groupId = "com.formdev" + + from( components["java"] ) + + artifact( tasks["sourcesJar"] ) + artifact( tasks["javadocJar"] ) + + pom { + name.set( "FlatLaf IntelliJ Themes Pack" ) + description.set( "Flat Look and Feel IntelliJ Themes Pack" ) + url.set( "https://github.com/JFormDesigner/FlatLaf" ) + + licenses { + license { + name.set( "The Apache License, Version 2.0" ) + url.set( "https://www.apache.org/licenses/LICENSE-2.0.txt" ) + } + } + + developers { + developer { + name.set( "Karl Tauber" ) + organization.set( "FormDev Software GmbH" ) + organizationUrl.set( "https://www.formdev.com/" ) + } + } + + scm { + url.set( "https://github.com/JFormDesigner/FlatLaf" ) + } + } + } + } +} + +bintray { + user = rootProject.extra["bintray.user"] as String? + key = rootProject.extra["bintray.key"] as String? + + setPublications( "maven" ) + + with( pkg ) { + repo = "flatlaf" + name = "flatlaf-intellij-themes" + setLicenses( "Apache-2.0" ) + vcsUrl = "https://github.com/JFormDesigner/FlatLaf" + + with( version ) { + name = project.version.toString() + } + + publish = rootProject.extra["bintray.publish"] as Boolean + dryRun = rootProject.extra["bintray.dryRun"] as Boolean + } +} + +artifactory { + setContextUrl( "https://oss.jfrog.org" ) + + publish( closureOf { + repository( delegateClosureOf { + setProperty( "repoKey", "oss-snapshot-local" ) + setProperty( "username", rootProject.extra["bintray.user"] as String? ) + setProperty( "password", rootProject.extra["bintray.key"] as String? ) + } ) + + defaults( delegateClosureOf { + invokeMethod( "publications", "maven" ) + setProperty( "publishArtifacts", true ) + setProperty( "publishPom", true ) + } ) + } ) + + resolve( delegateClosureOf { + setProperty( "repoKey", "jcenter" ) + } ) +} diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Cyan.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Cyan.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Cyan.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Cyan.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkFlatTheme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkFlatTheme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkFlatTheme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkFlatTheme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkFlatTheme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkFlatTheme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkFlatTheme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkFlatTheme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkPurple.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkPurple.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkPurple.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/DarkPurple.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_dark_fuchsia.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_dark_fuchsia.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_deep_ocean.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_deep_ocean.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_midnight_blue.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_midnight_blue.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gray.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gray.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gray.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Hiberbee.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Hiberbee.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HiberbeeDark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HiberbeeDark.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HighContrast.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HighContrast.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HighContrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HighContrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/LightFlatTheme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/LightFlatTheme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/LightFlatTheme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/LightFlatTheme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/LightFlatTheme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/LightFlatTheme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/LightFlatTheme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/LightFlatTheme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/MaterialTheme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/MaterialTheme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/MaterialTheme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/MaterialTheme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Monocai.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monocai.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Monocai.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monocai.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Monocai.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monocai.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Monocai.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Monocai.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Spacegray.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Spacegray.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Spacegray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Spacegray.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme-orange.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-theme-orange.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme-orange.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-theme-orange.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-theme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-theme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-themes.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-themes.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-themes.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc-themes.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_hard.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_hard.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_medium.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_medium.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_theme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_theme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Arc Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Arc Dark Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Arc Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Arc Dark.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Dark Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Dark.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Light Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Atom One Light.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Dracula Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Dracula Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Dracula.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/GitHub Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/GitHub Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/GitHub.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/GitHub.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Light Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Light Owl Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Light Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Light Owl.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Darker Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Darker Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Darker.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Darker.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Deep Ocean.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Deep Ocean.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Lighter Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Lighter Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Lighter.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Lighter.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Oceanic Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Oceanic Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Oceanic.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Oceanic.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Palenight Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Palenight Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Palenight.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Palenight.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Monokai Pro Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Monokai Pro Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Monokai Pro.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Monokai Pro.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Night Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Night Owl Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Night Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Night Owl.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Dark Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Dark.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Light Contrast.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/material-theme-ui-lite/Solarized Light.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/nord.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/nord.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/nord.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/nord.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_dark_theme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_dark_theme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_dark_theme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_dark_theme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_light_theme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_light_theme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_light_theme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/solarized_light_theme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/vuesion_theme.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/vuesion_theme.LICENSE.txt similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/vuesion_theme.LICENSE.txt rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/vuesion_theme.LICENSE.txt diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/vuesion_theme.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/vuesion_theme.theme.json similarity index 100% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/vuesion_theme.theme.json rename to flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/vuesion_theme.theme.json diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java index f2f5d96b..ef4813a8 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java @@ -51,6 +51,7 @@ import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicLookAndFeel; import com.formdev.flatlaf.*; import com.formdev.flatlaf.demo.intellijthemes.IJThemesManager; +import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel; import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.SystemInfo; @@ -112,7 +113,7 @@ public class UIDefaultsDump for( String resourceName : themesManager.getBundledResourceNames() ) { IntelliJTheme.install( UIDefaultsDump.class.getResourceAsStream( - "/com/formdev/flatlaf/demo/intellijthemes/" + resourceName ) ); + IJThemesPanel.THEMES_PACKAGE + resourceName ) ); dump( dir, StringUtils.removeTrailing( resourceName, ".theme.json" ) ); } diff --git a/settings.gradle.kts b/settings.gradle.kts index c325a9d7..83a023c6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,6 +20,7 @@ include( "flatlaf-core" ) include( "flatlaf-extras" ) include( "flatlaf-swingx" ) include( "flatlaf-jide-oss" ) +include( "flatlaf-intellij-themes" ) include( "flatlaf-demo" ) include( "flatlaf-testing" ) include( "flatlaf-theme-editor" )