diff --git a/README.md b/README.md index eb5cb71b9..fff7951a3 100644 --- a/README.md +++ b/README.md @@ -4,77 +4,67 @@ Jewel logo -Jewel aims at recreating the _Darcula_ and _New UI_ Swing Look and Feels used on the IntelliJ Platform into Compose for -Desktop. +Jewel aims at recreating the IntelliJ Platform's _New UI_ Swing Look and Feel in Compose for Desktop, providing a +desktop-optimized theme and set of components. -> **Warning** +> [!WARNING] +> > This project is in very early development and is probably not ready to be used in production projects. You _can_, but -> there -> are no published snapshots, and you should expect APIs to break fairly often, things to move around, and all that -> jazz. +> you should expect APIs to change fairly often, things to move around and/or break, and all that jazz. +> > Use at your risk! +Jewel provides stand-alone implementations of the IntelliJ Platform themes that can be used in any Compose for Desktop +application, and a Swing LaF Bridge that only works in the IntelliJ Platform (i.e., used to create IDE plugins), but +automatically mirrors the current Swing LaF into Compose for a native-looking, consistent UI. + ## Project structure The project is split in modules: -1. `core` is the base Jewel library code (composables, interface definitions, etc.) -2. `compose-utils` is a collection of utilities for dealing with Compose, and Swing interop -3. `themes` are the two themes implemented by Jewel: - 1. `darcula` is the old school Intellij LaF, called Darcula, which has two implementations: - 1. `darcula-standalone` is the base theme and can be used in any Compose for Desktop project - 2. `darcula-ide` is a version of the theme that can be used in an IDEA plugin, and integrates with the IDE's - Swing LaF and themes via a - bridge (more - on that later) - 2. `new-ui` implements the new IntelliJ LaF, known as "new UI". This also has the same two implementations -4. `samples` contains the example apps, which showcase the available components: +1. `buildSrc` contains the build logic, including: + * The `jewel` and `jewel-publish` configuration plugins + * The Theme Palette generator plugin +2. `core` contains the foundational Jewel functionality, including the components and their styling primitives +3. `int-ui` implements the standalone version of the IntelliJ New UI, which implements the + ["Int UI" design system](https://www.figma.com/community/file/1227732692272811382/int-ui-kit), and can be used + anywhere +4. `ide-laf-bridge` contains the Swing LaF bridge to use in IntelliJ Platform plugins (see more below) +5. `samples` contains the example apps, which showcase the available components: 1. `standalone` is a regular CfD app, using the predefined "base" theme definitions - 2. `ide-plugin` is an IntelliJ plugin, adding some UI to the IDE, and showcasing the use of the bridge (see later) - -### Running the samples + 2. `ide-plugin` is an IntelliJ plugin, adding some UI to the IDE, and showcasing the use of the Swing Bridge -To run the stand-alone sample app, you can run the `:samples:standalone:run` Gradle task. +### Int UI Standalone theme -To run the IntelliJ IDEA plugin sample, you can run the `:samples:ide-plugin:runIde` Gradle task. This will download and -run a copy of IJ Community -with the plugin installed; you can check the additional panels in the IDE once it starts up (at the bottom, by default, -in old UI; in the overflow -in the new UI). +The standalone theme can be used in any Compose for Desktop app. You use it as a normal theme, and you can customise it +to your heart's content. By default, it matches the official Int UI specs. -If you're using IntelliJ IDEA, you can use the "Stand-alone sample" and "IDE sample" run configurations. +> [!WARNING] +> Note that Jewel **requires** the JetBrains Runtime to work correctly. Some features like font loading depend on it, +> as it has extra features and patches for UI functionalities that aren't available in other JDKs. +> We **do not support** running Jewel on any other JDK. ### The Swing Bridge -In the `*-ide` modules, there is a crucial element for proper integration with the IDE: a bridge between the Swing theme -and LaF, and the Compose -world. +Jewel includes a crucial element for proper integration with the IDE: a bridge between the Swing components, theme +and LaF, and the Compose world. + This bridge ensures that we pick up the colours, typography, metrics, and images as defined in the current IntelliJ -theme, and apply them to the -Compose theme as well. - -The work of building this bridge is fairly complex as there isn't a good mapping between the IDE LaF properties, the -Darcula design specs, and the -Compose implementations. Sometimes, you will need to get a bit creative. - -When adding a new composable to the IJ theme, you need to make sure you also update the bridge to properly support it at -runtime. You can refer to the -[Darcula design specs](https://jetbrains.design/intellij) and -corresponding [Figma specs](https://jetbrains.design/intellij/resources/UI_kit/), but -the ultimate goal is consistency with the Swing implementation, so the ground truth of what you see in the IDE is the -reference for any implementation -and trumps the specs. - -To find the required values in the IDE, we recommend enabling -the [IDE internal mode](https://plugins.jetbrains.com/docs/intellij/enabling-internal.html) -and using the [UI Inspector](https://plugins.jetbrains.com/docs/intellij/internal-ui-inspector.html) and -[LaF Defaults](https://plugins.jetbrains.com/docs/intellij/internal-ui-laf-defaults.html) tools to figure out the names -of the parameters to use in -the bridge. - -To see debug logs in the IDE, add these to __Help | Diagnostic Tools | Debug Log Settings__: +theme, and apply them to the Compose components as well — at least for themes that use the +standard [IntelliJ theming](https://plugins.jetbrains.com/docs/intellij/themes-getting-started.html) mechanisms. -``` -#org.jetbrains.jewel.demo -#org.jetbrains.jewel +> [!NOTE] +> IntelliJ themes that use non-standard mechanisms (such as providing custom UI implementations for Swing components) +> are not, and will never, be supported. + +If you're writing an IntelliJ Platform plugin, you should use the `SwingBridgeTheme` instead of a standalone theme. + +#### Accessing icons + +When you want to draw an icon from the resources, you should use a `PainterProvider`. Reading an icon from the IDE is +as easy as using the `retrieveStatefulIcon()` and `retrieveStatelessIcon()`: + +```kotlin +val svgLoader = service().svgLoader +val painterProvider = retrieveStatelessIcon("icons/bot-toolwindow.svg", svgLoader, iconData) ``` diff --git a/build.gradle.kts b/build.gradle.kts index ee13bb71d..9e10644fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,10 +11,9 @@ val sarif: Configuration by configurations.creating { dependencies { sarif(projects.core) - sarif(projects.composeUtils) sarif(projects.samples.standalone) - sarif(projects.themes.intUi.intUiStandalone) - sarif(projects.themes.intUi.intUiCore) + sarif(projects.intUi.intUiStandalone) + sarif(projects.intUi.intUiCore) } tasks { diff --git a/buildSrc/src/main/kotlin/jewel-publish.gradle.kts b/buildSrc/src/main/kotlin/jewel-publish.gradle.kts index 204c2d40b..e7a20b84e 100644 --- a/buildSrc/src/main/kotlin/jewel-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/jewel-publish.gradle.kts @@ -1,9 +1,9 @@ @file:Suppress("UnstableApiUsage") plugins { + kotlin("jvm") `maven-publish` id("org.jetbrains.dokka") - id("jewel") } val sourcesJar by tasks.registering(Jar::class) { diff --git a/compose-utils/build.gradle.kts b/compose-utils/build.gradle.kts deleted file mode 100644 index eabbd39c0..000000000 --- a/compose-utils/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - `jewel-publish` - alias(libs.plugins.composeDesktop) -} - -dependencies { - api(compose.desktop.currentOs) { - exclude(group = "org.jetbrains.compose.material") - } - implementation(libs.kotlinx.serialization.json) -} diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ColorInterop.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ColorInterop.kt deleted file mode 100644 index 6ed699469..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ColorInterop.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.jetbrains.jewel.util - -import androidx.compose.ui.graphics.Color - -fun Color.toAwtColor() = java.awt.Color(red, green, blue, alpha) diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/IntExtensions.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/IntExtensions.kt deleted file mode 100644 index 39a5cd74a..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/IntExtensions.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.jetbrains.jewel.util - -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalDensity - -@Composable -fun Int.pxToDp() = with(LocalDensity.current) { this@pxToDp.toDp() } diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt deleted file mode 100644 index 7a6719b0f..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.jetbrains.jewel.util - -import androidx.compose.ui.Modifier - -inline fun Modifier.appendIf(condition: Boolean, transformer: Modifier.() -> Modifier): Modifier = - if (!condition) this else transformer() diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/OsUtils.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/OsUtils.kt deleted file mode 100644 index 254e8b80e..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/OsUtils.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.jetbrains.jewel.util - -private val osName = System.getProperty("os.name") - -fun isMacOs(): Boolean = osName.startsWith("mac", ignoreCase = true) - -fun isWindows(): Boolean = osName.startsWith("windows", ignoreCase = true) - -fun isLinux(): Boolean = osName.startsWith("linux", ignoreCase = true) diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/FileProvider.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/FileProvider.kt deleted file mode 100644 index 606f11563..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/FileProvider.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.jetbrains.jewel.util.font - -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map -import java.io.File - -fun Flow.asFileProviderFlow(origin: FileProvider.Origin) = - map { FileProvider(it.name, it.extension, it.absolutePath, origin) { it } } - -data class FileProvider( - val name: String, - val extension: String, - val path: String, - val origin: Origin, - val provider: () -> File, -) { - - enum class Origin { - SYSTEM_API, - FILESYSTEM, - CLASSPATH, - RESOURCES, - OTHER, - } -} diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/MacOsSystemProfilerFontListingOutput.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/MacOsSystemProfilerFontListingOutput.kt deleted file mode 100644 index 664ff5397..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/MacOsSystemProfilerFontListingOutput.kt +++ /dev/null @@ -1,83 +0,0 @@ -package org.jetbrains.jewel.util.font - -import kotlinx.serialization.KSerializer -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import kotlinx.serialization.descriptors.PrimitiveKind -import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor -import kotlinx.serialization.descriptors.SerialDescriptor -import kotlinx.serialization.encoding.Decoder -import kotlinx.serialization.encoding.Encoder - -@Serializable -internal data class MacOsSystemProfilerFontListingOutput( - @SerialName("SPFontsDataType") val fontData: List, -) { - - @Serializable - internal data class FontData( - @Serializable(with = AppleYesNoBooleanSerializer::class) - @SerialName("enabled") - val enabled: Boolean, - @SerialName("_name") val fontFileName: String, - @SerialName("path") val path: String, - @SerialName("type") val type: FontType, - @SerialName("typefaces") val typefaces: List, - @Serializable(with = AppleYesNoBooleanSerializer::class) - @SerialName("valid") - val valid: Boolean, - ) { - - @Serializable - internal data class Typeface( -// @Serializable(with = AppleYesNoBooleanSerializer::class) @SerialName("copy_protected") val copyProtected: Boolean, -// @SerialName("copyright") val copyright: String? = null, -// @SerialName("description") val description: String? = null, -// @SerialName("designer") val designer: String? = null, -// @Serializable(with = AppleYesNoBooleanSerializer::class) @SerialName("duplicate") val duplicate: Boolean, -// @Serializable(with = AppleYesNoBooleanSerializer::class) @SerialName("embeddable") val embeddable: Boolean, - @Serializable(with = AppleYesNoBooleanSerializer::class) - @SerialName("enabled") - val enabled: Boolean, - @SerialName("family") val fontFamilyName: String, - @SerialName("fullname") val fullName: String, - @SerialName("_name") val name: String, -// @Serializable(with = AppleYesNoBooleanSerializer::class) @SerialName("outline") val outline: Boolean, - @SerialName("style") val style: String, -// @SerialName("trademark") val trademark: String? = null, -// @SerialName("unique") val unique: String, - @Serializable(with = AppleYesNoBooleanSerializer::class) - @SerialName("valid") - val valid: Boolean, -// @SerialName("vendor") val vendor: String? = null, -// @SerialName("version") val version: String? = null - ) - } - - @Serializable - enum class FontType { - - @SerialName("postscript") - POSTSCRIPT, - - @SerialName("truetype") - TRUETYPE, - - @SerialName("opentype") - OPENTYPE, - - @SerialName("bitmap") - BITMAP, - } - - object AppleYesNoBooleanSerializer : KSerializer { - - override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("AppleYesNoBoolean", PrimitiveKind.STRING) - - override fun deserialize(decoder: Decoder): Boolean = decoder.decodeString().lowercase() == "yes" - - override fun serialize(encoder: Encoder, value: Boolean) { - encoder.encodeString(if (value) "yes" else "no") - } - } -} diff --git a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/SystemFontFamily.kt b/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/SystemFontFamily.kt deleted file mode 100644 index d870961f0..000000000 --- a/compose-utils/src/main/kotlin/org/jetbrains/jewel/util/font/SystemFontFamily.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.jetbrains.jewel.util.font - -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.platform.FileFont - -data class SystemFontFamily( - val name: String, - val fontFamily: FontFamily, - val fonts: List, -) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ba1a41021..2371ab585 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,10 +1,10 @@ plugins { + jewel `jewel-publish` alias(libs.plugins.composeDesktop) alias(libs.plugins.kotlinSerialization) } dependencies { - api(projects.composeUtils) - api(compose.desktop.common) + api(compose.desktop.currentOs) } diff --git a/core/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt b/core/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt new file mode 100644 index 000000000..0f4979796 --- /dev/null +++ b/core/src/main/kotlin/org/jetbrains/jewel/util/ModifierExtensions.kt @@ -0,0 +1,6 @@ +package org.jetbrains.jewel.util + +import androidx.compose.ui.Modifier + +inline fun Modifier.appendIf(precondition: Boolean, action: Modifier.() -> Modifier) = + if (precondition) action() else this diff --git a/ide-laf-bridge/build.gradle.kts b/ide-laf-bridge/build.gradle.kts index 4d9e0c5a7..263d0525e 100644 --- a/ide-laf-bridge/build.gradle.kts +++ b/ide-laf-bridge/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - alias(libs.plugins.composeDesktop) jewel `jewel-publish` + alias(libs.plugins.composeDesktop) } dependencies { - api(projects.themes.intUi.intUiStandalone) + api(projects.intUi.intUiStandalone) compileOnly(libs.bundles.idea) testImplementation(compose.desktop.uiTestJUnit4) diff --git a/themes/int-ui/int-ui-core/build.gradle.kts b/int-ui/int-ui-core/build.gradle.kts similarity index 96% rename from themes/int-ui/int-ui-core/build.gradle.kts rename to int-ui/int-ui-core/build.gradle.kts index ae05a9577..b94a0ec85 100644 --- a/themes/int-ui/int-ui-core/build.gradle.kts +++ b/int-ui/int-ui-core/build.gradle.kts @@ -1,6 +1,7 @@ @file:Suppress("UnstableApiUsage") plugins { + jewel `jewel-publish` alias(libs.plugins.composeDesktop) `intellij-theme-generator` @@ -8,7 +9,6 @@ plugins { dependencies { api(projects.core) - api(projects.composeUtils) } intelliJThemeGenerator { @@ -35,4 +35,3 @@ tasks { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } } - diff --git a/themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt similarity index 100% rename from themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt diff --git a/themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt similarity index 100% rename from themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt diff --git a/themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt similarity index 100% rename from themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt diff --git a/themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt similarity index 100% rename from themes/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt diff --git a/themes/int-ui/int-ui-standalone/build.gradle.kts b/int-ui/int-ui-standalone/build.gradle.kts similarity index 66% rename from themes/int-ui/int-ui-standalone/build.gradle.kts rename to int-ui/int-ui-standalone/build.gradle.kts index 84c0531e4..fd6cb3fc4 100644 --- a/themes/int-ui/int-ui-standalone/build.gradle.kts +++ b/int-ui/int-ui-standalone/build.gradle.kts @@ -1,8 +1,9 @@ plugins { + jewel `jewel-publish` alias(libs.plugins.composeDesktop) } dependencies { - api(projects.themes.intUi.intUiCore) + api(projects.intUi.intUiCore) } diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Black.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Black.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Black.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Black.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Bold.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Bold.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Bold.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Bold.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraBold.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraBold.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraBold.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraBold.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraLight.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraLight.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraLight.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-ExtraLight.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Light.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Light.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Light.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Light.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Medium.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Medium.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Medium.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Medium.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Regular.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Regular.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Regular.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Regular.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-SemiBold.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-SemiBold.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-SemiBold.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-SemiBold.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Thin.ttf b/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Thin.ttf similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Thin.ttf rename to int-ui/int-ui-standalone/src/main/resources/fonts/inter/Inter-Thin.ttf diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/add.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/add.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/add.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/add.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/add_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/add_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/add_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/add_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxDisabled_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxFocused_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedDisabled_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelectedFocused_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxIndeterminateSelected_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedDisabled_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelectedFocused_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBoxSelected_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/checkBox_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronDown_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/chevronRight_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallHovered_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmallSelectedHovered_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/closeSmall_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/externalLink.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/externalLink.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/externalLink.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/externalLink.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radio.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioDisabled_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioFocused_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedDisabled_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelectedFocused_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radioSelected_dark.svg diff --git a/themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio_dark.svg similarity index 100% rename from themes/int-ui/int-ui-standalone/src/main/resources/icons/intui/radio_dark.svg rename to int-ui/int-ui-standalone/src/main/resources/icons/intui/radio_dark.svg diff --git a/samples/ide-plugin/build.gradle.kts b/samples/ide-plugin/build.gradle.kts index 1d94eafbd..3a26f937e 100644 --- a/samples/ide-plugin/build.gradle.kts +++ b/samples/ide-plugin/build.gradle.kts @@ -21,7 +21,5 @@ repositories { } dependencies { - implementation(compose.desktop.currentOs) - implementation(projects.themes.intUi.intUiStandalone) implementation(projects.ideLafBridge) } diff --git a/samples/standalone/build.gradle.kts b/samples/standalone/build.gradle.kts index d85aa0ea4..320666bc5 100644 --- a/samples/standalone/build.gradle.kts +++ b/samples/standalone/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } dependencies { - implementation(projects.themes.intUi.intUiStandalone) + implementation(projects.intUi.intUiStandalone) } compose.desktop { diff --git a/settings.gradle.kts b/settings.gradle.kts index fb82b11f0..2ef0906cc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,10 +26,9 @@ dependencyResolutionManagement { include( ":core", - ":compose-utils", ":ide-laf-bridge", ":samples:standalone", ":samples:ide-plugin", - ":themes:int-ui:int-ui-core", - ":themes:int-ui:int-ui-standalone", + ":int-ui:int-ui-core", + ":int-ui:int-ui-standalone", ) diff --git a/themes/darcula/darcula-standalone/build.gradle.kts b/themes/darcula/darcula-standalone/build.gradle.kts deleted file mode 100644 index 28fbbe8b3..000000000 --- a/themes/darcula/darcula-standalone/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -plugins { - jewel - alias(libs.plugins.composeDesktop) -} - -dependencies { - api(projects.core) -} diff --git a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/IntelliJThemeDefinition.kt b/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/IntelliJThemeDefinition.kt deleted file mode 100644 index ad36b51d6..000000000 --- a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/IntelliJThemeDefinition.kt +++ /dev/null @@ -1,38 +0,0 @@ -package org.jetbrains.jewel.themes.darcula.standalone - -import androidx.compose.runtime.Composable -import org.jetbrains.jewel.IntelliJMetrics -import org.jetbrains.jewel.IntelliJPainters -import org.jetbrains.jewel.IntelliJPalette -import org.jetbrains.jewel.IntelliJTypography -import org.jetbrains.jewel.IntelliJTheme as BaseIntelliJTheme - -@Composable -fun IntelliJTheme(isDark: Boolean, content: @Composable () -> Unit) = - BaseIntelliJTheme( - if (isDark) IntelliJPalette.darcula else IntelliJPalette.light, - IntelliJMetrics.default, - if (isDark) IntelliJPainters.darcula else IntelliJPainters.light, - if (isDark) IntelliJTypography.darcula else IntelliJTypography.light, - content - ) - -@Composable -fun IntelliJThemeLight(content: @Composable () -> Unit) = - BaseIntelliJTheme( - IntelliJPalette.light, - IntelliJMetrics.default, - IntelliJPainters.light, - IntelliJTypography.light, - content - ) - -@Composable -fun IntelliJThemeDark(content: @Composable () -> Unit) = - BaseIntelliJTheme( - IntelliJPalette.darcula, - IntelliJMetrics.default, - IntelliJPainters.darcula, - IntelliJTypography.darcula, - content - ) diff --git a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/MetricsExtensions.kt b/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/MetricsExtensions.kt deleted file mode 100644 index 2993c2dc7..000000000 --- a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/MetricsExtensions.kt +++ /dev/null @@ -1,50 +0,0 @@ -package org.jetbrains.jewel.themes.darcula.standalone - -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.shape.CornerSize -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.IntelliJMetrics -import org.jetbrains.jewel.util.isMacOs - -val IntelliJMetrics.Button.Companion.default - get() = IntelliJMetrics.Button( - strokeWidth = 1.dp, - arc = CornerSize(3.dp), - padding = PaddingValues(horizontal = 14.dp, vertical = 4.dp) - ) - -val IntelliJMetrics.Companion.default - get() = IntelliJMetrics( - singlePadding = 8.dp, - controlFocusHaloWidth = 2.dp, - controlFocusHaloArc = 4.dp, - controlArc = 3.dp, - button = IntelliJMetrics.Button.default, - separator = IntelliJMetrics.Separator.default, - scrollbar = if (isMacOs()) IntelliJMetrics.Scrollbar.macOs else IntelliJMetrics.Scrollbar.default, - treeView = IntelliJMetrics.TreeView.default - ) - -val IntelliJMetrics.TreeView.Companion.default - get() = IntelliJMetrics.TreeView( - indentWidth = 24.dp, - arrowEndPadding = 4.dp - ) - -val IntelliJMetrics.Scrollbar.Companion.default - get() = IntelliJMetrics.Scrollbar( - minSize = 13.dp, // myThickness * 2 (see DefaultScrollBarUI.updateThumbBounds) - thickness = 13.dp, // myThickness - thumbCornerSize = CornerSize(0.dp) // See com.intellij.ui.components.ScrollBarPainter.Thumb.paint - ) - -val IntelliJMetrics.Scrollbar.Companion.macOs - get() = IntelliJMetrics.Scrollbar( - minSize = 13.dp, // myThickness * 2 (see DefaultScrollBarUI.updateThumbBounds) - thickness = 14.dp, // myThickness - thumbCornerSize = CornerSize(14.dp) // See com.intellij.ui.components.ScrollBarPainter.Thumb.paint - ) - -val IntelliJMetrics.Separator.Companion.default - get() = IntelliJMetrics.Separator(strokeWidth = Dp.Hairline) diff --git a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaintersExtension.kt b/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaintersExtension.kt deleted file mode 100644 index ca57c7df7..000000000 --- a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaintersExtension.kt +++ /dev/null @@ -1,76 +0,0 @@ -package org.jetbrains.jewel.themes.darcula.standalone - -import androidx.compose.ui.res.painterResource -import org.jetbrains.jewel.DarkIconResourceLoader -import org.jetbrains.jewel.IntelliJPainters - -val IntelliJPainters.Companion.light - get() = IntelliJPainters( - checkbox = IntelliJPainters.CheckboxPainters.light, - radioButton = IntelliJPainters.RadioButtonPainters.light, - treeView = IntelliJPainters.TreeViewPainters.light - ) - -val IntelliJPainters.Companion.darcula - get() = IntelliJPainters( - checkbox = IntelliJPainters.CheckboxPainters.darcula, - radioButton = IntelliJPainters.RadioButtonPainters.darcula, - treeView = IntelliJPainters.TreeViewPainters.darcula, - painterResourceLoader = DarkIconResourceLoader - ) - -val IntelliJPainters.CheckboxPainters.Companion.light - get() = IntelliJPainters.CheckboxPainters( - unselected = { painterResource("intellij/checkBox.svg") }, - unselectedDisabled = { painterResource("intellij/checkBoxDisabled.svg") }, - unselectedFocused = { painterResource("intellij/checkBoxFocused.svg") }, - selected = { painterResource("intellij/checkBoxSelected.svg") }, - selectedDisabled = { painterResource("intellij/checkBoxSelectedDisabled.svg") }, - selectedFocused = { painterResource("intellij/checkBoxSelectedFocused.svg") }, - indeterminate = { painterResource("intellij/checkBoxIndeterminateSelected.svg") }, - indeterminateDisabled = { painterResource("intellij/checkBoxIndeterminateSelectedDisabled.svg") }, - indeterminateFocused = { painterResource("intellij/checkBoxIndeterminateSelectedFocused.svg") } - ) - -val IntelliJPainters.CheckboxPainters.Companion.darcula - get() = IntelliJPainters.CheckboxPainters( - unselected = { painterResource("darcula/checkBox.svg") }, - unselectedDisabled = { painterResource("darcula/checkBoxDisabled.svg") }, - unselectedFocused = { painterResource("darcula/checkBoxFocused.svg") }, - selected = { painterResource("darcula/checkBoxSelected.svg") }, - selectedDisabled = { painterResource("darcula/checkBoxSelectedDisabled.svg") }, - selectedFocused = { painterResource("darcula/checkBoxSelectedFocused.svg") }, - indeterminate = { painterResource("darcula/checkBoxIndeterminateSelected.svg") }, - indeterminateDisabled = { painterResource("darcula/checkBoxIndeterminateSelectedDisabled.svg") }, - indeterminateFocused = { painterResource("darcula/checkBoxIndeterminateSelectedFocused.svg") } - ) - -val IntelliJPainters.RadioButtonPainters.Companion.light - get() = IntelliJPainters.RadioButtonPainters( - unselected = { painterResource("intellij/radio.svg") }, - unselectedDisabled = { painterResource("intellij/radioDisabled.svg") }, - unselectedFocused = { painterResource("intellij/radioFocused.svg") }, - selected = { painterResource("intellij/radioSelected.svg") }, - selectedDisabled = { painterResource("intellij/radioSelectedDisabled.svg") }, - selectedFocused = { painterResource("intellij/radioSelectedFocused.svg") } - ) - -val IntelliJPainters.RadioButtonPainters.Companion.darcula - get() = IntelliJPainters.RadioButtonPainters( - unselected = { painterResource("darcula/radio.svg") }, - unselectedDisabled = { painterResource("darcula/radioDisabled.svg") }, - unselectedFocused = { painterResource("darcula/radioFocused.svg") }, - selected = { painterResource("darcula/radioSelected.svg") }, - selectedDisabled = { painterResource("darcula/radioSelectedDisabled.svg") }, - selectedFocused = { painterResource("darcula/radioSelectedFocused.svg") } - ) - -val IntelliJPainters.TreeViewPainters.Companion.light - get() = IntelliJPainters.TreeViewPainters( - arrow = { painterResource("intellij/chevron-right.svg") } - ) - -val IntelliJPainters.TreeViewPainters.Companion.darcula - get() = IntelliJPainters.TreeViewPainters( - arrow = { painterResource("darcula/chevron-right.svg") } - ) diff --git a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaletteExtensions.kt b/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaletteExtensions.kt deleted file mode 100644 index 3945fa72b..000000000 --- a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/PaletteExtensions.kt +++ /dev/null @@ -1,224 +0,0 @@ -package org.jetbrains.jewel.themes.darcula.standalone - -import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.IntelliJPalette -import org.jetbrains.jewel.toBrush -import org.jetbrains.jewel.util.isMacOs - -@Suppress("unused") -val Color.Companion.IntelliJWhite - get() = Color(0xFFF2F2F2) - -@Suppress("unused") -val Color.Companion.IntelliJGrey - get() = Color(0xFF3C3F41) - -val Color.Companion.IntelliJDarculaSelection - get() = Color(0xFF4B6EAF) - -val Color.Companion.IntelliJLightSelection - get() = Color(0xFF2675BF) - -val IntelliJPalette.Checkbox.Companion.light - get() = IntelliJPalette.Checkbox( - background = Color.IntelliJWhite, - foreground = Color.Black, - foregroundDisabled = Color(0xFF8C8C8C) - ) - -val IntelliJPalette.Checkbox.Companion.darcula - get() = IntelliJPalette.Checkbox( - background = Color.IntelliJGrey, - foreground = Color(0xFFBBBBBB), - foregroundDisabled = Color(0xFF999999) - ) - -val IntelliJPalette.RadioButton.Companion.light - get() = IntelliJPalette.RadioButton( - background = Color.IntelliJWhite, - foreground = Color.Black, - foregroundDisabled = Color(0xFF8C8C8C) - ) - -val IntelliJPalette.RadioButton.Companion.darcula - get() = IntelliJPalette.RadioButton( - background = Color.IntelliJGrey, - foreground = Color(0xFFBBBBBB), - foregroundDisabled = Color(0xFF999999) - ) - -val IntelliJPalette.TextField.Companion.light - get() = IntelliJPalette.TextField( - background = Color(0xFFFFFFFF), - backgroundDisabled = Color.IntelliJWhite, - foreground = Color.Black, - foregroundDisabled = Color(0xFF8C8C8C) - ) - -val IntelliJPalette.TextField.Companion.darcula - get() = IntelliJPalette.TextField( - background = Color(0xFF45494A), - backgroundDisabled = Color.IntelliJGrey, - foreground = Color(0xFFBBBBBB), - foregroundDisabled = Color(0xFF777777) - ) - -val IntelliJPalette.Button.Companion.light - get() = IntelliJPalette.Button( - background = Color(0xFFFFFFFF).toBrush(), - foreground = Color.Black, - foregroundDisabled = Color(0xFF8C8C8C), - shadow = Color(0x00A6A6A6), - stroke = Color(0XFFC4C4C4).toBrush(), - strokeFocused = Color(0xFF87AFDA), - strokeDisabled = Color(0xFFCFCFCF), - defaultBackground = Brush.verticalGradient(listOf(Color(0xFF528CC7), Color(0xFF4989CC))), - defaultForeground = Color.White, - defaultStroke = Color(0xFF487EB8).toBrush(), // Brush.verticalGradient(listOf(Color(0xFF487EB8), Color(0xFF346DAD))), - defaultStrokeFocused = Color(0xFFA9C9F5), - defaultShadow = Color(0x00A6A6A6) - ) - -val IntelliJPalette.Button.Companion.darcula - get() = IntelliJPalette.Button( - background = Color(0xFF4C5052).toBrush(), - foreground = Color(0xFFBBBBBB), - foregroundDisabled = Color(0xFF777777), - shadow = Color(0xFF999999), - stroke = Color(0XFF5E6060).toBrush(), - strokeFocused = Color(0xFF466D94), - strokeDisabled = Color(0xFF5E6060), - defaultBackground = Color(0xFF365880).toBrush(), - defaultForeground = Color(0xFFBBBBBB), - defaultStroke = Color(0xFF4C708C).toBrush(), - defaultStrokeFocused = Color(0xFFA9C9F5), - defaultShadow = Color.Unspecified - ) - -val IntelliJPalette.Separator.Companion.light - get() = IntelliJPalette.Separator( - color = Color(0xFFD1D1D1), - background = Color.Unspecified - ) - -val IntelliJPalette.Separator.Companion.darcula - get() = IntelliJPalette.Separator( - color = Color(0xFF515151), - background = Color.Unspecified - ) - -val IntelliJPalette.Scrollbar.Companion.light - get() = IntelliJPalette.Scrollbar( - thumbIdleColor = if (isMacOs()) Color(0x00000000) else Color(0x33737373), - thumbHoverColor = if (isMacOs()) Color(0x80000000) else Color(0x47737373) - ) - -val IntelliJPalette.Scrollbar.Companion.darcula - get() = IntelliJPalette.Scrollbar( - thumbIdleColor = if (isMacOs()) Color(0x00808080) else Color(0x47A6A6A6), - thumbHoverColor = if (isMacOs()) Color(0x8C808080) else Color(0x59A6A6A6) - ) - -val IntelliJPalette.Tab.Companion.light - get() = IntelliJPalette.Tab( - underlineColor = Color(0xFF4083c9), - hoveredBackgroundColor = Color(0xFFD9D9D9), - tabSelectionHeight = 3.dp - ) - -val IntelliJPalette.Tab.Companion.darcula - get() = IntelliJPalette.Tab( - underlineColor = Color(0xFF4A88C7), - hoveredBackgroundColor = Color(0xFF2E3133), - tabSelectionHeight = 3.dp - ) - -val IntelliJPalette.Companion.light - get() = IntelliJPalette( - isLight = true, - button = IntelliJPalette.Button.light, - checkbox = IntelliJPalette.Checkbox.light, - radioButton = IntelliJPalette.RadioButton.light, - textField = IntelliJPalette.TextField.light, - background = Color.IntelliJWhite, - text = Color.Black, - textDisabled = Color(0xFF8C8C8C), - controlStroke = Color(0xFFC4C4C4), - controlStrokeDisabled = Color(0xFFCFCFCF), - controlStrokeFocused = Color(0XFF87AFDA), // Component.focusedBorderColor - controlFocusHalo = Color(0XFF97C3F3), - controlInactiveHaloError = Color(0XFFEBBCBC), - controlInactiveHaloWarning = Color(0XFFFFD385), - controlHaloError = Color(0XFFE53E4D), - controlHaloWarning = Color(0XFFE2A53A), - separator = IntelliJPalette.Separator.light, - scrollbar = IntelliJPalette.Scrollbar.light, - treeView = IntelliJPalette.TreeView.Companion.light, - slider = IntelliJPalette.Slider.Companion.light, - tab = IntelliJPalette.Tab.light, - progressBar = IntelliJPalette.ProgressBar.light - ) - -val IntelliJPalette.Companion.darcula - get() = IntelliJPalette( - isLight = false, - button = IntelliJPalette.Button.darcula, - checkbox = IntelliJPalette.Checkbox.darcula, - textField = IntelliJPalette.TextField.darcula, - radioButton = IntelliJPalette.RadioButton.darcula, - background = Color.IntelliJGrey, - text = Color(0xFFBBBBBB), - textDisabled = Color(0xFF777777), - controlStroke = Color(0xFF646464), - controlStrokeDisabled = Color(0xFF646464), - controlStrokeFocused = Color(0XFF466D94), - controlFocusHalo = Color(0XFF3D6185), - controlInactiveHaloError = Color(0XFF725252), - controlInactiveHaloWarning = Color(0XFF6E5324), - controlHaloError = Color(0XFF8B3C3C), - controlHaloWarning = Color(0XFFAC7920), - separator = IntelliJPalette.Separator.darcula, - scrollbar = IntelliJPalette.Scrollbar.darcula, - treeView = IntelliJPalette.TreeView.darcula, - slider = IntelliJPalette.Slider.darcula, - tab = IntelliJPalette.Tab.darcula, - progressBar = IntelliJPalette.ProgressBar.darcula - ) - -val IntelliJPalette.TreeView.Companion.light - get() = IntelliJPalette.TreeView( - focusedSelectedElementBackground = Color.IntelliJLightSelection, - background = Color.White - ) - -val IntelliJPalette.TreeView.Companion.darcula - get() = IntelliJPalette.TreeView( - focusedSelectedElementBackground = Color.IntelliJDarculaSelection, - background = Color.IntelliJGrey - ) - -val IntelliJPalette.Slider.Companion.light - get() = IntelliJPalette.Slider( - foreground = Color.Black, - background = Color.IntelliJWhite - ) - -val IntelliJPalette.Slider.Companion.darcula - get() = IntelliJPalette.Slider( - foreground = Color(0xFFBBBBBB), - background = Color.IntelliJGrey - ) - -val IntelliJPalette.ProgressBar.Companion.light - get() = IntelliJPalette.ProgressBar( - foreground = Color(0xFF1E82E6), - background = Color(0xFFD5D5D5) - ) - -val IntelliJPalette.ProgressBar.Companion.darcula - get() = IntelliJPalette.ProgressBar( - foreground = Color(0xFFA0A0A0), - background = Color(0xFF555555) - ) diff --git a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/TypographyExtensions.kt b/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/TypographyExtensions.kt deleted file mode 100644 index cf13c5175..000000000 --- a/themes/darcula/darcula-standalone/src/main/kotlin/org/jetbrains/jewel/themes/darcula/standalone/TypographyExtensions.kt +++ /dev/null @@ -1,47 +0,0 @@ -package org.jetbrains.jewel.themes.darcula.standalone - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontStyle -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp -import org.jetbrains.jewel.IntelliJTypography - -val TextStyle.Companion.IntelliJLight - get() = TextStyle( - color = Color.Black, - fontSize = 12.sp, - fontWeight = FontWeight.Normal, - fontStyle = FontStyle.Normal, - fontFamily = FontFamily.Default - ) - -val TextStyle.Companion.IntelliJDark - get() = TextStyle( - color = Color(0xFFBBBBBB), - fontSize = 12.sp, - fontWeight = FontWeight.Normal, - fontStyle = FontStyle.Normal, - fontFamily = FontFamily.Default - ) - -val IntelliJTypography.Companion.light - get() = IntelliJTypography( - default = TextStyle.IntelliJLight, - button = TextStyle.IntelliJLight, - checkBox = TextStyle.IntelliJLight, - radioButton = TextStyle.IntelliJLight, - textField = TextStyle.IntelliJLight, - slider = TextStyle.IntelliJLight - ) - -val IntelliJTypography.Companion.darcula - get() = IntelliJTypography( - default = TextStyle.IntelliJDark, - button = TextStyle.IntelliJDark, - checkBox = TextStyle.IntelliJDark, - radioButton = TextStyle.IntelliJDark, - textField = TextStyle.IntelliJDark, - slider = TextStyle.IntelliJDark - ) diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBox.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBox.svg deleted file mode 100644 index eb616c4d1..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBox.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxDisabled.svg deleted file mode 100644 index 3cb2f331f..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxDisabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxFocused.svg deleted file mode 100644 index fa2929909..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxFocused.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelected.svg deleted file mode 100644 index 976a46f7f..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelected.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedDisabled.svg deleted file mode 100644 index f2b5058b2..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedDisabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedFocused.svg deleted file mode 100644 index b09b54326..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxIndeterminateSelectedFocused.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelected.svg deleted file mode 100644 index f2bbe5257..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelected.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedDisabled.svg deleted file mode 100644 index a37d51ad6..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedDisabled.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedFocused.svg deleted file mode 100644 index 2015fd57b..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/checkBoxSelectedFocused.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/chevron-right.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/chevron-right.svg deleted file mode 100644 index 2358d096b..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/chevron-right.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radio.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radio.svg deleted file mode 100644 index 0966b527e..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radio.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radioDisabled.svg deleted file mode 100644 index 726444d0b..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioDisabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radioFocused.svg deleted file mode 100644 index 6055b41bb..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioFocused.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelected.svg deleted file mode 100644 index cf828da62..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelected.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedDisabled.svg deleted file mode 100644 index 3f0aba70d..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedDisabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedFocused.svg deleted file mode 100644 index 08fd09979..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/darcula/radioSelectedFocused.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBox.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBox.svg deleted file mode 100644 index 9187db885..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBox.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxDisabled.svg deleted file mode 100644 index 4c7bfe237..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxDisabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxFocused.svg deleted file mode 100644 index 689aecc89..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxFocused.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelected.svg deleted file mode 100644 index c5689705f..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelected.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedDisabled.svg deleted file mode 100644 index bb976bbad..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedDisabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedFocused.svg deleted file mode 100644 index 4769f24ee..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxIndeterminateSelectedFocused.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelected.svg deleted file mode 100644 index 5da17141a..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelected.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedDisabled.svg deleted file mode 100644 index be1311c9e..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedDisabled.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedFocused.svg deleted file mode 100644 index 81069249e..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkBoxSelectedFocused.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmark.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmark.svg deleted file mode 100644 index 14109dfcd..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkDisabled.svg deleted file mode 100644 index 77c8948e0..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkDisabled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkSelected.svg deleted file mode 100644 index ae638a899..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/checkmarkSelected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/chevron-right.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/chevron-right.svg deleted file mode 100644 index f6f906772..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/chevron-right.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radio.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radio.svg deleted file mode 100644 index de3bfd77a..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radio.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radioDisabled.svg deleted file mode 100644 index 2bd8de1ca..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioDisabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radioFocused.svg deleted file mode 100644 index 434d5d462..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioFocused.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelected.svg deleted file mode 100644 index 4b98a0d13..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelected.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedDisabled.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedDisabled.svg deleted file mode 100644 index d18e7ceb3..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedDisabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedFocused.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedFocused.svg deleted file mode 100644 index 24991349b..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/radioSelectedFocused.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsed.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsed.svg deleted file mode 100644 index abe2acd3c..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsed.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsedSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsedSelected.svg deleted file mode 100644 index 6ab2931a4..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeCollapsedSelected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpanded.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpanded.svg deleted file mode 100644 index 8482a24d5..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpanded.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpandedSelected.svg b/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpandedSelected.svg deleted file mode 100644 index 9877f1e6f..000000000 --- a/themes/darcula/darcula-standalone/src/main/resources/intellij/treeExpandedSelected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -