From 3f24acae801301a48953974f443c565e40543d5e Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Wed, 24 Jul 2024 10:47:11 +0200 Subject: [PATCH] Rename palette entry grey -> gray (#486) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The name was changed in 242 to reflect the fact that everything else is named in en-US, and for consistency with the Int UI specs. This change aligns us to that, leaving a deprecated grey accessor in ThemeColorPalette for backwards compat. The lookup function also accepts both spellings for the time being. This also bumps the theme generator to target IJP 242. Note that some of these changes will not be ported to earlier releases — only the ThemeColorPalette property name changes and lookup behaviour — since in 233 and 241 the keys are still named in en-GB in the theme json --- .../theme/IntUiThemeDescriptorReader.kt | 20 +---- foundation/api/foundation.api | 4 +- .../foundation/theme/ThemeColorPalette.kt | 17 +++-- .../bridge/theme/BridgeThemeColorPalette.kt | 6 +- .../window/styling/IntUiTitleBarStyling.kt | 36 ++++----- int-ui/int-ui-standalone/build.gradle.kts | 2 +- .../standalone/styling/IntUiButtonStyling.kt | 74 +++++++++---------- .../styling/IntUiCheckboxStyling.kt | 4 +- .../standalone/styling/IntUiChipStyling.kt | 38 +++++----- .../standalone/styling/IntUiDividerStyle.kt | 4 +- .../styling/IntUiDropdownStyling.kt | 48 ++++++------ .../styling/IntUiGroupHeaderStyling.kt | 4 +- .../IntUiHorizontalProgressBarStyling.kt | 4 +- .../styling/IntUiIconButtonStyling.kt | 16 ++-- .../styling/IntUiLazyTreeStyling.kt | 4 +- .../standalone/styling/IntUiLinkStyling.kt | 4 +- .../standalone/styling/IntUiMenuStyling.kt | 40 +++++----- .../styling/IntUiRadioButtonStyling.kt | 4 +- .../IntUiSegmentedControlButtonStyling.kt | 32 ++++---- .../styling/IntUiSegmentedControlStyling.kt | 10 +-- .../standalone/styling/IntUiSliderStyling.kt | 34 ++++----- .../standalone/styling/IntUiTabStyling.kt | 8 +- .../styling/IntUiTextAreaStyling.kt | 28 +++---- .../styling/IntUiTextFieldStyling.kt | 28 +++---- .../standalone/styling/IntUiTooltipStyling.kt | 10 +-- .../standalone/theme/IntUiGlobalColors.kt | 32 ++++---- markdown/README.md | 2 +- .../styling/IntUiMarkdownStyling.kt | 4 +- .../standalone/view/component/Borders.kt | 2 +- .../standalone/view/component/ChipsAndTree.kt | 4 +- 30 files changed, 257 insertions(+), 266 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt index 6697b039f..8bed36f92 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt +++ b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt @@ -4,10 +4,8 @@ import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.CodeBlock import com.squareup.kotlinpoet.FileSpec import com.squareup.kotlinpoet.KModifier -import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy import com.squareup.kotlinpoet.PropertySpec import com.squareup.kotlinpoet.TypeSpec -import com.squareup.kotlinpoet.asTypeName import com.squareup.kotlinpoet.joinToCode import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive @@ -15,7 +13,7 @@ import kotlinx.serialization.json.JsonPrimitive internal object IntUiThemeDescriptorReader { private val colorGroups = - setOf("Grey", "Blue", "Green", "Red", "Yellow", "Orange", "Purple", "Teal") + setOf("Gray", "Blue", "Green", "Red", "Yellow", "Orange", "Purple", "Teal") private val colorClassName = ClassName("androidx.compose.ui.graphics", "Color") fun readThemeFrom( @@ -136,20 +134,4 @@ internal object IntUiThemeDescriptorReader { private inline fun Map.toMapCodeBlock() = entries.map { (key, value) -> CodeBlock.of("\"%L\" to \"%L\"", key, value) } .joinToCode(prefix = "mapOf(", separator = ",\n", suffix = ")") - - private inline fun createOverrideStringMapProperty( - name: String, - values: Map, - ) = - PropertySpec.builder( - name = name, - type = Map::class.asTypeName().parameterizedBy(K::class.asTypeName(), V::class.asTypeName()), - KModifier.OVERRIDE - ) - .initializer( - values.entries - .map { (key, value) -> CodeBlock.of("\"%L\" to \"%L\"", key, value) } - .joinToCode(prefix = "mapOf(", separator = ",\n", suffix = ")") - ) - .build() } diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api index dadc8fdb4..823feb411 100644 --- a/foundation/api/foundation.api +++ b/foundation/api/foundation.api @@ -806,14 +806,16 @@ public final class org/jetbrains/jewel/foundation/theme/ThemeColorPalette { public final fun blueOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; public fun equals (Ljava/lang/Object;)Z public final fun getBlue ()Ljava/util/List; + public final fun getGray ()Ljava/util/List; public final fun getGreen ()Ljava/util/List; - public final fun getGrey ()Ljava/util/List; public final fun getOrange ()Ljava/util/List; public final fun getPurple ()Ljava/util/List; public final fun getRawMap ()Ljava/util/Map; public final fun getRed ()Ljava/util/List; public final fun getTeal ()Ljava/util/List; public final fun getYellow ()Ljava/util/List; + public final fun gray-vNxB06k (I)J + public final fun grayOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; public final fun green-vNxB06k (I)J public final fun greenOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; public final fun grey-vNxB06k (I)J diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt index 77530e744..fa923e056 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt @@ -7,10 +7,11 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions private val colorKeyRegex: Regex get() = "([a-z]+)(\\d+)".toRegex(RegexOption.IGNORE_CASE) +@Suppress("MemberVisibilityCanBePrivate") @Immutable @GenerateDataFunctions public class ThemeColorPalette( - public val grey: List, + public val gray: List, public val blue: List, public val green: List, public val red: List, @@ -20,9 +21,15 @@ public class ThemeColorPalette( public val teal: List, public val rawMap: Map, ) { - public fun grey(index: Int): Color = grey[index - 1] + @Deprecated("Use gray() instead", ReplaceWith("gray(index)")) + public fun grey(index: Int): Color = gray(index) - public fun greyOrNull(index: Int): Color? = grey.getOrNull(index - 1) + @Deprecated("Use grayOrNull() instead", ReplaceWith("grayOrNull(index)")) + public fun greyOrNull(index: Int): Color? = grayOrNull(index) + + public fun gray(index: Int): Color = gray[index - 1] + + public fun grayOrNull(index: Int): Color? = gray.getOrNull(index - 1) public fun blue(index: Int): Color = blue[index - 1] @@ -62,7 +69,7 @@ public class ThemeColorPalette( } return when (colorGroup) { - "grey" -> grey(colorIndex) + "grey", "gray" -> gray(colorIndex) "blue" -> blue(colorIndex) "green" -> green(colorIndex) "red" -> red(colorIndex) @@ -77,7 +84,7 @@ public class ThemeColorPalette( public companion object { public val Empty: ThemeColorPalette = ThemeColorPalette( - grey = emptyList(), + gray = emptyList(), blue = emptyList(), green = emptyList(), red = emptyList(), diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt index efad18bff..0f66cfd73 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt @@ -13,7 +13,7 @@ public val ThemeColorPalette.windowsPopupBorder: Color? get() = lookup("windowsPopupBorder") public fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette { - val grey = readPaletteColors("Grey") + val gray = readPaletteColors("Grey") val blue = readPaletteColors("Blue") val green = readPaletteColors("Green") val red = readPaletteColors("Red") @@ -25,7 +25,7 @@ public fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette { val rawMap = buildMap { - putAll(grey) + putAll(gray) putAll(blue) putAll(green) putAll(red) @@ -37,7 +37,7 @@ public fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette { } return ThemeColorPalette( - grey = grey.values.toList(), + gray = gray.values.toList(), blue = blue.values.toList(), green = green.values.toList(), red = red.values.toList(), diff --git a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt index 267f9fd96..3736ffe3e 100644 --- a/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt +++ b/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt @@ -205,10 +205,10 @@ private fun titleBarIconButtonStyle( @Composable public fun TitleBarColors.Companion.light( - backgroundColor: Color = IntUiLightTheme.colors.grey(2), - inactiveBackground: Color = IntUiLightTheme.colors.grey(3), - contentColor: Color = IntUiLightTheme.colors.grey(12), - borderColor: Color = IntUiLightTheme.colors.grey(4), + backgroundColor: Color = IntUiLightTheme.colors.gray(2), + inactiveBackground: Color = IntUiLightTheme.colors.gray(3), + contentColor: Color = IntUiLightTheme.colors.gray(12), + borderColor: Color = IntUiLightTheme.colors.gray(4), fullscreenControlButtonsBackground: Color = Color(0xFF7A7B80), // Color hex from // com.intellij.util.ui.JBUI.CurrentTheme.CustomFrameDecorations.titlePaneButtonHoveredBackground @@ -220,8 +220,8 @@ public fun TitleBarColors.Companion.light( // com.intellij.openapi.wm.impl.customFrameDecorations.CustomFrameTitleButtons.closeStyleBuilder titlePaneCloseButtonHoveredBackground: Color = Color(0xFFE81123), titlePaneCloseButtonPressedBackground: Color = Color(0xFFF1707A), - iconButtonHoveredBackground: Color = IntUiLightTheme.colors.grey(3), - iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(3), + iconButtonHoveredBackground: Color = IntUiLightTheme.colors.gray(3), + iconButtonPressedBackground: Color = IntUiLightTheme.colors.gray(3), // There are two fields in theme.json: transparentHoveredBackground and hoveredBackground, // but in com.intellij.ide.ui.laf.darcula.ui.ToolbarComboWidgetUI#paintBackground, // transparentHoveredBackground is used first, which is guessed to be due to the gradient @@ -251,17 +251,17 @@ public fun TitleBarColors.Companion.light( @Composable public fun TitleBarColors.Companion.lightWithLightHeader( - backgroundColor: Color = IntUiLightTheme.colors.grey(13), - inactiveBackground: Color = IntUiLightTheme.colors.grey(12), + backgroundColor: Color = IntUiLightTheme.colors.gray(13), + inactiveBackground: Color = IntUiLightTheme.colors.gray(12), fullscreenControlButtonsBackground: Color = Color(0xFF7A7B80), - contentColor: Color = IntUiLightTheme.colors.grey(1), - borderColor: Color = IntUiLightTheme.colors.grey(11), + contentColor: Color = IntUiLightTheme.colors.gray(1), + borderColor: Color = IntUiLightTheme.colors.gray(11), titlePaneButtonHoveredBackground: Color = Color(0x1A000000), titlePaneButtonPressedBackground: Color = titlePaneButtonHoveredBackground, titlePaneCloseButtonHoveredBackground: Color = Color(0xFFE81123), titlePaneCloseButtonPressedBackground: Color = Color(0xFFF1707A), - iconButtonHoveredBackground: Color = IntUiLightTheme.colors.grey(12), - iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(11), + iconButtonHoveredBackground: Color = IntUiLightTheme.colors.gray(12), + iconButtonPressedBackground: Color = IntUiLightTheme.colors.gray(11), dropdownHoveredBackground: Color = Color(0x0D000000), dropdownPressedBackground: Color = dropdownHoveredBackground, ): TitleBarColors = @@ -283,17 +283,17 @@ public fun TitleBarColors.Companion.lightWithLightHeader( @Composable public fun TitleBarColors.Companion.dark( - backgroundColor: Color = IntUiDarkTheme.colors.grey(2), - inactiveBackground: Color = IntUiDarkTheme.colors.grey(3), + backgroundColor: Color = IntUiDarkTheme.colors.gray(2), + inactiveBackground: Color = IntUiDarkTheme.colors.gray(3), fullscreenControlButtonsBackground: Color = Color(0xFF575A5C), - contentColor: Color = IntUiDarkTheme.colors.grey(12), - borderColor: Color = IntUiDarkTheme.colors.grey(4), + contentColor: Color = IntUiDarkTheme.colors.gray(12), + borderColor: Color = IntUiDarkTheme.colors.gray(4), titlePaneButtonHoveredBackground: Color = Color(0x1AFFFFFF), titlePaneButtonPressedBackground: Color = titlePaneButtonHoveredBackground, titlePaneCloseButtonHoveredBackground: Color = Color(0xFFE81123), titlePaneCloseButtonPressedBackground: Color = Color(0xFFF1707A), - iconButtonHoveredBackground: Color = IntUiLightTheme.colors.grey(3), - iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(3), + iconButtonHoveredBackground: Color = IntUiLightTheme.colors.gray(3), + iconButtonPressedBackground: Color = IntUiLightTheme.colors.gray(3), dropdownHoveredBackground: Color = Color(0x1AFFFFFF), dropdownPressedBackground: Color = dropdownHoveredBackground, ): TitleBarColors = diff --git a/int-ui/int-ui-standalone/build.gradle.kts b/int-ui/int-ui-standalone/build.gradle.kts index 06a8b5233..abb60420d 100644 --- a/int-ui/int-ui-standalone/build.gradle.kts +++ b/int-ui/int-ui-standalone/build.gradle.kts @@ -9,7 +9,7 @@ plugins { dependencies { api(projects.ui) } intelliJThemeGenerator { - val targetIdeaVersion = "241.9959" + val targetIdeaVersion = "idea/242.20224.91" register("intUiLight") { themeClassName = "org.jetbrains.jewel.intui.core.theme.IntUiLightTheme" themeFile = "platform/platform-resources/src/themes/expUI/expUI_light.theme.json" diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt index a5495b69e..22b0784c6 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt @@ -61,18 +61,18 @@ public object IntUiDefaultButtonColorFactory { @Composable public fun light( background: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), - backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)), + backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), backgroundFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.blue(2)), backgroundHovered: Brush = SolidColor(IntUiLightTheme.colors.blue(3)), - content: Color = IntUiLightTheme.colors.grey(14), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), - contentFocused: Color = IntUiLightTheme.colors.grey(14), - contentPressed: Color = IntUiLightTheme.colors.grey(14), - contentHovered: Color = IntUiLightTheme.colors.grey(14), + content: Color = IntUiLightTheme.colors.gray(14), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), + contentFocused: Color = IntUiLightTheme.colors.gray(14), + contentPressed: Color = IntUiLightTheme.colors.gray(14), + contentHovered: Color = IntUiLightTheme.colors.gray(14), border: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), - borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)), - borderFocused: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), + borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), + borderFocused: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), borderPressed: Brush = borderFocused, borderHovered: Brush = border, ): ButtonColors = @@ -97,18 +97,18 @@ public object IntUiDefaultButtonColorFactory { @Composable public fun dark( background: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)), - backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), + backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), backgroundFocused: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)), backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.blue(4)), backgroundHovered: Brush = SolidColor(IntUiDarkTheme.colors.blue(5)), - content: Color = IntUiDarkTheme.colors.grey(14), - contentDisabled: Color = IntUiDarkTheme.colors.grey(8), - contentFocused: Color = IntUiDarkTheme.colors.grey(14), - contentPressed: Color = IntUiDarkTheme.colors.grey(14), - contentHovered: Color = IntUiDarkTheme.colors.grey(14), + content: Color = IntUiDarkTheme.colors.gray(14), + contentDisabled: Color = IntUiDarkTheme.colors.gray(8), + contentFocused: Color = IntUiDarkTheme.colors.gray(14), + contentPressed: Color = IntUiDarkTheme.colors.gray(14), + contentHovered: Color = IntUiDarkTheme.colors.gray(14), border: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)), - borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), - borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(1)), + borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), + borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.gray(1)), borderPressed: Brush = borderFocused, borderHovered: Brush = border, ): ButtonColors = @@ -137,21 +137,21 @@ public val ButtonColors.Companion.Outlined: IntUiOutlinedButtonColorFactory public object IntUiOutlinedButtonColorFactory { @Composable public fun light( - background: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), - backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)), + background: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), + backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), backgroundFocused: Brush = background, - backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(13)), + backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.gray(13)), backgroundHovered: Brush = background, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Brush = SolidColor(IntUiLightTheme.colors.grey(9)), - borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)), + border: Brush = SolidColor(IntUiLightTheme.colors.gray(9)), + borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), borderFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), - borderPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(7)), - borderHovered: Brush = SolidColor(IntUiLightTheme.colors.grey(8)), + borderPressed: Brush = SolidColor(IntUiLightTheme.colors.gray(7)), + borderHovered: Brush = SolidColor(IntUiLightTheme.colors.gray(8)), ): ButtonColors = ButtonColors( background = background, @@ -174,20 +174,20 @@ public object IntUiOutlinedButtonColorFactory { @Composable public fun dark( background: Brush = SolidColor(Color.Transparent), - backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), + backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), backgroundFocused: Brush = background, - backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), + backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.gray(2)), backgroundHovered: Brush = SolidColor(Color.Unspecified), - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(8), - contentFocused: Color = IntUiDarkTheme.colors.grey(12), - contentPressed: Color = IntUiDarkTheme.colors.grey(12), - contentHovered: Color = IntUiDarkTheme.colors.grey(12), - border: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), - borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), - borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), - borderPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)), - borderHovered: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(8), + contentFocused: Color = IntUiDarkTheme.colors.gray(12), + contentPressed: Color = IntUiDarkTheme.colors.gray(12), + contentHovered: Color = IntUiDarkTheme.colors.gray(12), + border: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), + borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), + borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.gray(2)), + borderPressed: Brush = SolidColor(IntUiDarkTheme.colors.gray(7)), + borderHovered: Brush = SolidColor(IntUiDarkTheme.colors.gray(7)), ): ButtonColors = ButtonColors( background = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt index 335dfb643..ff0c11bfc 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt @@ -32,14 +32,14 @@ public fun CheckboxStyle.Companion.dark( @Composable public fun CheckboxColors.Companion.light( content: Color = Color.Unspecified, - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentSelected: Color = content, ): CheckboxColors = CheckboxColors(content, contentDisabled, contentSelected) @Composable public fun CheckboxColors.Companion.dark( content: Color = Color.Unspecified, - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentSelected: Color = content, ): CheckboxColors = CheckboxColors(content, contentDisabled, contentSelected) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt index a2da9c8f6..85cf07503 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt @@ -28,18 +28,18 @@ public fun ChipStyle.Companion.dark( @Composable public fun ChipColors.Companion.light( - background: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), - backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)), + background: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), + backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), backgroundFocused: Brush = background, - backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(11)), + backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.gray(11)), backgroundHovered: Brush = background, - backgroundSelected: Brush = SolidColor(IntUiLightTheme.colors.grey(13)), + backgroundSelected: Brush = SolidColor(IntUiLightTheme.colors.gray(13)), backgroundSelectedDisabled: Brush = backgroundDisabled, backgroundSelectedFocused: Brush = backgroundSelected, backgroundSelectedPressed: Brush = backgroundPressed, backgroundSelectedHovered: Brush = backgroundSelected, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, @@ -48,11 +48,11 @@ public fun ChipColors.Companion.light( contentSelectedFocused: Color = content, contentSelectedPressed: Color = content, contentSelectedHovered: Color = content, - border: Color = IntUiLightTheme.colors.grey(9), - borderDisabled: Color = IntUiLightTheme.colors.grey(11), + border: Color = IntUiLightTheme.colors.gray(9), + borderDisabled: Color = IntUiLightTheme.colors.gray(11), borderFocused: Color = IntUiLightTheme.colors.blue(4), - borderPressed: Color = IntUiLightTheme.colors.grey(7), - borderHovered: Color = IntUiLightTheme.colors.grey(8), + borderPressed: Color = IntUiLightTheme.colors.gray(7), + borderHovered: Color = IntUiLightTheme.colors.gray(8), borderSelected: Color = IntUiLightTheme.colors.blue(4), borderSelectedDisabled: Color = borderDisabled, borderSelectedFocused: Color = borderSelected, @@ -94,18 +94,18 @@ public fun ChipColors.Companion.light( @Composable public fun ChipColors.Companion.dark( - background: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), - backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(4)), + background: Brush = SolidColor(IntUiDarkTheme.colors.gray(2)), + backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(4)), backgroundFocused: Brush = background, - backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), + backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), backgroundHovered: Brush = background, - backgroundSelected: Brush = SolidColor(IntUiDarkTheme.colors.grey(3)), + backgroundSelected: Brush = SolidColor(IntUiDarkTheme.colors.gray(3)), backgroundSelectedDisabled: Brush = backgroundDisabled, backgroundSelectedFocused: Brush = backgroundSelected, backgroundSelectedPressed: Brush = backgroundPressed, backgroundSelectedHovered: Brush = backgroundSelected, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(8), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, @@ -114,10 +114,10 @@ public fun ChipColors.Companion.dark( contentSelectedFocused: Color = content, contentSelectedPressed: Color = content, contentSelectedHovered: Color = content, - border: Color = IntUiDarkTheme.colors.grey(5), - borderDisabled: Color = IntUiDarkTheme.colors.grey(6), + border: Color = IntUiDarkTheme.colors.gray(5), + borderDisabled: Color = IntUiDarkTheme.colors.gray(6), borderFocused: Color = IntUiDarkTheme.colors.blue(6), - borderPressed: Color = IntUiDarkTheme.colors.grey(7), + borderPressed: Color = IntUiDarkTheme.colors.gray(7), borderHovered: Color = borderPressed, borderSelected: Color = IntUiDarkTheme.colors.blue(6), borderSelectedDisabled: Color = borderDisabled, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt index 86d399036..2646ab694 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt @@ -9,12 +9,12 @@ import org.jetbrains.jewel.ui.component.styling.DividerStyle @Composable public fun DividerStyle.Companion.light( - color: Color = IntUiLightTheme.colors.grey(12), + color: Color = IntUiLightTheme.colors.gray(12), metrics: DividerMetrics = DividerMetrics.defaults(), ): DividerStyle = DividerStyle(color, metrics) @Composable public fun DividerStyle.Companion.dark( - color: Color = IntUiDarkTheme.colors.grey(1), + color: Color = IntUiDarkTheme.colors.gray(1), metrics: DividerMetrics = DividerMetrics.defaults(), ): DividerStyle = DividerStyle(color, metrics) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt index b076d3a78..bdbca2614 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt @@ -72,23 +72,23 @@ public val DropdownColors.Companion.Default: IntUiDefaultDropdownColorsFactory public object IntUiDefaultDropdownColorsFactory { @Composable public fun light( - background: Color = IntUiLightTheme.colors.grey(14), - backgroundDisabled: Color = IntUiLightTheme.colors.grey(13), + background: Color = IntUiLightTheme.colors.gray(14), + backgroundDisabled: Color = IntUiLightTheme.colors.gray(13), backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiLightTheme.colors.grey(9), - borderDisabled: Color = IntUiLightTheme.colors.grey(11), + border: Color = IntUiLightTheme.colors.gray(9), + borderDisabled: Color = IntUiLightTheme.colors.gray(11), borderFocused: Color = IntUiLightTheme.colors.blue(4), borderPressed: Color = border, borderHovered: Color = border, - iconTint: Color = IntUiLightTheme.colors.grey(7), - iconTintDisabled: Color = IntUiLightTheme.colors.grey(9), + iconTint: Color = IntUiLightTheme.colors.gray(7), + iconTintDisabled: Color = IntUiLightTheme.colors.gray(9), iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, @@ -118,23 +118,23 @@ public object IntUiDefaultDropdownColorsFactory { @Composable public fun dark( - background: Color = IntUiDarkTheme.colors.grey(2), + background: Color = IntUiDarkTheme.colors.gray(2), backgroundDisabled: Color = background, backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiDarkTheme.colors.grey(5), - borderDisabled: Color = IntUiDarkTheme.colors.grey(5), + border: Color = IntUiDarkTheme.colors.gray(5), + borderDisabled: Color = IntUiDarkTheme.colors.gray(5), borderFocused: Color = IntUiDarkTheme.colors.blue(6), borderPressed: Color = border, borderHovered: Color = border, - iconTint: Color = IntUiDarkTheme.colors.grey(10), - iconTintDisabled: Color = IntUiDarkTheme.colors.grey(6), + iconTint: Color = IntUiDarkTheme.colors.gray(10), + iconTintDisabled: Color = IntUiDarkTheme.colors.gray(6), iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, @@ -172,15 +172,15 @@ public object IntUiUndecoratedDropdownColorsFactory { background: Color = Color.Transparent, backgroundDisabled: Color = background, backgroundFocused: Color = background, - backgroundPressed: Color = IntUiLightTheme.colors.grey(14).copy(alpha = 0.1f), + backgroundPressed: Color = IntUiLightTheme.colors.gray(14).copy(alpha = 0.1f), backgroundHovered: Color = backgroundPressed, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - iconTint: Color = IntUiLightTheme.colors.grey(7), - iconTintDisabled: Color = IntUiLightTheme.colors.grey(9), + iconTint: Color = IntUiLightTheme.colors.gray(7), + iconTintDisabled: Color = IntUiLightTheme.colors.gray(9), iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, @@ -215,13 +215,13 @@ public object IntUiUndecoratedDropdownColorsFactory { backgroundFocused: Color = background, backgroundPressed: Color = Color(0x0D000000), // Not a palette color backgroundHovered: Color = backgroundPressed, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - iconTint: Color = IntUiDarkTheme.colors.grey(10), - iconTintDisabled: Color = IntUiDarkTheme.colors.grey(6), + iconTint: Color = IntUiDarkTheme.colors.gray(10), + iconTintDisabled: Color = IntUiDarkTheme.colors.gray(6), iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt index ccf1a529d..7f4df04a1 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt @@ -23,10 +23,10 @@ public fun GroupHeaderStyle.Companion.dark( ): GroupHeaderStyle = GroupHeaderStyle(colors, metrics) @Composable -public fun GroupHeaderColors.Companion.light(divider: Color = IntUiLightTheme.colors.grey(12)): GroupHeaderColors = GroupHeaderColors(divider) +public fun GroupHeaderColors.Companion.light(divider: Color = IntUiLightTheme.colors.gray(12)): GroupHeaderColors = GroupHeaderColors(divider) @Composable -public fun GroupHeaderColors.Companion.dark(divider: Color = IntUiDarkTheme.colors.grey(3)): GroupHeaderColors = GroupHeaderColors(divider) +public fun GroupHeaderColors.Companion.dark(divider: Color = IntUiDarkTheme.colors.gray(3)): GroupHeaderColors = GroupHeaderColors(divider) public fun GroupHeaderMetrics.Companion.defaults( dividerThickness: Dp = 1.dp, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt index c02b37d67..c5cf32bb3 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt @@ -29,7 +29,7 @@ public fun HorizontalProgressBarStyle.Companion.dark( @Composable public fun HorizontalProgressBarColors.Companion.light( - track: Color = IntUiLightTheme.colors.grey(11), + track: Color = IntUiLightTheme.colors.gray(11), progress: Color = IntUiLightTheme.colors.blue(4), indeterminateBase: Color = IntUiLightTheme.colors.blue(9), indeterminateHighlight: Color = IntUiLightTheme.colors.blue(4), @@ -43,7 +43,7 @@ public fun HorizontalProgressBarColors.Companion.light( @Composable public fun HorizontalProgressBarColors.Companion.dark( - track: Color = IntUiDarkTheme.colors.grey(4), + track: Color = IntUiDarkTheme.colors.gray(4), progress: Color = IntUiDarkTheme.colors.blue(7), indeterminateBase: Color = IntUiDarkTheme.colors.blue(9), indeterminateHighlight: Color = IntUiDarkTheme.colors.blue(5), diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt index b56bd034a..cdb9c53c7 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt @@ -27,13 +27,13 @@ public fun IconButtonStyle.Companion.dark( @Composable public fun IconButtonColors.Companion.light( - foregroundSelectedActivated: Color = IntUiLightTheme.colors.grey(14), + foregroundSelectedActivated: Color = IntUiLightTheme.colors.gray(14), background: Color = Color.Unspecified, backgroundDisabled: Color = background, - backgroundSelected: Color = IntUiLightTheme.colors.grey(11), + backgroundSelected: Color = IntUiLightTheme.colors.gray(11), backgroundSelectedActivated: Color = IntUiLightTheme.colors.blue(4), - backgroundPressed: Color = IntUiLightTheme.colors.grey(11), - backgroundHovered: Color = IntUiLightTheme.colors.grey(12), + backgroundPressed: Color = IntUiLightTheme.colors.gray(11), + backgroundHovered: Color = IntUiLightTheme.colors.gray(12), backgroundFocused: Color = backgroundHovered, border: Color = background, borderDisabled: Color = backgroundDisabled, @@ -63,13 +63,13 @@ public fun IconButtonColors.Companion.light( @Composable public fun IconButtonColors.Companion.dark( - foregroundSelectedActivated: Color = IntUiDarkTheme.colors.grey(14), + foregroundSelectedActivated: Color = IntUiDarkTheme.colors.gray(14), background: Color = Color.Unspecified, backgroundDisabled: Color = background, - backgroundSelected: Color = IntUiDarkTheme.colors.grey(5), + backgroundSelected: Color = IntUiDarkTheme.colors.gray(5), backgroundSelectedActivated: Color = IntUiDarkTheme.colors.blue(6), - backgroundPressed: Color = IntUiDarkTheme.colors.grey(5), - backgroundHovered: Color = IntUiDarkTheme.colors.grey(3), + backgroundPressed: Color = IntUiDarkTheme.colors.gray(5), + backgroundHovered: Color = IntUiDarkTheme.colors.gray(3), backgroundFocused: Color = backgroundHovered, border: Color = background, borderDisabled: Color = backgroundDisabled, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt index 2930a4891..af7407797 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt @@ -36,7 +36,7 @@ public fun LazyTreeColors.Companion.light( contentSelected: Color = content, contentSelectedFocused: Color = content, nodeBackgroundFocused: Color = Color.Unspecified, - nodeBackgroundSelected: Color = IntUiLightTheme.colors.grey(11), + nodeBackgroundSelected: Color = IntUiLightTheme.colors.gray(11), nodeBackgroundSelectedFocused: Color = IntUiLightTheme.colors.blue(11), ): LazyTreeColors = LazyTreeColors( @@ -56,7 +56,7 @@ public fun LazyTreeColors.Companion.dark( contentSelected: Color = content, contentSelectedFocused: Color = content, nodeBackgroundFocused: Color = Color.Unspecified, - nodeBackgroundSelected: Color = IntUiDarkTheme.colors.grey(4), + nodeBackgroundSelected: Color = IntUiDarkTheme.colors.gray(4), nodeBackgroundSelectedFocused: Color = IntUiDarkTheme.colors.blue(2), ): LazyTreeColors = LazyTreeColors( diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt index 7323870aa..250cc8bd8 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt @@ -39,7 +39,7 @@ public fun LinkStyle.Companion.dark( @Composable public fun LinkColors.Companion.light( content: Color = IntUiLightTheme.colors.blue(2), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, @@ -57,7 +57,7 @@ public fun LinkColors.Companion.light( @Composable public fun LinkColors.Companion.dark( content: Color = IntUiDarkTheme.colors.blue(9), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt index d0ba2058a..30cd2adae 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt @@ -35,8 +35,8 @@ public fun MenuStyle.Companion.dark( @Composable public fun MenuColors.Companion.light( - background: Color = IntUiLightTheme.colors.grey(14), - border: Color = IntUiLightTheme.colors.grey(9), + background: Color = IntUiLightTheme.colors.gray(14), + border: Color = IntUiLightTheme.colors.gray(9), shadow: Color = Color(0x78919191), // Not a palette color itemColors: MenuItemColors = MenuItemColors.light(), ): MenuColors = @@ -49,8 +49,8 @@ public fun MenuColors.Companion.light( @Composable public fun MenuColors.Companion.dark( - background: Color = IntUiDarkTheme.colors.grey(2), - border: Color = IntUiDarkTheme.colors.grey(3), + background: Color = IntUiDarkTheme.colors.gray(2), + border: Color = IntUiDarkTheme.colors.gray(3), shadow: Color = Color(0x66000000), // Not a palette color itemColors: MenuItemColors = MenuItemColors.dark(), ): MenuColors = @@ -63,27 +63,27 @@ public fun MenuColors.Companion.dark( @Composable public fun MenuItemColors.Companion.light( - background: Color = IntUiLightTheme.colors.grey(14), - backgroundDisabled: Color = IntUiLightTheme.colors.grey(14), + background: Color = IntUiLightTheme.colors.gray(14), + backgroundDisabled: Color = IntUiLightTheme.colors.gray(14), backgroundFocused: Color = IntUiLightTheme.colors.blue(11), backgroundPressed: Color = background, backgroundHovered: Color = backgroundFocused, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - iconTint: Color = IntUiLightTheme.colors.grey(7), + iconTint: Color = IntUiLightTheme.colors.gray(7), iconTintDisabled: Color = iconTint, iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, - keybindingTint: Color = IntUiLightTheme.colors.grey(8), + keybindingTint: Color = IntUiLightTheme.colors.gray(8), keybindingTintDisabled: Color = keybindingTint, - keybindingTintFocused: Color = IntUiLightTheme.colors.grey(1), + keybindingTintFocused: Color = IntUiLightTheme.colors.gray(1), keybindingTintPressed: Color = keybindingTintFocused, keybindingTintHovered: Color = keybindingTintFocused, - separator: Color = IntUiLightTheme.colors.grey(12), + separator: Color = IntUiLightTheme.colors.gray(12), ): MenuItemColors = MenuItemColors( background = background, @@ -111,27 +111,27 @@ public fun MenuItemColors.Companion.light( @Composable public fun MenuItemColors.Companion.dark( - background: Color = IntUiDarkTheme.colors.grey(2), - backgroundDisabled: Color = IntUiDarkTheme.colors.grey(2), + background: Color = IntUiDarkTheme.colors.gray(2), + backgroundDisabled: Color = IntUiDarkTheme.colors.gray(2), backgroundFocused: Color = IntUiDarkTheme.colors.blue(2), backgroundPressed: Color = background, backgroundHovered: Color = backgroundFocused, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - iconTint: Color = IntUiDarkTheme.colors.grey(10), + iconTint: Color = IntUiDarkTheme.colors.gray(10), iconTintDisabled: Color = iconTint, iconTintFocused: Color = iconTint, iconTintPressed: Color = iconTint, iconTintHovered: Color = iconTint, - keybindingTint: Color = IntUiDarkTheme.colors.grey(7), + keybindingTint: Color = IntUiDarkTheme.colors.gray(7), keybindingTintDisabled: Color = keybindingTint, - keybindingTintFocused: Color = IntUiDarkTheme.colors.grey(12), + keybindingTintFocused: Color = IntUiDarkTheme.colors.gray(12), keybindingTintPressed: Color = keybindingTintFocused, keybindingTintHovered: Color = keybindingTintFocused, - separator: Color = IntUiDarkTheme.colors.grey(3), + separator: Color = IntUiDarkTheme.colors.gray(3), ): MenuItemColors = MenuItemColors( background = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt index e837e9656..65fb6e0e6 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt @@ -32,7 +32,7 @@ public fun RadioButtonStyle.Companion.dark( public fun RadioButtonColors.Companion.light( content: Color = Color.Unspecified, contentHovered: Color = content, - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentSelected: Color = content, contentSelectedHovered: Color = content, contentSelectedDisabled: Color = contentDisabled, @@ -50,7 +50,7 @@ public fun RadioButtonColors.Companion.light( public fun RadioButtonColors.Companion.dark( content: Color = Color.Unspecified, contentHovered: Color = content, - contentDisabled: Color = IntUiDarkTheme.colors.grey(8), + contentDisabled: Color = IntUiDarkTheme.colors.gray(8), contentSelected: Color = content, contentSelectedHovered: Color = content, contentSelectedDisabled: Color = contentDisabled, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlButtonStyling.kt index 69704cd60..a48633733 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlButtonStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlButtonStyling.kt @@ -30,16 +30,16 @@ public fun SegmentedControlButtonStyle.Companion.dark( @Composable public fun SegmentedControlButtonColors.Companion.light( background: Brush = SolidColor(Color.Transparent), - backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), - backgroundHovered: Brush = SolidColor(IntUiLightTheme.colors.grey(1).copy(alpha = .07f)), - backgroundSelected: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), + backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), + backgroundHovered: Brush = SolidColor(IntUiLightTheme.colors.gray(1).copy(alpha = .07f)), + backgroundSelected: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), backgroundSelectedFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(11)), - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), border: Brush = SolidColor(Color.Transparent), - borderSelected: Brush = SolidColor(IntUiLightTheme.colors.grey(8)), - borderSelectedDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(9)), - borderSelectedFocused: Brush = SolidColor(IntUiLightTheme.colors.grey(14)), + borderSelected: Brush = SolidColor(IntUiLightTheme.colors.gray(8)), + borderSelectedDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(9)), + borderSelectedFocused: Brush = SolidColor(IntUiLightTheme.colors.gray(14)), ): SegmentedControlButtonColors = SegmentedControlButtonColors( background = background, @@ -58,16 +58,16 @@ public fun SegmentedControlButtonColors.Companion.light( @Composable public fun SegmentedControlButtonColors.Companion.dark( background: Brush = SolidColor(Color.Transparent), - backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(3)), - backgroundHovered: Brush = SolidColor(IntUiDarkTheme.colors.grey(14).copy(alpha = .09f)), - backgroundSelected: Brush = SolidColor(IntUiDarkTheme.colors.grey(3)), + backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.gray(3)), + backgroundHovered: Brush = SolidColor(IntUiDarkTheme.colors.gray(14).copy(alpha = .09f)), + backgroundSelected: Brush = SolidColor(IntUiDarkTheme.colors.gray(3)), backgroundSelectedFocused: Brush = SolidColor(IntUiDarkTheme.colors.blue(3)), - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(8), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(8), border: Brush = SolidColor(Color.Transparent), - borderSelected: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)), - borderSelectedDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(4)), - borderSelectedFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), + borderSelected: Brush = SolidColor(IntUiDarkTheme.colors.gray(7)), + borderSelectedDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(4)), + borderSelectedFocused: Brush = SolidColor(IntUiDarkTheme.colors.gray(2)), ): SegmentedControlButtonColors = SegmentedControlButtonColors( background = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlStyling.kt index 2047eb1fe..ed863ba4a 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSegmentedControlStyling.kt @@ -27,8 +27,8 @@ public fun SegmentedControlStyle.Companion.dark( @Composable public fun SegmentedControlColors.Companion.light( - border: Brush = SolidColor(IntUiLightTheme.colors.grey(9)), - borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(11)), + border: Brush = SolidColor(IntUiLightTheme.colors.gray(9)), + borderDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(11)), borderFocused: Brush = SolidColor(Color.Transparent), borderPressed: Brush = border, borderHovered: Brush = border, @@ -43,9 +43,9 @@ public fun SegmentedControlColors.Companion.light( @Composable public fun SegmentedControlColors.Companion.dark( - border: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)), - borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(4)), - borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), + border: Brush = SolidColor(IntUiDarkTheme.colors.gray(5)), + borderDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(4)), + borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.gray(2)), borderPressed: Brush = border, borderHovered: Brush = border, ): SegmentedControlColors = diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSliderStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSliderStyling.kt index 325dee59b..d1b6d448d 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSliderStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiSliderStyling.kt @@ -29,21 +29,21 @@ public fun SliderStyle.Companion.dark( @Composable public fun SliderColors.Companion.light( - track: Color = IntUiLightTheme.colors.grey(10), + track: Color = IntUiLightTheme.colors.gray(10), trackFilled: Color = IntUiLightTheme.colors.blue(6), - trackDisabled: Color = IntUiLightTheme.colors.grey(12), - trackFilledDisabled: Color = IntUiLightTheme.colors.grey(11), + trackDisabled: Color = IntUiLightTheme.colors.gray(12), + trackFilledDisabled: Color = IntUiLightTheme.colors.gray(11), stepMarker: Color = track, - thumbFill: Color = IntUiLightTheme.colors.grey(14), + thumbFill: Color = IntUiLightTheme.colors.gray(14), thumbFillDisabled: Color = thumbFill, thumbFillFocused: Color = thumbFill, thumbFillPressed: Color = thumbFill, thumbFillHovered: Color = thumbFill, - thumbBorder: Color = IntUiLightTheme.colors.grey(8), + thumbBorder: Color = IntUiLightTheme.colors.gray(8), thumbBorderFocused: Color = IntUiLightTheme.colors.blue(4), - thumbBorderDisabled: Color = IntUiLightTheme.colors.grey(11), - thumbBorderPressed: Color = IntUiLightTheme.colors.grey(7), - thumbBorderHovered: Color = IntUiLightTheme.colors.grey(9), + thumbBorderDisabled: Color = IntUiLightTheme.colors.gray(11), + thumbBorderPressed: Color = IntUiLightTheme.colors.gray(7), + thumbBorderHovered: Color = IntUiLightTheme.colors.gray(9), ): SliderColors = SliderColors( track, @@ -65,21 +65,21 @@ public fun SliderColors.Companion.light( @Composable public fun SliderColors.Companion.dark( - track: Color = IntUiDarkTheme.colors.grey(4), + track: Color = IntUiDarkTheme.colors.gray(4), trackFilled: Color = IntUiDarkTheme.colors.blue(7), - trackDisabled: Color = IntUiDarkTheme.colors.grey(3), - trackFilledDisabled: Color = IntUiDarkTheme.colors.grey(4), + trackDisabled: Color = IntUiDarkTheme.colors.gray(3), + trackFilledDisabled: Color = IntUiDarkTheme.colors.gray(4), stepMarker: Color = track, - thumbFill: Color = IntUiDarkTheme.colors.grey(2), - thumbFillDisabled: Color = IntUiDarkTheme.colors.grey(3), + thumbFill: Color = IntUiDarkTheme.colors.gray(2), + thumbFillDisabled: Color = IntUiDarkTheme.colors.gray(3), thumbFillFocused: Color = thumbFill, thumbFillPressed: Color = thumbFill, thumbFillHovered: Color = thumbFill, - thumbBorder: Color = IntUiDarkTheme.colors.grey(7), + thumbBorder: Color = IntUiDarkTheme.colors.gray(7), thumbBorderFocused: Color = IntUiDarkTheme.colors.blue(6), - thumbBorderDisabled: Color = IntUiDarkTheme.colors.grey(5), - thumbBorderPressed: Color = IntUiDarkTheme.colors.grey(8), - thumbBorderHovered: Color = IntUiDarkTheme.colors.grey(9), + thumbBorderDisabled: Color = IntUiDarkTheme.colors.gray(5), + thumbBorderPressed: Color = IntUiDarkTheme.colors.gray(8), + thumbBorderHovered: Color = IntUiDarkTheme.colors.gray(9), ): SliderColors = SliderColors( track, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt index 4984b19f9..ae862a0e0 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt @@ -62,12 +62,12 @@ public val TabColors.Companion.Default: IntUiDefaultTabColorsFactory public object IntUiDefaultTabColorsFactory { public fun light( - background: Color = IntUiLightTheme.colors.grey(14), - backgroundHovered: Color = IntUiLightTheme.colors.grey(12), + background: Color = IntUiLightTheme.colors.gray(14), + backgroundHovered: Color = IntUiLightTheme.colors.gray(12), backgroundPressed: Color = backgroundHovered, backgroundSelected: Color = background, backgroundDisabled: Color = background, - content: Color = IntUiLightTheme.colors.grey(1), + content: Color = IntUiLightTheme.colors.gray(1), contentHovered: Color = content, contentDisabled: Color = content, contentPressed: Color = content, @@ -98,7 +98,7 @@ public object IntUiDefaultTabColorsFactory { public fun dark( background: Color = Color.Unspecified, - backgroundHovered: Color = IntUiDarkTheme.colors.grey(4), + backgroundHovered: Color = IntUiDarkTheme.colors.gray(4), backgroundPressed: Color = backgroundHovered, backgroundSelected: Color = background, backgroundDisabled: Color = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt index a40ac32cf..a0006600a 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt @@ -32,27 +32,27 @@ public fun TextAreaStyle.Companion.dark( @Composable public fun TextAreaColors.Companion.light( - background: Color = IntUiLightTheme.colors.grey(14), - backgroundDisabled: Color = IntUiLightTheme.colors.grey(13), + background: Color = IntUiLightTheme.colors.gray(14), + backgroundDisabled: Color = IntUiLightTheme.colors.gray(13), backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiLightTheme.colors.grey(9), - borderDisabled: Color = IntUiLightTheme.colors.grey(11), + border: Color = IntUiLightTheme.colors.gray(9), + borderDisabled: Color = IntUiLightTheme.colors.gray(11), borderFocused: Color = IntUiLightTheme.colors.blue(4), borderPressed: Color = border, borderHovered: Color = border, - caret: Color = IntUiLightTheme.colors.grey(1), + caret: Color = IntUiLightTheme.colors.gray(1), caretDisabled: Color = caret, caretFocused: Color = caret, caretPressed: Color = caret, caretHovered: Color = caret, - placeholder: Color = IntUiLightTheme.colors.grey(8), + placeholder: Color = IntUiLightTheme.colors.gray(8), ): TextAreaColors = TextAreaColors( background = background, @@ -80,27 +80,27 @@ public fun TextAreaColors.Companion.light( @Composable public fun TextAreaColors.Companion.dark( - background: Color = IntUiDarkTheme.colors.grey(2), + background: Color = IntUiDarkTheme.colors.gray(2), backgroundDisabled: Color = background, backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiDarkTheme.colors.grey(5), + border: Color = IntUiDarkTheme.colors.gray(5), borderDisabled: Color = border, borderFocused: Color = IntUiDarkTheme.colors.blue(6), borderPressed: Color = border, borderHovered: Color = border, - caret: Color = IntUiDarkTheme.colors.grey(12), + caret: Color = IntUiDarkTheme.colors.gray(12), caretDisabled: Color = caret, caretFocused: Color = caret, caretPressed: Color = caret, caretHovered: Color = caret, - placeholder: Color = IntUiDarkTheme.colors.grey(7), + placeholder: Color = IntUiDarkTheme.colors.gray(7), ): TextAreaColors = TextAreaColors( background = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt index 5d4f70f54..1596491b2 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt @@ -32,27 +32,27 @@ public fun TextFieldStyle.Companion.dark( @Composable public fun TextFieldColors.Companion.light( - background: Color = IntUiLightTheme.colors.grey(14), - backgroundDisabled: Color = IntUiLightTheme.colors.grey(13), + background: Color = IntUiLightTheme.colors.gray(14), + backgroundDisabled: Color = IntUiLightTheme.colors.gray(13), backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiLightTheme.colors.grey(1), - contentDisabled: Color = IntUiLightTheme.colors.grey(8), + content: Color = IntUiLightTheme.colors.gray(1), + contentDisabled: Color = IntUiLightTheme.colors.gray(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiLightTheme.colors.grey(9), - borderDisabled: Color = IntUiLightTheme.colors.grey(11), + border: Color = IntUiLightTheme.colors.gray(9), + borderDisabled: Color = IntUiLightTheme.colors.gray(11), borderFocused: Color = IntUiLightTheme.colors.blue(4), borderPressed: Color = border, borderHovered: Color = border, - caret: Color = IntUiLightTheme.colors.grey(1), + caret: Color = IntUiLightTheme.colors.gray(1), caretDisabled: Color = caret, caretFocused: Color = caret, caretPressed: Color = caret, caretHovered: Color = caret, - placeholder: Color = IntUiLightTheme.colors.grey(8), + placeholder: Color = IntUiLightTheme.colors.gray(8), ): TextFieldColors = TextFieldColors( background = background, @@ -80,27 +80,27 @@ public fun TextFieldColors.Companion.light( @Composable public fun TextFieldColors.Companion.dark( - background: Color = IntUiDarkTheme.colors.grey(2), + background: Color = IntUiDarkTheme.colors.gray(2), backgroundDisabled: Color = background, backgroundFocused: Color = background, backgroundPressed: Color = background, backgroundHovered: Color = background, - content: Color = IntUiDarkTheme.colors.grey(12), - contentDisabled: Color = IntUiDarkTheme.colors.grey(7), + content: Color = IntUiDarkTheme.colors.gray(12), + contentDisabled: Color = IntUiDarkTheme.colors.gray(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, - border: Color = IntUiDarkTheme.colors.grey(5), + border: Color = IntUiDarkTheme.colors.gray(5), borderDisabled: Color = border, borderFocused: Color = IntUiDarkTheme.colors.blue(6), borderPressed: Color = border, borderHovered: Color = border, - caret: Color = IntUiDarkTheme.colors.grey(12), + caret: Color = IntUiDarkTheme.colors.gray(12), caretDisabled: Color = caret, caretFocused: Color = caret, caretPressed: Color = caret, caretHovered: Color = caret, - placeholder: Color = IntUiDarkTheme.colors.grey(7), + placeholder: Color = IntUiDarkTheme.colors.gray(7), ): TextFieldColors = TextFieldColors( background = background, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt index 41b56f8a3..c62217579 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt @@ -30,8 +30,8 @@ public fun TooltipStyle.Companion.dark( @Composable public fun TooltipColors.Companion.light( - backgroundColor: Color = IntUiLightTheme.colors.grey(2), - contentColor: Color = IntUiLightTheme.colors.grey(12), + backgroundColor: Color = IntUiLightTheme.colors.gray(2), + contentColor: Color = IntUiLightTheme.colors.gray(12), borderColor: Color = backgroundColor, shadow: Color = Color(0x78919191), // Not a palette color ): TooltipColors = @@ -39,9 +39,9 @@ public fun TooltipColors.Companion.light( @Composable public fun TooltipColors.Companion.dark( - backgroundColor: Color = IntUiDarkTheme.colors.grey(2), - contentColor: Color = IntUiDarkTheme.colors.grey(12), - borderColor: Color = IntUiDarkTheme.colors.grey(3), + backgroundColor: Color = IntUiDarkTheme.colors.gray(2), + contentColor: Color = IntUiDarkTheme.colors.gray(12), + borderColor: Color = IntUiDarkTheme.colors.gray(3), shadow: Color = Color(0x66000000), // Not a palette color ): TooltipColors = TooltipColors(backgroundColor, contentColor, borderColor, shadow) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt index 1a5f812d1..a7768185c 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt @@ -14,7 +14,7 @@ public fun GlobalColors.Companion.light( borders: BorderColors = BorderColors.light(), outlines: OutlineColors = OutlineColors.light(), text: TextColors = TextColors.light(), - paneBackground: Color = IntUiLightTheme.colors.grey(13), + paneBackground: Color = IntUiLightTheme.colors.gray(13), ): GlobalColors = GlobalColors( borders = borders, @@ -28,7 +28,7 @@ public fun GlobalColors.Companion.dark( borders: BorderColors = BorderColors.dark(), outlines: OutlineColors = OutlineColors.dark(), text: TextColors = TextColors.dark(), - paneBackground: Color = IntUiDarkTheme.colors.grey(2), + paneBackground: Color = IntUiDarkTheme.colors.gray(2), ): GlobalColors = GlobalColors( borders = borders, @@ -39,33 +39,33 @@ public fun GlobalColors.Companion.dark( @Composable public fun BorderColors.Companion.light( - normal: Color = IntUiLightTheme.colors.grey(9), - focused: Color = IntUiLightTheme.colors.grey(14), - disabled: Color = IntUiLightTheme.colors.grey(11), + normal: Color = IntUiLightTheme.colors.gray(9), + focused: Color = IntUiLightTheme.colors.gray(14), + disabled: Color = IntUiLightTheme.colors.gray(11), ): BorderColors = BorderColors(normal, focused, disabled) @Composable public fun BorderColors.Companion.dark( - normal: Color = IntUiDarkTheme.colors.grey(5), - focused: Color = IntUiDarkTheme.colors.grey(2), - disabled: Color = IntUiDarkTheme.colors.grey(4), + normal: Color = IntUiDarkTheme.colors.gray(5), + focused: Color = IntUiDarkTheme.colors.gray(2), + disabled: Color = IntUiDarkTheme.colors.gray(4), ): BorderColors = BorderColors(normal, focused, disabled) @Composable public fun TextColors.Companion.light( - normal: Color = IntUiLightTheme.colors.grey(1), - selected: Color = IntUiLightTheme.colors.grey(1), - disabled: Color = IntUiLightTheme.colors.grey(8), - info: Color = IntUiLightTheme.colors.grey(7), + normal: Color = IntUiLightTheme.colors.gray(1), + selected: Color = IntUiLightTheme.colors.gray(1), + disabled: Color = IntUiLightTheme.colors.gray(8), + info: Color = IntUiLightTheme.colors.gray(7), error: Color = IntUiLightTheme.colors.red(4), ): TextColors = TextColors(normal, selected, disabled, info, error) @Composable public fun TextColors.Companion.dark( - normal: Color = IntUiDarkTheme.colors.grey(12), - selected: Color = IntUiDarkTheme.colors.grey(12), - disabled: Color = IntUiDarkTheme.colors.grey(6), - info: Color = IntUiDarkTheme.colors.grey(7), + normal: Color = IntUiDarkTheme.colors.gray(12), + selected: Color = IntUiDarkTheme.colors.gray(12), + disabled: Color = IntUiDarkTheme.colors.gray(6), + info: Color = IntUiDarkTheme.colors.gray(7), error: Color = IntUiDarkTheme.colors.red(7), ): TextColors = TextColors(normal, selected, disabled, info, error) diff --git a/markdown/README.md b/markdown/README.md index cfc069ebc..95da6b37a 100644 --- a/markdown/README.md +++ b/markdown/README.md @@ -151,4 +151,4 @@ You can see this in action running the Standalone sample, and selecting Markdown The following image shows Jewel Markdown rendering this very Jewel Markdown README. -![Image showing the Markdown showcase from the Jewel standalone sample](https://github.com/JetBrains/jewel/assets/19003/67e2cc4e-c9b8-454b-884a-bba526ad2fe4) \ No newline at end of file +![Image showing the Markdown showcase from the Jewel standalone sample](https://github.com/JetBrains/jewel/assets/19003/67e2cc4e-c9b8-454b-884a-bba526ad2fe4) diff --git a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt index 366ad61f5..8a3373a65 100644 --- a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt +++ b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt @@ -654,7 +654,7 @@ public fun InlinesStyling.Companion.light( color = IntUiLightTheme.colors.blue(2), textDecoration = TextDecoration.Underline, ).toSpanStyle(), - linkDisabled: SpanStyle = link.copy(color = IntUiLightTheme.colors.grey(8)), + linkDisabled: SpanStyle = link.copy(color = IntUiLightTheme.colors.gray(8)), linkHovered: SpanStyle = link, linkFocused: SpanStyle = link.copy(background = Color(0x12000000)), linkPressed: SpanStyle = link.copy(background = Color(0x1D000000)), @@ -690,7 +690,7 @@ public fun InlinesStyling.Companion.dark( color = IntUiDarkTheme.colors.blue(9), textDecoration = TextDecoration.Underline, ).toSpanStyle(), - linkDisabled: SpanStyle = link.copy(color = IntUiDarkTheme.colors.grey(8)), + linkDisabled: SpanStyle = link.copy(color = IntUiDarkTheme.colors.gray(8)), linkHovered: SpanStyle = link, linkFocused: SpanStyle = link.copy(background = Color(0x16FFFFFF)), linkPressed: SpanStyle = link.copy(background = Color(0x26FFFFFF)), diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Borders.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Borders.kt index 27f2decc8..3ac7a4dd8 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Borders.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Borders.kt @@ -97,7 +97,7 @@ internal fun Borders() { } val backgroundColor = remember(isDark) { - if (isDark) colorPalette.grey(4) else colorPalette.grey(11) + if (isDark) colorPalette.gray(4) else colorPalette.gray(11) } Box( diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt index a85048f40..c32a880ab 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt @@ -226,9 +226,9 @@ fun TreeSample(modifier: Modifier = Modifier) { val borderColor = if (JewelTheme.isDark) { - JewelTheme.colorPalette.grey(3) + JewelTheme.colorPalette.gray(3) } else { - JewelTheme.colorPalette.grey(12) + JewelTheme.colorPalette.gray(12) } Box(modifier.border(1.dp, borderColor, RoundedCornerShape(2.dp))) {