From 223ab02577120700ff1c1bf9f75d9817ca2f6a87 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Sat, 21 Oct 2023 10:06:38 +0200 Subject: [PATCH] Move core components to core.component package Includes moving their styling to a subpackage --- buildSrc/src/main/kotlin/MergeSarifTask.kt | 2 +- buildSrc/src/main/kotlin/jewel.gradle.kts | 3 +- core/api/core.api | 1030 ++++++++--------- .../org/jetbrains/jewel/ComponentStyling.kt | 118 +- .../kotlin/org/jetbrains/jewel/ContextMenu.kt | 7 +- .../kotlin/org/jetbrains/jewel/GroupHeader.kt | 6 +- .../kotlin/org/jetbrains/jewel/JewelTheme.kt | 86 +- .../jewel/{ => core/component}/Button.kt | 7 +- .../jewel/{ => core/component}/Checkbox.kt | 17 +- .../jewel/{ => core/component}/Chip.kt | 8 +- .../component}/CircularProgressIndicator.kt | 5 +- .../jewel/{ => core/component}/Divider.kt | 6 +- .../jewel/{ => core/component}/Dropdown.kt | 15 +- .../jewel/{ => core/component}/Icon.kt | 2 +- .../jewel/{ => core/component}/IconButton.kt | 6 +- .../jewel/{ => core/component}/InputField.kt | 8 +- .../{ => core/component}/LabelledTextField.kt | 6 +- .../jewel/{ => core/component}/LazyTree.kt | 6 +- .../{ => core/component}/LinearProgressBar.kt | 5 +- .../jewel/{ => core/component}/Link.kt | 14 +- .../jewel/{ => core/component}/Menu.kt | 15 +- .../jewel/{ => core/component}/Popup.kt | 3 +- .../jewel/{ => core/component}/RadioButton.kt | 9 +- .../jewel/{ => core/component}/Scrollbars.kt | 5 +- .../jewel/{ => core/component}/SplitLayout.kt | 4 +- .../jewel/{ => core/component}/TabStrip.kt | 4 +- .../jewel/{ => core/component}/Tabs.kt | 5 +- .../jewel/{ => core/component}/Text.kt | 3 +- .../jewel/{ => core/component}/TextArea.kt | 6 +- .../jewel/{ => core/component}/TextField.kt | 6 +- .../jewel/{ => core/component}/Tooltip.kt | 6 +- .../component}/styling/ButtonStyling.kt | 4 +- .../component}/styling/CheckboxStyling.kt | 4 +- .../component}/styling/ChipStyling.kt | 4 +- .../styling/CircularProgressStyle.kt | 2 +- .../component}/styling/DividerStyling.kt | 2 +- .../component}/styling/DropdownStyling.kt | 4 +- .../component}/styling/GroupHeaderStyling.kt | 2 +- .../styling/HorizontalProgressBarStyling.kt | 2 +- .../component}/styling/IconButtonMetrics.kt | 4 +- .../component}/styling/InputFieldStyling.kt | 4 +- .../styling/LabelledTextFieldStyling.kt | 2 +- .../component}/styling/LazyTreeStyling.kt | 2 +- .../component}/styling/LinkStyling.kt | 4 +- .../component}/styling/MenuStyling.kt | 4 +- .../component}/styling/RadioButtonStyling.kt | 4 +- .../component}/styling/ScrollbarStyling.kt | 2 +- .../component}/styling/TabStyling.kt | 4 +- .../component}/styling/TextAreaStyling.kt | 2 +- .../component}/styling/TextFieldStyling.kt | 2 +- .../component}/styling/TooltipStyling.kt | 2 +- .../lazy/SelectableColumnOnKeyEvent.kt | 2 +- .../org/jetbrains/jewel/PainterHintTest.kt | 1 + .../jetbrains/jewel/window/TitleBar.Linux.kt | 8 +- .../org/jetbrains/jewel/window/TitleBar.kt | 6 +- .../jewel/window/styling/TitleBarStyling.kt | 4 +- .../jetbrains/jewel/window/utils/macos/ID.kt | 2 - .../jewel/window/utils/macos/MacUtil.kt | 2 +- .../jewel/bridge/UiThemeExtensions.kt | 4 +- .../jewel/bridge/BridgeResourceResolver.kt | 2 +- .../jewel/bridge/BridgeThemeColorPalette.kt | 2 +- .../org/jetbrains/jewel/bridge/BridgeUtils.kt | 2 +- .../org/jetbrains/jewel/bridge/IntUiBridge.kt | 136 +-- .../jewel/intui/core/styling/CommonMetrics.kt | 4 +- .../window/styling/IntUiTitleBarStyling.kt | 12 +- .../jewel/intui/standalone/IntUiTheme.kt | 38 +- .../standalone/styling/IntUiButtonStyling.kt | 51 +- .../styling/IntUiCheckboxStyling.kt | 50 +- .../standalone/styling/IntUiChipStyling.kt | 6 +- .../styling/IntUiCircularProgressStyling.kt | 2 +- .../standalone/styling/IntUiDividerStyle.kt | 4 +- .../styling/IntUiDropdownStyling.kt | 26 +- .../styling/IntUiGroupHeaderStyling.kt | 6 +- .../IntUiHorizontalProgressBarStyling.kt | 26 +- .../styling/IntUiIconButtonStyling.kt | 6 +- .../styling/IntUiLabelledTextFieldStyling.kt | 17 +- .../styling/IntUiLazyTreeStyling.kt | 15 +- .../standalone/styling/IntUiLinkStyling.kt | 55 +- .../standalone/styling/IntUiMenuStyling.kt | 33 +- .../styling/IntUiRadioButtonStyling.kt | 8 +- .../styling/IntUiScrollbarStyling.kt | 13 +- .../standalone/styling/IntUiTabStyling.kt | 10 +- .../styling/IntUiTextAreaStyling.kt | 6 +- .../styling/IntUiTextFieldStyling.kt | 6 +- .../standalone/styling/IntUiTooltipStyling.kt | 6 +- .../samples/ideplugin/ComponentShowcaseTab.kt | 24 +- .../releasessample/ReleasesSampleCompose.kt | 14 +- .../main/resources/android-releases/11.svg | 2 +- .../main/resources/android-releases/14.svg | 2 +- .../jewel/samples/standalone/Main.kt | 18 +- .../samples/standalone/components/Borders.kt | 6 +- .../samples/standalone/components/Buttons.kt | 11 +- .../standalone/components/Checkboxes.kt | 2 +- .../standalone/components/ChipsAndTree.kt | 10 +- .../standalone/components/Dropdowns.kt | 6 +- .../samples/standalone/components/Icons.kt | 2 +- .../samples/standalone/components/Links.kt | 10 +- .../standalone/components/ProgressBar.kt | 10 +- .../standalone/components/RadioButtons.kt | 2 +- .../samples/standalone/components/Tabs.kt | 8 +- .../standalone/components/TextAreas.kt | 4 +- .../standalone/components/TextFields.kt | 8 +- .../samples/standalone/components/Tooltips.kt | 4 +- .../src/main/resources/icons/gradleIcon.svg | 2 +- .../main/resources/icons/gradleIcon_dark.svg | 4 +- .../src/main/resources/icons/kotlin.svg | 19 +- 106 files changed, 1156 insertions(+), 1066 deletions(-) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Button.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Checkbox.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Chip.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/CircularProgressIndicator.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Divider.kt (89%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Dropdown.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Icon.kt (99%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/IconButton.kt (94%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/InputField.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/LabelledTextField.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/LazyTree.kt (93%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/LinearProgressBar.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Link.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Menu.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Popup.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/RadioButton.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Scrollbars.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/SplitLayout.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/TabStrip.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Tabs.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Text.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/TextArea.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/TextField.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/Tooltip.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/ButtonStyling.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/CheckboxStyling.kt (93%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/ChipStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/CircularProgressStyle.kt (89%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/DividerStyling.kt (92%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/DropdownStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/GroupHeaderStyling.kt (93%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/HorizontalProgressBarStyling.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/IconButtonMetrics.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/InputFieldStyling.kt (96%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/LabelledTextFieldStyling.kt (98%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/LazyTreeStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/LinkStyling.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/MenuStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/RadioButtonStyling.kt (93%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/ScrollbarStyling.kt (95%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/TabStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/TextAreaStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/TextFieldStyling.kt (97%) rename core/src/main/kotlin/org/jetbrains/jewel/{ => core/component}/styling/TooltipStyling.kt (95%) diff --git a/buildSrc/src/main/kotlin/MergeSarifTask.kt b/buildSrc/src/main/kotlin/MergeSarifTask.kt index 54e7fed10..d54a7c44d 100644 --- a/buildSrc/src/main/kotlin/MergeSarifTask.kt +++ b/buildSrc/src/main/kotlin/MergeSarifTask.kt @@ -39,7 +39,7 @@ open class MergeSarifTask : SourceTask() { .values .asSequence() .filter { it.isNotEmpty() } - .map { it.first().copy(results = it.flatMap { it.results ?: emptyList() }) } + .map { run -> run.first().copy(results = run.flatMap { it.results ?: emptyList() }) } .toList() ) logger.lifecycle("Merged SARIF file contains ${merged.runs.size} run(s)") diff --git a/buildSrc/src/main/kotlin/jewel.gradle.kts b/buildSrc/src/main/kotlin/jewel.gradle.kts index f6a1f3750..0751d8344 100644 --- a/buildSrc/src/main/kotlin/jewel.gradle.kts +++ b/buildSrc/src/main/kotlin/jewel.gradle.kts @@ -41,7 +41,8 @@ detekt { buildUponDefaultConfig = true } -val sarifReport = layout.buildDirectory.file("reports/ktlint-${project.name}.sarif") +val sarifReport: Provider = layout.buildDirectory + .file("reports/ktlint-${project.name}.sarif") tasks { detektMain { diff --git a/core/api/core.api b/core/api/core.api index 2e5291c71..03488b74c 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -13,19 +13,346 @@ public final class org/jetbrains/jewel/BorderColors { public final class org/jetbrains/jewel/BorderColors$Companion { } -public final class org/jetbrains/jewel/ButtonKt { +public abstract interface class org/jetbrains/jewel/ClassLoaderProvider { + public abstract fun getClassLoaders ()Ljava/util/List; +} + +public final class org/jetbrains/jewel/ComponentStyling { + public static final field $stable I + public fun (Lorg/jetbrains/jewel/styling/CheckboxStyle;Lorg/jetbrains/jewel/styling/ChipStyle;Lorg/jetbrains/jewel/styling/CircularProgressStyle;Lorg/jetbrains/jewel/styling/ButtonStyle;Lorg/jetbrains/jewel/styling/DropdownStyle;Lorg/jetbrains/jewel/styling/TabStyle;Lorg/jetbrains/jewel/styling/DividerStyle;Lorg/jetbrains/jewel/styling/TabStyle;Lorg/jetbrains/jewel/styling/GroupHeaderStyle;Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle;Lorg/jetbrains/jewel/styling/IconButtonStyle;Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle;Lorg/jetbrains/jewel/styling/LazyTreeStyle;Lorg/jetbrains/jewel/styling/LinkStyle;Lorg/jetbrains/jewel/styling/MenuStyle;Lorg/jetbrains/jewel/styling/ButtonStyle;Lorg/jetbrains/jewel/styling/RadioButtonStyle;Lorg/jetbrains/jewel/styling/ScrollbarStyle;Lorg/jetbrains/jewel/styling/TextAreaStyle;Lorg/jetbrains/jewel/styling/TextFieldStyle;Lorg/jetbrains/jewel/styling/TooltipStyle;Lorg/jetbrains/jewel/styling/DropdownStyle;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getCheckboxStyle ()Lorg/jetbrains/jewel/styling/CheckboxStyle; + public final fun getChipStyle ()Lorg/jetbrains/jewel/styling/ChipStyle; + public final fun getCircularProgressStyle ()Lorg/jetbrains/jewel/styling/CircularProgressStyle; + public final fun getDefaultButtonStyle ()Lorg/jetbrains/jewel/styling/ButtonStyle; + public final fun getDefaultDropdownStyle ()Lorg/jetbrains/jewel/styling/DropdownStyle; + public final fun getDefaultTabStyle ()Lorg/jetbrains/jewel/styling/TabStyle; + public final fun getDividerStyle ()Lorg/jetbrains/jewel/styling/DividerStyle; + public final fun getEditorTabStyle ()Lorg/jetbrains/jewel/styling/TabStyle; + public final fun getGroupHeaderStyle ()Lorg/jetbrains/jewel/styling/GroupHeaderStyle; + public final fun getHorizontalProgressBarStyle ()Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle; + public final fun getIconButtonStyle ()Lorg/jetbrains/jewel/styling/IconButtonStyle; + public final fun getLabelledTextFieldStyle ()Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle; + public final fun getLazyTreeStyle ()Lorg/jetbrains/jewel/styling/LazyTreeStyle; + public final fun getLinkStyle ()Lorg/jetbrains/jewel/styling/LinkStyle; + public final fun getMenuStyle ()Lorg/jetbrains/jewel/styling/MenuStyle; + public final fun getOutlinedButtonStyle ()Lorg/jetbrains/jewel/styling/ButtonStyle; + public final fun getRadioButtonStyle ()Lorg/jetbrains/jewel/styling/RadioButtonStyle; + public final fun getScrollbarStyle ()Lorg/jetbrains/jewel/styling/ScrollbarStyle; + public final fun getTextAreaStyle ()Lorg/jetbrains/jewel/styling/TextAreaStyle; + public final fun getTextFieldStyle ()Lorg/jetbrains/jewel/styling/TextFieldStyle; + public final fun getTooltipStyle ()Lorg/jetbrains/jewel/styling/TooltipStyle; + public final fun getUndecoratedDropdownStyle ()Lorg/jetbrains/jewel/styling/DropdownStyle; + public fun hashCode ()I + public final fun providedStyles (Landroidx/compose/runtime/Composer;I)[Landroidx/compose/runtime/ProvidedValue; + public fun toString ()Ljava/lang/String; +} + +public final class org/jetbrains/jewel/ContextMenuDivider : androidx/compose/foundation/ContextMenuItem { + public static final field $stable I + public static final field INSTANCE Lorg/jetbrains/jewel/ContextMenuDivider; +} + +public final class org/jetbrains/jewel/ContextMenuRepresentation : androidx/compose/foundation/ContextMenuRepresentation { + public static final field $stable I + public static final field INSTANCE Lorg/jetbrains/jewel/ContextMenuRepresentation; + public fun Representation (Landroidx/compose/foundation/ContextMenuState;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V +} + +public final class org/jetbrains/jewel/ContextSubmenu : androidx/compose/foundation/ContextMenuItem { + public static final field $stable I + public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V + public final fun getSubmenu ()Lkotlin/jvm/functions/Function0; +} + +public final class org/jetbrains/jewel/DisabledColorFilterKt { + public static final fun disabled (Landroidx/compose/ui/graphics/ColorFilter$Companion;)Landroidx/compose/ui/graphics/ColorFilter; +} + +public abstract interface annotation class org/jetbrains/jewel/ExperimentalJewelApi : java/lang/annotation/Annotation { +} + +public abstract interface class org/jetbrains/jewel/FocusableComponentState : org/jetbrains/jewel/InteractiveComponentState { + public abstract fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; + public abstract fun isFocused ()Z +} + +public final class org/jetbrains/jewel/FocusableComponentState$DefaultImpls { + public static fun chooseValue (Lorg/jetbrains/jewel/FocusableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; +} + +public abstract interface annotation class org/jetbrains/jewel/GenerateDataFunctions : java/lang/annotation/Annotation { +} + +public final class org/jetbrains/jewel/GlobalColors { + public static final field $stable I + public static final field Companion Lorg/jetbrains/jewel/GlobalColors$Companion; + public synthetic fun (Lorg/jetbrains/jewel/BorderColors;Lorg/jetbrains/jewel/OutlineColors;JJLkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getBorders ()Lorg/jetbrains/jewel/BorderColors; + public final fun getInfoContent-0d7_KjU ()J + public final fun getOutlines ()Lorg/jetbrains/jewel/OutlineColors; + public final fun getPaneBackground-0d7_KjU ()J + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class org/jetbrains/jewel/GlobalColors$Companion { +} + +public final class org/jetbrains/jewel/GlobalColorsKt { + public static final fun getLocalGlobalColors ()Landroidx/compose/runtime/ProvidableCompositionLocal; +} + +public final class org/jetbrains/jewel/GlobalMetrics { + public static final field $stable I + public static final field Companion Lorg/jetbrains/jewel/GlobalMetrics$Companion; + public synthetic fun (FFLkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getOutlineWidth-D9Ej5fM ()F + public final fun getRowHeight-D9Ej5fM ()F + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class org/jetbrains/jewel/GlobalMetrics$Companion { +} + +public final class org/jetbrains/jewel/GlobalMetricsKt { + public static final fun getLocalGlobalMetrics ()Landroidx/compose/runtime/ProvidableCompositionLocal; +} + +public final class org/jetbrains/jewel/GroupHeaderKt { + public static final fun GroupHeader-cf5BqRc (Ljava/lang/String;Landroidx/compose/ui/Modifier;JLorg/jetbrains/jewel/styling/GroupHeaderStyle;Landroidx/compose/runtime/Composer;II)V +} + +public abstract interface class org/jetbrains/jewel/InteractiveComponentState { + public abstract fun isActive ()Z + public abstract fun isEnabled ()Z + public abstract fun isHovered ()Z + public abstract fun isPressed ()Z +} + +public abstract interface annotation class org/jetbrains/jewel/InternalJewelApi : java/lang/annotation/Annotation { +} + +public abstract interface class org/jetbrains/jewel/JewelTheme { + public static final field Companion Lorg/jetbrains/jewel/JewelTheme$Companion; +} + +public final class org/jetbrains/jewel/JewelTheme$Companion { + public final fun getCheckboxStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/CheckboxStyle; + public final fun getChipStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ChipStyle; + public final fun getCircularProgressStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/CircularProgressStyle; + public final fun getColorPalette (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/ThemeColorPalette; + public final fun getContentColor (Landroidx/compose/runtime/Composer;I)J + public final fun getDefaultButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ButtonStyle; + public final fun getDefaultTabStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TabStyle; + public final fun getDividerStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/DividerStyle; + public final fun getDropdownStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/DropdownStyle; + public final fun getEditorTabStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TabStyle; + public final fun getGlobalColors (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/GlobalColors; + public final fun getGlobalMetrics (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/GlobalMetrics; + public final fun getGroupHeaderStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/GroupHeaderStyle; + public final fun getHorizontalProgressBarStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle; + public final fun getIconButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/IconButtonStyle; + public final fun getIconData (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/ThemeIconData; + public final fun getLabelledTextFieldStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle; + public final fun getLinkStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LinkStyle; + public final fun getMenuStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/MenuStyle; + public final fun getOutlinedButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ButtonStyle; + public final fun getRadioButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/RadioButtonStyle; + public final fun getScrollbarStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ScrollbarStyle; + public final fun getTextAreaStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TextAreaStyle; + public final fun getTextFieldStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TextFieldStyle; + public final fun getTextStyle (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/text/TextStyle; + public final fun getTooltipStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TooltipStyle; + public final fun getTreeStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LazyTreeStyle; + public final fun isDark (Landroidx/compose/runtime/Composer;I)Z + public final fun isSwingCompatMode (Landroidx/compose/runtime/Composer;I)Z +} + +public final class org/jetbrains/jewel/JewelThemeKt { + public static final fun JewelTheme (Lorg/jetbrains/jewel/ThemeDefinition;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V + public static final fun JewelTheme (Lorg/jetbrains/jewel/ThemeDefinition;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V + public static final fun OverrideDarkMode (ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V + public static final fun getLocalColorPalette ()Landroidx/compose/runtime/ProvidableCompositionLocal; + public static final fun getLocalIconData ()Landroidx/compose/runtime/ProvidableCompositionLocal; +} + +public final class org/jetbrains/jewel/MenuManager { + public static final field $stable I + public fun (Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/MenuManager;)V + public synthetic fun (Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/MenuManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun close-iuPiT84 (I)Z + public final fun closeAll-HMVJIwE (IZ)V + public final fun getOnDismissRequest ()Lkotlin/jvm/functions/Function1; + public final fun isRootMenu ()Z + public final fun isSubmenu ()Z + public final fun submenuManager (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/jewel/MenuManager; +} + +public final class org/jetbrains/jewel/MenuManagerKt { + public static final fun getLocalMenuManager ()Landroidx/compose/runtime/ProvidableCompositionLocal; +} + +public final class org/jetbrains/jewel/NoIndication : androidx/compose/foundation/Indication { + public static final field $stable I + public static final field INSTANCE Lorg/jetbrains/jewel/NoIndication; + public fun rememberUpdatedInstance (Landroidx/compose/foundation/interaction/InteractionSource;Landroidx/compose/runtime/Composer;I)Landroidx/compose/foundation/IndicationInstance; +} + +public final class org/jetbrains/jewel/Orientation : java/lang/Enum { + public static final field Horizontal Lorg/jetbrains/jewel/Orientation; + public static final field Vertical Lorg/jetbrains/jewel/Orientation; + public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/jewel/Orientation; + public static fun values ()[Lorg/jetbrains/jewel/Orientation; +} + +public final class org/jetbrains/jewel/Outline : java/lang/Enum { + public static final field Companion Lorg/jetbrains/jewel/Outline$Companion; + public static final field Error Lorg/jetbrains/jewel/Outline; + public static final field None Lorg/jetbrains/jewel/Outline; + public static final field Warning Lorg/jetbrains/jewel/Outline; + public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/jewel/Outline; + public static fun values ()[Lorg/jetbrains/jewel/Outline; +} + +public final class org/jetbrains/jewel/Outline$Companion { + public final fun of (ZZ)Lorg/jetbrains/jewel/Outline; +} + +public final class org/jetbrains/jewel/OutlineColors { + public static final field $stable I + public static final field Companion Lorg/jetbrains/jewel/OutlineColors$Companion; + public synthetic fun (JJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getError-0d7_KjU ()J + public final fun getFocused-0d7_KjU ()J + public final fun getFocusedError-0d7_KjU ()J + public final fun getFocusedWarning-0d7_KjU ()J + public final fun getWarning-0d7_KjU ()J + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class org/jetbrains/jewel/OutlineColors$Companion { +} + +public final class org/jetbrains/jewel/OutlineKt { + public static final fun focusOutline-FJfuzF0 (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/FocusableComponentState;Landroidx/compose/ui/graphics/Shape;Lorg/jetbrains/jewel/foundation/Stroke$Alignment;FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier; + public static final fun outline-HYR8e34 (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/FocusableComponentState;Lorg/jetbrains/jewel/Outline;Landroidx/compose/ui/graphics/Shape;Lorg/jetbrains/jewel/foundation/Stroke$Alignment;FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier; +} + +public abstract interface class org/jetbrains/jewel/SelectableComponentState : org/jetbrains/jewel/FocusableComponentState { + public abstract fun isSelected ()Z +} + +public final class org/jetbrains/jewel/SelectableComponentState$DefaultImpls { + public static fun chooseValue (Lorg/jetbrains/jewel/SelectableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; +} + +public final class org/jetbrains/jewel/ThemeColorPalette { + public static final field $stable I + public static final field Companion Lorg/jetbrains/jewel/ThemeColorPalette$Companion; + public fun (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/Map;)V + public final fun blue-vNxB06k (I)J + 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 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 green-vNxB06k (I)J + public final fun greenOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public final fun grey-vNxB06k (I)J + public final fun greyOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public fun hashCode ()I + public final fun lookup-ijrfgN4 (Ljava/lang/String;)Landroidx/compose/ui/graphics/Color; + public final fun orange-vNxB06k (I)J + public final fun orangeOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public final fun purple-vNxB06k (I)J + public final fun purpleOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public final fun red-vNxB06k (I)J + public final fun redOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public final fun teal-vNxB06k (I)J + public final fun tealOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; + public fun toString ()Ljava/lang/String; + public final fun yellow-vNxB06k (I)J + public final fun yellowOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; +} + +public final class org/jetbrains/jewel/ThemeColorPalette$Companion { + public final fun getEmpty ()Lorg/jetbrains/jewel/ThemeColorPalette; +} + +public final class org/jetbrains/jewel/ThemeDefinition { + public static final field $stable I + public synthetic fun (ZLorg/jetbrains/jewel/GlobalColors;Lorg/jetbrains/jewel/GlobalMetrics;Landroidx/compose/ui/text/TextStyle;JLorg/jetbrains/jewel/ThemeColorPalette;Lorg/jetbrains/jewel/ThemeIconData;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getColorPalette ()Lorg/jetbrains/jewel/ThemeColorPalette; + public final fun getContentColor-0d7_KjU ()J + public final fun getDefaultTextStyle ()Landroidx/compose/ui/text/TextStyle; + public final fun getGlobalColors ()Lorg/jetbrains/jewel/GlobalColors; + public final fun getGlobalMetrics ()Lorg/jetbrains/jewel/GlobalMetrics; + public final fun getIconData ()Lorg/jetbrains/jewel/ThemeIconData; + public fun hashCode ()I + public final fun isDark ()Z + public fun toString ()Ljava/lang/String; +} + +public abstract interface class org/jetbrains/jewel/ThemeDescriptor { + public abstract fun getColors ()Lorg/jetbrains/jewel/ThemeColorPalette; + public abstract fun getIconData ()Lorg/jetbrains/jewel/ThemeIconData; + public abstract fun getName ()Ljava/lang/String; + public abstract fun isDark ()Z +} + +public final class org/jetbrains/jewel/ThemeIconData { + public static final field $stable I + public static final field Companion Lorg/jetbrains/jewel/ThemeIconData$Companion; + public fun (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V + public final fun getColorPalette ()Ljava/util/Map; + public final fun getIconOverrides ()Ljava/util/Map; + public final fun getSelectionColorPalette ()Ljava/util/Map; + public final fun selectionColorMapping ()Ljava/util/Map; +} + +public final class org/jetbrains/jewel/ThemeIconData$Companion { + public final fun getEmpty ()Lorg/jetbrains/jewel/ThemeIconData; +} + +public abstract interface class org/jetbrains/jewel/ToggleableComponentState : org/jetbrains/jewel/SelectableComponentState { + public static final field Companion Lorg/jetbrains/jewel/ToggleableComponentState$Companion; + public abstract fun getToggleableState ()Landroidx/compose/ui/state/ToggleableState; +} + +public final class org/jetbrains/jewel/ToggleableComponentState$Companion { + public final fun readToggleableState-VKZWuLQ (J)Landroidx/compose/ui/state/ToggleableState; +} + +public final class org/jetbrains/jewel/ToggleableComponentState$DefaultImpls { + public static fun chooseValue (Lorg/jetbrains/jewel/ToggleableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; +} + +public final class org/jetbrains/jewel/core/component/ButtonKt { public static final fun DefaultButton (Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/ButtonStyle;Landroidx/compose/ui/text/TextStyle;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedButton (Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/ButtonStyle;Landroidx/compose/ui/text/TextStyle;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/ButtonState : org/jetbrains/jewel/FocusableComponentState { - public static final field Companion Lorg/jetbrains/jewel/ButtonState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/ButtonState; +public final class org/jetbrains/jewel/core/component/ButtonState : org/jetbrains/jewel/FocusableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/ButtonState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/ButtonState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-b10xpbw (JZZZZZ)J - public static synthetic fun copy-b10xpbw$default (JZZZZZILjava/lang/Object;)J + public static final fun copy-XTendnk (JZZZZZ)J + public static synthetic fun copy-XTendnk$default (JZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -47,12 +374,12 @@ public final class org/jetbrains/jewel/ButtonState : org/jetbrains/jewel/Focusab public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/ButtonState$Companion { - public final fun of-b10xpbw (ZZZZZ)J - public static synthetic fun of-b10xpbw$default (Lorg/jetbrains/jewel/ButtonState$Companion;ZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/ButtonState$Companion { + public final fun of-XTendnk (ZZZZZ)J + public static synthetic fun of-XTendnk$default (Lorg/jetbrains/jewel/core/component/ButtonState$Companion;ZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/CheckboxKt { +public final class org/jetbrains/jewel/core/component/CheckboxKt { public static final fun Checkbox (ZLkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/CheckboxColors;Lorg/jetbrains/jewel/styling/CheckboxMetrics;Lorg/jetbrains/jewel/styling/CheckboxIcons;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)V public static final fun CheckboxRow (Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/CheckboxColors;Lorg/jetbrains/jewel/styling/CheckboxMetrics;Lorg/jetbrains/jewel/styling/CheckboxIcons;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;III)V public static final fun CheckboxRow (ZLkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/CheckboxColors;Lorg/jetbrains/jewel/styling/CheckboxMetrics;Lorg/jetbrains/jewel/styling/CheckboxIcons;Landroidx/compose/ui/text/TextStyle;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V @@ -61,14 +388,14 @@ public final class org/jetbrains/jewel/CheckboxKt { public static final fun TriStateCheckboxRow (Ljava/lang/String;Landroidx/compose/ui/state/ToggleableState;Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/CheckboxColors;Lorg/jetbrains/jewel/styling/CheckboxMetrics;Lorg/jetbrains/jewel/styling/CheckboxIcons;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;III)V } -public final class org/jetbrains/jewel/CheckboxState : org/jetbrains/jewel/ToggleableComponentState { - public static final field Companion Lorg/jetbrains/jewel/CheckboxState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/CheckboxState; +public final class org/jetbrains/jewel/core/component/CheckboxState : org/jetbrains/jewel/ToggleableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/CheckboxState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/CheckboxState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-PjUgVWY (JLandroidx/compose/ui/state/ToggleableState;ZZZZZ)J - public static synthetic fun copy-PjUgVWY$default (JLandroidx/compose/ui/state/ToggleableState;ZZZZZILjava/lang/Object;)J + public static final fun copy-u7J30UY (JLandroidx/compose/ui/state/ToggleableState;ZZZZZ)J + public static synthetic fun copy-u7J30UY$default (JLandroidx/compose/ui/state/ToggleableState;ZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -93,25 +420,25 @@ public final class org/jetbrains/jewel/CheckboxState : org/jetbrains/jewel/Toggl public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/CheckboxState$Companion { - public final fun of-PjUgVWY (Landroidx/compose/ui/state/ToggleableState;ZZZZZ)J - public static synthetic fun of-PjUgVWY$default (Lorg/jetbrains/jewel/CheckboxState$Companion;Landroidx/compose/ui/state/ToggleableState;ZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/CheckboxState$Companion { + public final fun of-u7J30UY (Landroidx/compose/ui/state/ToggleableState;ZZZZZ)J + public static synthetic fun of-u7J30UY$default (Lorg/jetbrains/jewel/core/component/CheckboxState$Companion;Landroidx/compose/ui/state/ToggleableState;ZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/ChipKt { +public final class org/jetbrains/jewel/core/component/ChipKt { public static final fun Chip (Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/interaction/MutableInteractionSource;ZZLorg/jetbrains/jewel/styling/ChipStyle;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun RadioButtonChip (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/interaction/MutableInteractionSource;ZLorg/jetbrains/jewel/styling/ChipStyle;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun ToggleableChip (ZLkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/interaction/MutableInteractionSource;ZLorg/jetbrains/jewel/styling/ChipStyle;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/ChipState : org/jetbrains/jewel/FocusableComponentState, org/jetbrains/jewel/SelectableComponentState { - public static final field Companion Lorg/jetbrains/jewel/ChipState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/ChipState; +public final class org/jetbrains/jewel/core/component/ChipState : org/jetbrains/jewel/FocusableComponentState, org/jetbrains/jewel/SelectableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/ChipState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/ChipState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-Dtzntvw (JZZZZZZ)J - public static synthetic fun copy-Dtzntvw$default (JZZZZZZILjava/lang/Object;)J + public static final fun copy-X1QkNFE (JZZZZZZ)J + public static synthetic fun copy-X1QkNFE$default (JZZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -135,183 +462,70 @@ public final class org/jetbrains/jewel/ChipState : org/jetbrains/jewel/Focusable public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/ChipState$Companion { - public final fun of-Dtzntvw (ZZZZZZ)J - public static synthetic fun of-Dtzntvw$default (Lorg/jetbrains/jewel/ChipState$Companion;ZZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/ChipState$Companion { + public final fun of-X1QkNFE (ZZZZZZ)J + public static synthetic fun of-X1QkNFE$default (Lorg/jetbrains/jewel/core/component/ChipState$Companion;ZZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/CircularProgressIndicatorKt { +public final class org/jetbrains/jewel/core/component/CircularProgressIndicatorKt { public static final fun CircularProgressIndicator (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/CircularProgressStyle;Landroidx/compose/runtime/Composer;II)V public static final fun CircularProgressIndicatorBig (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/CircularProgressStyle;Landroidx/compose/runtime/Composer;II)V } -public abstract interface class org/jetbrains/jewel/ClassLoaderProvider { - public abstract fun getClassLoaders ()Ljava/util/List; -} - -public final class org/jetbrains/jewel/ComponentStyling { - public static final field $stable I - public fun (Lorg/jetbrains/jewel/styling/CheckboxStyle;Lorg/jetbrains/jewel/styling/ChipStyle;Lorg/jetbrains/jewel/styling/CircularProgressStyle;Lorg/jetbrains/jewel/styling/ButtonStyle;Lorg/jetbrains/jewel/styling/DropdownStyle;Lorg/jetbrains/jewel/styling/TabStyle;Lorg/jetbrains/jewel/styling/DividerStyle;Lorg/jetbrains/jewel/styling/TabStyle;Lorg/jetbrains/jewel/styling/GroupHeaderStyle;Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle;Lorg/jetbrains/jewel/styling/IconButtonStyle;Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle;Lorg/jetbrains/jewel/styling/LazyTreeStyle;Lorg/jetbrains/jewel/styling/LinkStyle;Lorg/jetbrains/jewel/styling/MenuStyle;Lorg/jetbrains/jewel/styling/ButtonStyle;Lorg/jetbrains/jewel/styling/RadioButtonStyle;Lorg/jetbrains/jewel/styling/ScrollbarStyle;Lorg/jetbrains/jewel/styling/TextAreaStyle;Lorg/jetbrains/jewel/styling/TextFieldStyle;Lorg/jetbrains/jewel/styling/TooltipStyle;Lorg/jetbrains/jewel/styling/DropdownStyle;)V - public fun equals (Ljava/lang/Object;)Z - public final fun getCheckboxStyle ()Lorg/jetbrains/jewel/styling/CheckboxStyle; - public final fun getChipStyle ()Lorg/jetbrains/jewel/styling/ChipStyle; - public final fun getCircularProgressStyle ()Lorg/jetbrains/jewel/styling/CircularProgressStyle; - public final fun getDefaultButtonStyle ()Lorg/jetbrains/jewel/styling/ButtonStyle; - public final fun getDefaultDropdownStyle ()Lorg/jetbrains/jewel/styling/DropdownStyle; - public final fun getDefaultTabStyle ()Lorg/jetbrains/jewel/styling/TabStyle; - public final fun getDividerStyle ()Lorg/jetbrains/jewel/styling/DividerStyle; - public final fun getEditorTabStyle ()Lorg/jetbrains/jewel/styling/TabStyle; - public final fun getGroupHeaderStyle ()Lorg/jetbrains/jewel/styling/GroupHeaderStyle; - public final fun getHorizontalProgressBarStyle ()Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle; - public final fun getIconButtonStyle ()Lorg/jetbrains/jewel/styling/IconButtonStyle; - public final fun getLabelledTextFieldStyle ()Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle; - public final fun getLazyTreeStyle ()Lorg/jetbrains/jewel/styling/LazyTreeStyle; - public final fun getLinkStyle ()Lorg/jetbrains/jewel/styling/LinkStyle; - public final fun getMenuStyle ()Lorg/jetbrains/jewel/styling/MenuStyle; - public final fun getOutlinedButtonStyle ()Lorg/jetbrains/jewel/styling/ButtonStyle; - public final fun getRadioButtonStyle ()Lorg/jetbrains/jewel/styling/RadioButtonStyle; - public final fun getScrollbarStyle ()Lorg/jetbrains/jewel/styling/ScrollbarStyle; - public final fun getTextAreaStyle ()Lorg/jetbrains/jewel/styling/TextAreaStyle; - public final fun getTextFieldStyle ()Lorg/jetbrains/jewel/styling/TextFieldStyle; - public final fun getTooltipStyle ()Lorg/jetbrains/jewel/styling/TooltipStyle; - public final fun getUndecoratedDropdownStyle ()Lorg/jetbrains/jewel/styling/DropdownStyle; - public fun hashCode ()I - public final fun providedStyles (Landroidx/compose/runtime/Composer;I)[Landroidx/compose/runtime/ProvidedValue; - public fun toString ()Ljava/lang/String; -} - -public final class org/jetbrains/jewel/ComposableSingletons$MenuKt { - public static final field INSTANCE Lorg/jetbrains/jewel/ComposableSingletons$MenuKt; - public static field lambda-1 Lkotlin/jvm/functions/Function2; - public fun ()V - public final fun getLambda-1$core ()Lkotlin/jvm/functions/Function2; -} - -public final class org/jetbrains/jewel/ContextMenuDivider : androidx/compose/foundation/ContextMenuItem { - public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/ContextMenuDivider; -} - -public final class org/jetbrains/jewel/ContextMenuRepresentation : androidx/compose/foundation/ContextMenuRepresentation { - public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/ContextMenuRepresentation; - public fun Representation (Landroidx/compose/foundation/ContextMenuState;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V -} - -public final class org/jetbrains/jewel/ContextSubmenu : androidx/compose/foundation/ContextMenuItem { - public static final field $stable I - public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V - public final fun getSubmenu ()Lkotlin/jvm/functions/Function0; -} - -public final class org/jetbrains/jewel/DisabledColorFilterKt { - public static final fun disabled (Landroidx/compose/ui/graphics/ColorFilter$Companion;)Landroidx/compose/ui/graphics/ColorFilter; -} - -public final class org/jetbrains/jewel/DividerKt { - public static final fun Divider-RLL6an4 (Lorg/jetbrains/jewel/Orientation;Landroidx/compose/ui/Modifier;JFFLorg/jetbrains/jewel/styling/DividerStyle;Landroidx/compose/runtime/Composer;II)V -} - -public final class org/jetbrains/jewel/DropdownKt { - public static final fun Dropdown (Landroidx/compose/ui/Modifier;ZLandroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/DropdownStyle;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V -} - -public final class org/jetbrains/jewel/DropdownState : org/jetbrains/jewel/FocusableComponentState { - public static final field Companion Lorg/jetbrains/jewel/DropdownState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/DropdownState; - public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; - public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; - public static fun constructor-impl (J)J - public static final fun copy-eyYTm3Q (JZZZZZ)J - public static synthetic fun copy-eyYTm3Q$default (JZZZZZILjava/lang/Object;)J - public fun equals (Ljava/lang/Object;)Z - public static fun equals-impl (JLjava/lang/Object;)Z - public static final fun equals-impl0 (JJ)Z - public final fun getState-s-VKNKU ()J - public fun hashCode ()I - public static fun hashCode-impl (J)I - public fun isActive ()Z - public static fun isActive-impl (J)Z - public fun isEnabled ()Z - public static fun isEnabled-impl (J)Z - public fun isFocused ()Z - public static fun isFocused-impl (J)Z - public fun isHovered ()Z - public static fun isHovered-impl (J)Z - public fun isPressed ()Z - public static fun isPressed-impl (J)Z - public fun toString ()Ljava/lang/String; - public static fun toString-impl (J)Ljava/lang/String; - public final synthetic fun unbox-impl ()J -} - -public final class org/jetbrains/jewel/DropdownState$Companion { - public final fun of-eyYTm3Q (ZZZZZ)J - public static synthetic fun of-eyYTm3Q$default (Lorg/jetbrains/jewel/DropdownState$Companion;ZZZZZILjava/lang/Object;)J -} - -public abstract interface annotation class org/jetbrains/jewel/ExperimentalJewelApi : java/lang/annotation/Annotation { -} - -public abstract interface class org/jetbrains/jewel/FocusableComponentState : org/jetbrains/jewel/InteractiveComponentState { - public abstract fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; - public abstract fun isFocused ()Z -} - -public final class org/jetbrains/jewel/FocusableComponentState$DefaultImpls { - public static fun chooseValue (Lorg/jetbrains/jewel/FocusableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; -} - -public abstract interface annotation class org/jetbrains/jewel/GenerateDataFunctions : java/lang/annotation/Annotation { -} - -public final class org/jetbrains/jewel/GlobalColors { - public static final field $stable I - public static final field Companion Lorg/jetbrains/jewel/GlobalColors$Companion; - public synthetic fun (Lorg/jetbrains/jewel/BorderColors;Lorg/jetbrains/jewel/OutlineColors;JJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun equals (Ljava/lang/Object;)Z - public final fun getBorders ()Lorg/jetbrains/jewel/BorderColors; - public final fun getInfoContent-0d7_KjU ()J - public final fun getOutlines ()Lorg/jetbrains/jewel/OutlineColors; - public final fun getPaneBackground-0d7_KjU ()J - public fun hashCode ()I - public fun toString ()Ljava/lang/String; +public final class org/jetbrains/jewel/core/component/ComposableSingletons$MenuKt { + public static final field INSTANCE Lorg/jetbrains/jewel/core/component/ComposableSingletons$MenuKt; + public static field lambda-1 Lkotlin/jvm/functions/Function2; + public fun ()V + public final fun getLambda-1$core ()Lkotlin/jvm/functions/Function2; } -public final class org/jetbrains/jewel/GlobalColors$Companion { +public final class org/jetbrains/jewel/core/component/DividerKt { + public static final fun Divider-RLL6an4 (Lorg/jetbrains/jewel/Orientation;Landroidx/compose/ui/Modifier;JFFLorg/jetbrains/jewel/styling/DividerStyle;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/GlobalColorsKt { - public static final fun getLocalGlobalColors ()Landroidx/compose/runtime/ProvidableCompositionLocal; +public final class org/jetbrains/jewel/core/component/DropdownKt { + public static final fun Dropdown (Landroidx/compose/ui/Modifier;ZLandroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/DropdownStyle;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/GlobalMetrics { - public static final field $stable I - public static final field Companion Lorg/jetbrains/jewel/GlobalMetrics$Companion; - public synthetic fun (FFLkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class org/jetbrains/jewel/core/component/DropdownState : org/jetbrains/jewel/FocusableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/DropdownState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/DropdownState; + public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; + public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; + public static fun constructor-impl (J)J + public static final fun copy-Qeg9ZnA (JZZZZZ)J + public static synthetic fun copy-Qeg9ZnA$default (JZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z - public final fun getOutlineWidth-D9Ej5fM ()F - public final fun getRowHeight-D9Ej5fM ()F + public static fun equals-impl (JLjava/lang/Object;)Z + public static final fun equals-impl0 (JJ)Z + public final fun getState-s-VKNKU ()J public fun hashCode ()I + public static fun hashCode-impl (J)I + public fun isActive ()Z + public static fun isActive-impl (J)Z + public fun isEnabled ()Z + public static fun isEnabled-impl (J)Z + public fun isFocused ()Z + public static fun isFocused-impl (J)Z + public fun isHovered ()Z + public static fun isHovered-impl (J)Z + public fun isPressed ()Z + public static fun isPressed-impl (J)Z public fun toString ()Ljava/lang/String; + public static fun toString-impl (J)Ljava/lang/String; + public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/GlobalMetrics$Companion { -} - -public final class org/jetbrains/jewel/GlobalMetricsKt { - public static final fun getLocalGlobalMetrics ()Landroidx/compose/runtime/ProvidableCompositionLocal; -} - -public final class org/jetbrains/jewel/GroupHeaderKt { - public static final fun GroupHeader-cf5BqRc (Ljava/lang/String;Landroidx/compose/ui/Modifier;JLorg/jetbrains/jewel/styling/GroupHeaderStyle;Landroidx/compose/runtime/Composer;II)V +public final class org/jetbrains/jewel/core/component/DropdownState$Companion { + public final fun of-Qeg9ZnA (ZZZZZ)J + public static synthetic fun of-Qeg9ZnA$default (Lorg/jetbrains/jewel/core/component/DropdownState$Companion;ZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/IconButtonKt { +public final class org/jetbrains/jewel/core/component/IconButtonKt { public static final fun IconButton (Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/styling/IconButtonStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/IconKt { +public final class org/jetbrains/jewel/core/component/IconKt { public static final fun Icon (Landroidx/compose/ui/graphics/painter/Painter;Ljava/lang/String;Landroidx/compose/ui/graphics/ColorFilter;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun Icon (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Landroidx/compose/ui/graphics/ColorFilter;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun Icon-ww6aTOc (Landroidx/compose/ui/graphics/ImageBitmap;Ljava/lang/String;Landroidx/compose/ui/Modifier;JLandroidx/compose/runtime/Composer;II)V @@ -321,14 +535,14 @@ public final class org/jetbrains/jewel/IconKt { public static final fun painterResource (Ljava/lang/String;Landroidx/compose/ui/res/ResourceLoader;Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/graphics/painter/Painter; } -public final class org/jetbrains/jewel/InputFieldState : org/jetbrains/jewel/FocusableComponentState { - public static final field Companion Lorg/jetbrains/jewel/InputFieldState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/InputFieldState; +public final class org/jetbrains/jewel/core/component/InputFieldState : org/jetbrains/jewel/FocusableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/InputFieldState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/InputFieldState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-uqjUvac (JZZZZZ)J - public static synthetic fun copy-uqjUvac$default (JZZZZZILjava/lang/Object;)J + public static final fun copy-IdnYAE4 (JZZZZZ)J + public static synthetic fun copy-IdnYAE4$default (JZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -350,94 +564,40 @@ public final class org/jetbrains/jewel/InputFieldState : org/jetbrains/jewel/Foc public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/InputFieldState$Companion { - public final fun of-uqjUvac (ZZZZZ)J - public static synthetic fun of-uqjUvac$default (Lorg/jetbrains/jewel/InputFieldState$Companion;ZZZZZILjava/lang/Object;)J -} - -public abstract interface class org/jetbrains/jewel/InteractiveComponentState { - public abstract fun isActive ()Z - public abstract fun isEnabled ()Z - public abstract fun isHovered ()Z - public abstract fun isPressed ()Z -} - -public abstract interface annotation class org/jetbrains/jewel/InternalJewelApi : java/lang/annotation/Annotation { -} - -public abstract interface class org/jetbrains/jewel/JewelTheme { - public static final field Companion Lorg/jetbrains/jewel/JewelTheme$Companion; -} - -public final class org/jetbrains/jewel/JewelTheme$Companion { - public final fun getCheckboxStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/CheckboxStyle; - public final fun getChipStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ChipStyle; - public final fun getCircularProgressStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/CircularProgressStyle; - public final fun getColorPalette (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/ThemeColorPalette; - public final fun getContentColor (Landroidx/compose/runtime/Composer;I)J - public final fun getDefaultButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ButtonStyle; - public final fun getDefaultTabStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TabStyle; - public final fun getDividerStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/DividerStyle; - public final fun getDropdownStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/DropdownStyle; - public final fun getEditorTabStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TabStyle; - public final fun getGlobalColors (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/GlobalColors; - public final fun getGlobalMetrics (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/GlobalMetrics; - public final fun getGroupHeaderStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/GroupHeaderStyle; - public final fun getHorizontalProgressBarStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle; - public final fun getIconButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/IconButtonStyle; - public final fun getIconData (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/ThemeIconData; - public final fun getLabelledTextFieldStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle; - public final fun getLinkStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LinkStyle; - public final fun getMenuStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/MenuStyle; - public final fun getOutlinedButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ButtonStyle; - public final fun getRadioButtonStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/RadioButtonStyle; - public final fun getScrollbarStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/ScrollbarStyle; - public final fun getTextAreaStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TextAreaStyle; - public final fun getTextFieldStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TextFieldStyle; - public final fun getTextStyle (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/text/TextStyle; - public final fun getTooltipStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/TooltipStyle; - public final fun getTreeStyle (Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/styling/LazyTreeStyle; - public final fun isDark (Landroidx/compose/runtime/Composer;I)Z - public final fun isSwingCompatMode (Landroidx/compose/runtime/Composer;I)Z -} - -public final class org/jetbrains/jewel/JewelThemeKt { - public static final fun JewelTheme (Lorg/jetbrains/jewel/ThemeDefinition;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V - public static final fun JewelTheme (Lorg/jetbrains/jewel/ThemeDefinition;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V - public static final fun OverrideDarkMode (ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V - public static final fun getLocalColorPalette ()Landroidx/compose/runtime/ProvidableCompositionLocal; - public static final fun getLocalIconData ()Landroidx/compose/runtime/ProvidableCompositionLocal; +public final class org/jetbrains/jewel/core/component/InputFieldState$Companion { + public final fun of-IdnYAE4 (ZZZZZ)J + public static synthetic fun of-IdnYAE4$default (Lorg/jetbrains/jewel/core/component/InputFieldState$Companion;ZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/LabelledTextFieldKt { +public final class org/jetbrains/jewel/core/component/LabelledTextFieldKt { public static final fun LabelledTextField (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Modifier;ZZLorg/jetbrains/jewel/Outline;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ZLandroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V public static final fun LabelledTextField (Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/text/input/TextFieldValue;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Modifier;ZZLorg/jetbrains/jewel/Outline;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ZLandroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/LabelledTextFieldStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V } -public final class org/jetbrains/jewel/LazyTreeKt { +public final class org/jetbrains/jewel/core/component/LazyTreeKt { public static final fun LazyTree (Lorg/jetbrains/jewel/foundation/tree/Tree;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/tree/TreeState;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/tree/KeyBindingActions;Lorg/jetbrains/jewel/styling/LazyTreeStyle;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/LinearProgressBarKt { +public final class org/jetbrains/jewel/core/component/LinearProgressBarKt { public static final fun HorizontalProgressBar (FLandroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle;Landroidx/compose/runtime/Composer;II)V public static final fun IndeterminateHorizontalProgressBar (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/HorizontalProgressBarStyle;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/LinkKt { +public final class org/jetbrains/jewel/core/component/LinkKt { public static final fun DropdownLink-fG7obvk (Ljava/lang/String;Landroidx/compose/ui/Modifier;ZJLandroidx/compose/ui/text/font/FontStyle;Landroidx/compose/ui/text/font/FontWeight;Landroidx/compose/ui/text/font/FontFamily;JLandroidx/compose/ui/text/style/TextAlign;IJLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/LinkStyle;Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/MenuStyle;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V public static final fun ExternalLink-Bx0nqJE (Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZJLandroidx/compose/ui/text/font/FontStyle;Landroidx/compose/ui/text/font/FontWeight;Landroidx/compose/ui/text/font/FontFamily;JLandroidx/compose/ui/text/style/TextAlign;IJLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/LinkStyle;Landroidx/compose/runtime/Composer;III)V public static final fun Link-Bx0nqJE (Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZJLandroidx/compose/ui/text/font/FontStyle;Landroidx/compose/ui/text/font/FontWeight;Landroidx/compose/ui/text/font/FontFamily;JLandroidx/compose/ui/text/style/TextAlign;IJLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/LinkStyle;Landroidx/compose/runtime/Composer;III)V } -public final class org/jetbrains/jewel/LinkState : org/jetbrains/jewel/FocusableComponentState { - public static final field Companion Lorg/jetbrains/jewel/LinkState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/LinkState; +public final class org/jetbrains/jewel/core/component/LinkState : org/jetbrains/jewel/FocusableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/LinkState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/LinkState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static final fun chooseValueWithVisited-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-dcSyc74 (JZZZZZZ)J - public static synthetic fun copy-dcSyc74$default (JZZZZZZILjava/lang/Object;)J + public static final fun copy-DXpmgZk (JZZZZZZ)J + public static synthetic fun copy-DXpmgZk$default (JZZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -460,19 +620,19 @@ public final class org/jetbrains/jewel/LinkState : org/jetbrains/jewel/Focusable public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/LinkState$Companion { - public final fun of-dcSyc74 (ZZZZZZ)J - public static synthetic fun of-dcSyc74$default (Lorg/jetbrains/jewel/LinkState$Companion;ZZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/LinkState$Companion { + public final fun of-DXpmgZk (ZZZZZZ)J + public static synthetic fun of-DXpmgZk$default (Lorg/jetbrains/jewel/core/component/LinkState$Companion;ZZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/MenuItemState : org/jetbrains/jewel/SelectableComponentState { - public static final field Companion Lorg/jetbrains/jewel/MenuItemState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/MenuItemState; +public final class org/jetbrains/jewel/core/component/MenuItemState : org/jetbrains/jewel/SelectableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/MenuItemState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/MenuItemState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-b3WktiI (JZZZZZZ)J - public static synthetic fun copy-b3WktiI$default (JZZZZZZILjava/lang/Object;)J + public static final fun copy-CRGtGYo (JZZZZZZ)J + public static synthetic fun copy-CRGtGYo$default (JZZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -496,110 +656,46 @@ public final class org/jetbrains/jewel/MenuItemState : org/jetbrains/jewel/Selec public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/MenuItemState$Companion { - public final fun of-b3WktiI (ZZZZZZ)J - public static synthetic fun of-b3WktiI$default (Lorg/jetbrains/jewel/MenuItemState$Companion;ZZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/MenuItemState$Companion { + public final fun of-CRGtGYo (ZZZZZZ)J + public static synthetic fun of-CRGtGYo$default (Lorg/jetbrains/jewel/core/component/MenuItemState$Companion;ZZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/MenuKt { +public final class org/jetbrains/jewel/core/component/MenuKt { public static final fun MenuItem (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/MenuStyle;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun MenuSeparator (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/MenuItemMetrics;Lorg/jetbrains/jewel/styling/MenuItemColors;Landroidx/compose/runtime/Composer;II)V public static final fun MenuSubmenuItem (Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/MenuStyle;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun PopupMenu (Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/MenuStyle;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V - public static final fun items (Lorg/jetbrains/jewel/MenuScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V - public static final fun items (Lorg/jetbrains/jewel/MenuScope;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V - public static final fun separator (Lorg/jetbrains/jewel/MenuScope;)V + public static final fun items (Lorg/jetbrains/jewel/core/component/MenuScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V + public static final fun items (Lorg/jetbrains/jewel/core/component/MenuScope;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V + public static final fun separator (Lorg/jetbrains/jewel/core/component/MenuScope;)V } -public final class org/jetbrains/jewel/MenuManager { - public static final field $stable I - public fun (Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/MenuManager;)V - public synthetic fun (Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/MenuManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun close-iuPiT84 (I)Z - public final fun closeAll-HMVJIwE (IZ)V - public final fun getOnDismissRequest ()Lkotlin/jvm/functions/Function1; - public final fun isRootMenu ()Z - public final fun isSubmenu ()Z - public final fun submenuManager (Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/jewel/MenuManager; -} - -public final class org/jetbrains/jewel/MenuManagerKt { - public static final fun getLocalMenuManager ()Landroidx/compose/runtime/ProvidableCompositionLocal; -} - -public abstract interface class org/jetbrains/jewel/MenuScope { +public abstract interface class org/jetbrains/jewel/core/component/MenuScope { public abstract fun passiveItem (Lkotlin/jvm/functions/Function2;)V public abstract fun selectableItem (ZLkotlin/jvm/functions/Function0;ZLkotlin/jvm/functions/Function2;)V public abstract fun submenu (ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V } -public final class org/jetbrains/jewel/MenuScope$DefaultImpls { - public static synthetic fun selectableItem$default (Lorg/jetbrains/jewel/MenuScope;ZLkotlin/jvm/functions/Function0;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V - public static synthetic fun submenu$default (Lorg/jetbrains/jewel/MenuScope;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V -} - -public final class org/jetbrains/jewel/NoIndication : androidx/compose/foundation/Indication { - public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/NoIndication; - public fun rememberUpdatedInstance (Landroidx/compose/foundation/interaction/InteractionSource;Landroidx/compose/runtime/Composer;I)Landroidx/compose/foundation/IndicationInstance; -} - -public final class org/jetbrains/jewel/Orientation : java/lang/Enum { - public static final field Horizontal Lorg/jetbrains/jewel/Orientation; - public static final field Vertical Lorg/jetbrains/jewel/Orientation; - public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/jewel/Orientation; - public static fun values ()[Lorg/jetbrains/jewel/Orientation; -} - -public final class org/jetbrains/jewel/Outline : java/lang/Enum { - public static final field Companion Lorg/jetbrains/jewel/Outline$Companion; - public static final field Error Lorg/jetbrains/jewel/Outline; - public static final field None Lorg/jetbrains/jewel/Outline; - public static final field Warning Lorg/jetbrains/jewel/Outline; - public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/jewel/Outline; - public static fun values ()[Lorg/jetbrains/jewel/Outline; -} - -public final class org/jetbrains/jewel/Outline$Companion { - public final fun of (ZZ)Lorg/jetbrains/jewel/Outline; -} - -public final class org/jetbrains/jewel/OutlineColors { - public static final field $stable I - public static final field Companion Lorg/jetbrains/jewel/OutlineColors$Companion; - public synthetic fun (JJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun equals (Ljava/lang/Object;)Z - public final fun getError-0d7_KjU ()J - public final fun getFocused-0d7_KjU ()J - public final fun getFocusedError-0d7_KjU ()J - public final fun getFocusedWarning-0d7_KjU ()J - public final fun getWarning-0d7_KjU ()J - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public final class org/jetbrains/jewel/OutlineColors$Companion { -} - -public final class org/jetbrains/jewel/OutlineKt { - public static final fun focusOutline-FJfuzF0 (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/FocusableComponentState;Landroidx/compose/ui/graphics/Shape;Lorg/jetbrains/jewel/foundation/Stroke$Alignment;FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier; - public static final fun outline-HYR8e34 (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/FocusableComponentState;Lorg/jetbrains/jewel/Outline;Landroidx/compose/ui/graphics/Shape;Lorg/jetbrains/jewel/foundation/Stroke$Alignment;FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier; +public final class org/jetbrains/jewel/core/component/MenuScope$DefaultImpls { + public static synthetic fun selectableItem$default (Lorg/jetbrains/jewel/core/component/MenuScope;ZLkotlin/jvm/functions/Function0;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V + public static synthetic fun submenu$default (Lorg/jetbrains/jewel/core/component/MenuScope;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V } -public final class org/jetbrains/jewel/RadioButtonKt { +public final class org/jetbrains/jewel/core/component/RadioButtonKt { public static final fun RadioButton (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/RadioButtonStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)V public static final fun RadioButtonRow (Ljava/lang/String;ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/RadioButtonStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)V public static final fun RadioButtonRow (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/RadioButtonStyle;Landroidx/compose/ui/text/TextStyle;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/RadioButtonState : org/jetbrains/jewel/SelectableComponentState { - public static final field Companion Lorg/jetbrains/jewel/RadioButtonState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/RadioButtonState; +public final class org/jetbrains/jewel/core/component/RadioButtonState : org/jetbrains/jewel/SelectableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/RadioButtonState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/RadioButtonState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-BIdLuzo (JZZZZZZ)J - public static synthetic fun copy-BIdLuzo$default (JZZZZZZILjava/lang/Object;)J + public static final fun copy-o2SSdNM (JZZZZZZ)J + public static synthetic fun copy-o2SSdNM$default (JZZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -623,48 +719,40 @@ public final class org/jetbrains/jewel/RadioButtonState : org/jetbrains/jewel/Se public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/RadioButtonState$Companion { - public final fun of-BIdLuzo (ZZZZZZ)J - public static synthetic fun of-BIdLuzo$default (Lorg/jetbrains/jewel/RadioButtonState$Companion;ZZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/RadioButtonState$Companion { + public final fun of-o2SSdNM (ZZZZZZ)J + public static synthetic fun of-o2SSdNM$default (Lorg/jetbrains/jewel/core/component/RadioButtonState$Companion;ZZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/ScrollbarsKt { +public final class org/jetbrains/jewel/core/component/ScrollbarsKt { public static final fun HorizontalScrollbar (Landroidx/compose/foundation/v2/ScrollbarAdapter;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/ScrollbarStyle;Landroidx/compose/runtime/Composer;II)V public static final fun TabStripHorizontalScrollbar (Landroidx/compose/foundation/v2/ScrollbarAdapter;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/ScrollbarStyle;Landroidx/compose/runtime/Composer;II)V public static final fun VerticalScrollbar (Landroidx/compose/foundation/v2/ScrollbarAdapter;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/styling/ScrollbarStyle;Landroidx/compose/runtime/Composer;II)V } -public abstract interface class org/jetbrains/jewel/SelectableComponentState : org/jetbrains/jewel/FocusableComponentState { - public abstract fun isSelected ()Z -} - -public final class org/jetbrains/jewel/SelectableComponentState$DefaultImpls { - public static fun chooseValue (Lorg/jetbrains/jewel/SelectableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; -} - -public final class org/jetbrains/jewel/SpinnerProgressIconGenerator { +public final class org/jetbrains/jewel/core/component/SpinnerProgressIconGenerator { public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/SpinnerProgressIconGenerator; + public static final field INSTANCE Lorg/jetbrains/jewel/core/component/SpinnerProgressIconGenerator; } -public final class org/jetbrains/jewel/SpinnerProgressIconGenerator$Big { +public final class org/jetbrains/jewel/core/component/SpinnerProgressIconGenerator$Big { public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/SpinnerProgressIconGenerator$Big; + public static final field INSTANCE Lorg/jetbrains/jewel/core/component/SpinnerProgressIconGenerator$Big; public final fun generateSvgFrames (Ljava/lang/String;)Ljava/util/List; } -public final class org/jetbrains/jewel/SpinnerProgressIconGenerator$Small { +public final class org/jetbrains/jewel/core/component/SpinnerProgressIconGenerator$Small { public static final field $stable I - public static final field INSTANCE Lorg/jetbrains/jewel/SpinnerProgressIconGenerator$Small; + public static final field INSTANCE Lorg/jetbrains/jewel/core/component/SpinnerProgressIconGenerator$Small; public final fun generateSvgFrames (Ljava/lang/String;)Ljava/util/List; } -public final class org/jetbrains/jewel/SplitLayoutKt { +public final class org/jetbrains/jewel/core/component/SplitLayoutKt { public static final fun HorizontalSplitLayout-BssWTFQ (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/Modifier;JFFFFFFLandroidx/compose/runtime/Composer;II)V public static final fun VerticalSplitLayout-BssWTFQ (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/Modifier;JFFFFFFLandroidx/compose/runtime/Composer;II)V } -public abstract class org/jetbrains/jewel/TabData { +public abstract class org/jetbrains/jewel/core/component/TabData { public static final field $stable I public abstract fun getClosable ()Z public abstract fun getIcon ()Landroidx/compose/ui/graphics/painter/Painter; @@ -674,7 +762,7 @@ public abstract class org/jetbrains/jewel/TabData { public abstract fun getSelected ()Z } -public final class org/jetbrains/jewel/TabData$Default : org/jetbrains/jewel/TabData { +public final class org/jetbrains/jewel/core/component/TabData$Default : org/jetbrains/jewel/core/component/TabData { public static final field $stable I public fun (ZLjava/lang/String;Landroidx/compose/ui/graphics/painter/Painter;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V public synthetic fun (ZLjava/lang/String;Landroidx/compose/ui/graphics/painter/Painter;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -688,7 +776,7 @@ public final class org/jetbrains/jewel/TabData$Default : org/jetbrains/jewel/Tab public fun hashCode ()I } -public final class org/jetbrains/jewel/TabData$Editor : org/jetbrains/jewel/TabData { +public final class org/jetbrains/jewel/core/component/TabData$Editor : org/jetbrains/jewel/core/component/TabData { public static final field $stable I public fun (ZLjava/lang/String;Landroidx/compose/ui/graphics/painter/Painter;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V public synthetic fun (ZLjava/lang/String;Landroidx/compose/ui/graphics/painter/Painter;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -702,14 +790,14 @@ public final class org/jetbrains/jewel/TabData$Editor : org/jetbrains/jewel/TabD public fun hashCode ()I } -public final class org/jetbrains/jewel/TabState : org/jetbrains/jewel/SelectableComponentState { - public static final field Companion Lorg/jetbrains/jewel/TabState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/TabState; +public final class org/jetbrains/jewel/core/component/TabState : org/jetbrains/jewel/SelectableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/TabState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/TabState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-3ML_DI8 (JZZZZZZ)J - public static synthetic fun copy-3ML_DI8$default (JZZZZZZILjava/lang/Object;)J + public static final fun copy-9IDqL2o (JZZZZZZ)J + public static synthetic fun copy-9IDqL2o$default (JZZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -733,23 +821,23 @@ public final class org/jetbrains/jewel/TabState : org/jetbrains/jewel/Selectable public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/TabState$Companion { - public final fun of-3ML_DI8 (ZZZZZZ)J - public static synthetic fun of-3ML_DI8$default (Lorg/jetbrains/jewel/TabState$Companion;ZZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/TabState$Companion { + public final fun of-9IDqL2o (ZZZZZZ)J + public static synthetic fun of-9IDqL2o$default (Lorg/jetbrains/jewel/core/component/TabState$Companion;ZZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/TabStripKt { +public final class org/jetbrains/jewel/core/component/TabStripKt { public static final fun TabStrip (Ljava/util/List;Landroidx/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/TabStripState : org/jetbrains/jewel/FocusableComponentState { - public static final field Companion Lorg/jetbrains/jewel/TabStripState$Companion; - public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/TabStripState; +public final class org/jetbrains/jewel/core/component/TabStripState : org/jetbrains/jewel/FocusableComponentState { + public static final field Companion Lorg/jetbrains/jewel/core/component/TabStripState$Companion; + public static final synthetic fun box-impl (J)Lorg/jetbrains/jewel/core/component/TabStripState; public fun chooseValue (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun chooseValue-impl (JLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; public static fun constructor-impl (J)J - public static final fun copy-S1RedFw (JZZZZZ)J - public static synthetic fun copy-S1RedFw$default (JZZZZZILjava/lang/Object;)J + public static final fun copy-u6od7y8 (JZZZZZ)J + public static synthetic fun copy-u6od7y8$default (JZZZZZILjava/lang/Object;)J public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z @@ -771,121 +859,33 @@ public final class org/jetbrains/jewel/TabStripState : org/jetbrains/jewel/Focus public final synthetic fun unbox-impl ()J } -public final class org/jetbrains/jewel/TabStripState$Companion { - public final fun of-S1RedFw (ZZZZZ)J - public static synthetic fun of-S1RedFw$default (Lorg/jetbrains/jewel/TabStripState$Companion;ZZZZZILjava/lang/Object;)J +public final class org/jetbrains/jewel/core/component/TabStripState$Companion { + public final fun of-u6od7y8 (ZZZZZ)J + public static synthetic fun of-u6od7y8$default (Lorg/jetbrains/jewel/core/component/TabStripState$Companion;ZZZZZILjava/lang/Object;)J } -public final class org/jetbrains/jewel/TextAreaKt { +public final class org/jetbrains/jewel/core/component/TextAreaKt { public static final fun TextArea (Landroidx/compose/ui/text/input/TextFieldValue;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZZLkotlin/jvm/functions/Function2;ZLorg/jetbrains/jewel/Outline;Landroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ILkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/TextAreaStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V public static final fun TextArea (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZZLorg/jetbrains/jewel/Outline;Lkotlin/jvm/functions/Function2;ZLandroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ILkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/TextAreaStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V } -public final class org/jetbrains/jewel/TextFieldKt { +public final class org/jetbrains/jewel/core/component/TextFieldKt { public static final fun TextField (Landroidx/compose/ui/text/input/TextFieldValue;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZZLorg/jetbrains/jewel/Outline;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ZLandroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/TextFieldStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V public static final fun TextField (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZZLorg/jetbrains/jewel/Outline;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ZLandroidx/compose/ui/text/input/VisualTransformation;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/styling/TextFieldStyle;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/runtime/Composer;III)V } -public final class org/jetbrains/jewel/TextKt { +public final class org/jetbrains/jewel/core/component/TextKt { public static final fun Text--4IGK_g (Landroidx/compose/ui/text/AnnotatedString;Landroidx/compose/ui/Modifier;JJLandroidx/compose/ui/text/font/FontStyle;Landroidx/compose/ui/text/font/FontWeight;Landroidx/compose/ui/text/font/FontFamily;JLandroidx/compose/ui/text/style/TextDecoration;Landroidx/compose/ui/text/style/TextAlign;JIZILjava/util/Map;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;III)V public static final fun Text-fLXpl1I (Ljava/lang/String;Landroidx/compose/ui/Modifier;JJLandroidx/compose/ui/text/font/FontStyle;Landroidx/compose/ui/text/font/FontWeight;Landroidx/compose/ui/text/font/FontFamily;JLandroidx/compose/ui/text/style/TextDecoration;Landroidx/compose/ui/text/style/TextAlign;JIZILkotlin/jvm/functions/Function1;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;III)V public static final fun getLocalContentColor ()Landroidx/compose/runtime/ProvidableCompositionLocal; public static final fun getLocalTextStyle ()Landroidx/compose/runtime/ProvidableCompositionLocal; } -public final class org/jetbrains/jewel/ThemeColorPalette { - public static final field $stable I - public static final field Companion Lorg/jetbrains/jewel/ThemeColorPalette$Companion; - public fun (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/Map;)V - public final fun blue-vNxB06k (I)J - 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 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 green-vNxB06k (I)J - public final fun greenOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public final fun grey-vNxB06k (I)J - public final fun greyOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public fun hashCode ()I - public final fun lookup-ijrfgN4 (Ljava/lang/String;)Landroidx/compose/ui/graphics/Color; - public final fun orange-vNxB06k (I)J - public final fun orangeOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public final fun purple-vNxB06k (I)J - public final fun purpleOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public final fun red-vNxB06k (I)J - public final fun redOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public final fun teal-vNxB06k (I)J - public final fun tealOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; - public fun toString ()Ljava/lang/String; - public final fun yellow-vNxB06k (I)J - public final fun yellowOrNull-ijrfgN4 (I)Landroidx/compose/ui/graphics/Color; -} - -public final class org/jetbrains/jewel/ThemeColorPalette$Companion { - public final fun getEmpty ()Lorg/jetbrains/jewel/ThemeColorPalette; -} - -public final class org/jetbrains/jewel/ThemeDefinition { - public static final field $stable I - public synthetic fun (ZLorg/jetbrains/jewel/GlobalColors;Lorg/jetbrains/jewel/GlobalMetrics;Landroidx/compose/ui/text/TextStyle;JLorg/jetbrains/jewel/ThemeColorPalette;Lorg/jetbrains/jewel/ThemeIconData;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun equals (Ljava/lang/Object;)Z - public final fun getColorPalette ()Lorg/jetbrains/jewel/ThemeColorPalette; - public final fun getContentColor-0d7_KjU ()J - public final fun getDefaultTextStyle ()Landroidx/compose/ui/text/TextStyle; - public final fun getGlobalColors ()Lorg/jetbrains/jewel/GlobalColors; - public final fun getGlobalMetrics ()Lorg/jetbrains/jewel/GlobalMetrics; - public final fun getIconData ()Lorg/jetbrains/jewel/ThemeIconData; - public fun hashCode ()I - public final fun isDark ()Z - public fun toString ()Ljava/lang/String; -} - -public abstract interface class org/jetbrains/jewel/ThemeDescriptor { - public abstract fun getColors ()Lorg/jetbrains/jewel/ThemeColorPalette; - public abstract fun getIconData ()Lorg/jetbrains/jewel/ThemeIconData; - public abstract fun getName ()Ljava/lang/String; - public abstract fun isDark ()Z -} - -public final class org/jetbrains/jewel/ThemeIconData { - public static final field $stable I - public static final field Companion Lorg/jetbrains/jewel/ThemeIconData$Companion; - public fun (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - public final fun getColorPalette ()Ljava/util/Map; - public final fun getIconOverrides ()Ljava/util/Map; - public final fun getSelectionColorPalette ()Ljava/util/Map; - public final fun selectionColorMapping ()Ljava/util/Map; -} - -public final class org/jetbrains/jewel/ThemeIconData$Companion { - public final fun getEmpty ()Lorg/jetbrains/jewel/ThemeIconData; -} - -public abstract interface class org/jetbrains/jewel/ToggleableComponentState : org/jetbrains/jewel/SelectableComponentState { - public static final field Companion Lorg/jetbrains/jewel/ToggleableComponentState$Companion; - public abstract fun getToggleableState ()Landroidx/compose/ui/state/ToggleableState; -} - -public final class org/jetbrains/jewel/ToggleableComponentState$Companion { - public final fun readToggleableState-VKZWuLQ (J)Landroidx/compose/ui/state/ToggleableState; -} - -public final class org/jetbrains/jewel/ToggleableComponentState$DefaultImpls { - public static fun chooseValue (Lorg/jetbrains/jewel/ToggleableComponentState;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object; -} - -public final class org/jetbrains/jewel/TooltipKt { +public final class org/jetbrains/jewel/core/component/TooltipKt { public static final fun Tooltip (Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/styling/TooltipStyle;Landroidx/compose/foundation/TooltipPlacement;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class org/jetbrains/jewel/TooltipPlacement : androidx/compose/foundation/TooltipPlacement { +public final class org/jetbrains/jewel/core/component/TooltipPlacement : androidx/compose/foundation/TooltipPlacement { public static final field $stable I public synthetic fun (JLandroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/ui/unit/Density;FILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (JLandroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/ui/unit/Density;FLkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -1677,9 +1677,9 @@ public final class org/jetbrains/jewel/styling/ButtonColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/ButtonColors$Companion; public synthetic fun (Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;JJJJJLandroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-RO59lCw (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun borderFor-RO59lCw (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun contentFor-RO59lCw (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-R2L0b24 (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun borderFor-R2L0b24 (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-R2L0b24 (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground ()Landroidx/compose/ui/graphics/Brush; public final fun getBackgroundDisabled ()Landroidx/compose/ui/graphics/Brush; @@ -1742,7 +1742,7 @@ public final class org/jetbrains/jewel/styling/CheckboxColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/CheckboxColors$Companion; public synthetic fun (JJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun contentFor-An7rHrs (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-mdV_ufc (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getContent-0d7_KjU ()J public final fun getContentDisabled-0d7_KjU ()J @@ -1807,9 +1807,9 @@ public final class org/jetbrains/jewel/styling/ChipColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/ChipColors$Companion; public synthetic fun (Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;Landroidx/compose/ui/graphics/Brush;JJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-z6rh5VY (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun borderFor-z6rh5VY (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun contentFor-z6rh5VY (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-aW18G7M (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun borderFor-aW18G7M (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-aW18G7M (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground ()Landroidx/compose/ui/graphics/Brush; public final fun getBackgroundDisabled ()Landroidx/compose/ui/graphics/Brush; @@ -1933,9 +1933,9 @@ public final class org/jetbrains/jewel/styling/DropdownColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/DropdownColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-7I1Rs2w (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun borderFor-7I1Rs2w (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun contentFor-7I1Rs2w (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-l2ysF8s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun borderFor-l2ysF8s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-l2ysF8s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground-0d7_KjU ()J public final fun getBackgroundDisabled-0d7_KjU ()J @@ -1958,7 +1958,7 @@ public final class org/jetbrains/jewel/styling/DropdownColors { public final fun getIconTintHovered-0d7_KjU ()J public final fun getIconTintPressed-0d7_KjU ()J public fun hashCode ()I - public final fun iconTintFor-7I1Rs2w (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun iconTintFor-l2ysF8s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun toString ()Ljava/lang/String; } @@ -2116,8 +2116,8 @@ public final class org/jetbrains/jewel/styling/IconButtonColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/IconButtonColors$Companion; public synthetic fun (JJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-RO59lCw (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun borderFor-RO59lCw (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-R2L0b24 (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun borderFor-R2L0b24 (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground-0d7_KjU ()J public final fun getBackgroundDisabled-0d7_KjU ()J @@ -2171,10 +2171,10 @@ public final class org/jetbrains/jewel/styling/IconButtonStyle$Companion { } public abstract interface class org/jetbrains/jewel/styling/InputFieldColors { - public abstract fun backgroundFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public abstract fun borderFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public abstract fun caretFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public abstract fun contentFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public abstract fun backgroundFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public abstract fun borderFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public abstract fun caretFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public abstract fun contentFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public abstract fun getBackground-0d7_KjU ()J public abstract fun getBackgroundDisabled-0d7_KjU ()J public abstract fun getBackgroundFocused-0d7_KjU ()J @@ -2198,10 +2198,10 @@ public abstract interface class org/jetbrains/jewel/styling/InputFieldColors { } public final class org/jetbrains/jewel/styling/InputFieldColors$DefaultImpls { - public static fun backgroundFor-37MyHpk (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public static fun borderFor-37MyHpk (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public static fun caretFor-37MyHpk (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public static fun contentFor-37MyHpk (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public static fun backgroundFor-34RuppI (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public static fun borderFor-34RuppI (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public static fun caretFor-34RuppI (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public static fun contentFor-34RuppI (Lorg/jetbrains/jewel/styling/InputFieldColors;JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; } public abstract interface class org/jetbrains/jewel/styling/InputFieldMetrics { @@ -2222,10 +2222,10 @@ public final class org/jetbrains/jewel/styling/LabelledTextFieldColors : org/jet public static final field Companion Lorg/jetbrains/jewel/styling/LabelledTextFieldColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun asTextFieldColors ()Lorg/jetbrains/jewel/styling/TextFieldColors; - public fun backgroundFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun borderFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun caretFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun contentFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun backgroundFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun borderFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun caretFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun contentFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public fun getBackground-0d7_KjU ()J public fun getBackgroundDisabled-0d7_KjU ()J @@ -2391,7 +2391,7 @@ public final class org/jetbrains/jewel/styling/LinkColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/LinkColors$Companion; public synthetic fun (JJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun contentFor-4qImzQQ (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-VLtoM1M (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getContent-0d7_KjU ()J public final fun getContentDisabled-0d7_KjU ()J @@ -2467,7 +2467,7 @@ public final class org/jetbrains/jewel/styling/LinkTextStyles { public final fun getPressed ()Landroidx/compose/ui/text/TextStyle; public final fun getVisited ()Landroidx/compose/ui/text/TextStyle; public fun hashCode ()I - public final fun styleFor-4qImzQQ (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun styleFor-VLtoM1M (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun toString ()Ljava/lang/String; } @@ -2507,8 +2507,8 @@ public final class org/jetbrains/jewel/styling/MenuItemColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/MenuItemColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-BYhRtsk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun contentFor-BYhRtsk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-BdlgFHs (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-BdlgFHs (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground-0d7_KjU ()J public final fun getBackgroundDisabled-0d7_KjU ()J @@ -2527,7 +2527,7 @@ public final class org/jetbrains/jewel/styling/MenuItemColors { public final fun getIconTintPressed-0d7_KjU ()J public final fun getSeparator-0d7_KjU ()J public fun hashCode ()I - public final fun iconTintFor-BYhRtsk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun iconTintFor-BdlgFHs (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun toString ()Ljava/lang/String; } @@ -2594,7 +2594,7 @@ public final class org/jetbrains/jewel/styling/RadioButtonColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/RadioButtonColors$Companion; public synthetic fun (JJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun contentFor-dQFH0ko (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-HwC-oIs (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getContent-0d7_KjU ()J public final fun getContentDisabled-0d7_KjU ()J @@ -2721,8 +2721,8 @@ public final class org/jetbrains/jewel/styling/TabColors { public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/TabColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun backgroundFor-WCiaD9s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun contentFor-WCiaD9s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun backgroundFor-pojUftE (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun contentFor-pojUftE (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public final fun getBackground-0d7_KjU ()J public final fun getBackgroundDisabled-0d7_KjU ()J @@ -2744,7 +2744,7 @@ public final class org/jetbrains/jewel/styling/TabColors { public final fun getUnderlineSelected-0d7_KjU ()J public fun hashCode ()I public fun toString ()Ljava/lang/String; - public final fun underlineFor-WCiaD9s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun underlineFor-pojUftE (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; } public final class org/jetbrains/jewel/styling/TabColors$Companion { @@ -2768,8 +2768,8 @@ public final class org/jetbrains/jewel/styling/TabContentAlpha { public final fun getLabelPressed ()F public final fun getLabelSelected ()F public fun hashCode ()I - public final fun iconFor-WCiaD9s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public final fun labelFor-WCiaD9s (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun iconFor-pojUftE (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public final fun labelFor-pojUftE (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun toString ()Ljava/lang/String; } @@ -2830,10 +2830,10 @@ public final class org/jetbrains/jewel/styling/TextAreaColors : org/jetbrains/je public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/TextAreaColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun backgroundFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun borderFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun caretFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun contentFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun backgroundFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun borderFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun caretFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun contentFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public fun getBackground-0d7_KjU ()J public fun getBackgroundDisabled-0d7_KjU ()J @@ -2904,10 +2904,10 @@ public final class org/jetbrains/jewel/styling/TextFieldColors : org/jetbrains/j public static final field $stable I public static final field Companion Lorg/jetbrains/jewel/styling/TextFieldColors$Companion; public synthetic fun (JJJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun backgroundFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun borderFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun caretFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; - public fun contentFor-37MyHpk (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun backgroundFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun borderFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun caretFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; + public fun contentFor-34RuppI (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public fun equals (Ljava/lang/Object;)Z public fun getBackground-0d7_KjU ()J public fun getBackgroundDisabled-0d7_KjU ()J diff --git a/core/src/main/kotlin/org/jetbrains/jewel/ComponentStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/ComponentStyling.kt index 0307e9e0a..61d417fd4 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/ComponentStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/ComponentStyling.kt @@ -4,99 +4,67 @@ import androidx.compose.foundation.LocalContextMenuRepresentation import androidx.compose.runtime.Composable import androidx.compose.runtime.ProvidedValue import androidx.compose.runtime.Stable -import org.jetbrains.jewel.styling.ButtonStyle -import org.jetbrains.jewel.styling.CheckboxStyle -import org.jetbrains.jewel.styling.ChipStyle -import org.jetbrains.jewel.styling.CircularProgressStyle -import org.jetbrains.jewel.styling.DividerStyle -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.GroupHeaderStyle -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle -import org.jetbrains.jewel.styling.IconButtonStyle -import org.jetbrains.jewel.styling.LabelledTextFieldStyle -import org.jetbrains.jewel.styling.LazyTreeStyle -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.LocalCheckboxStyle -import org.jetbrains.jewel.styling.LocalChipStyle -import org.jetbrains.jewel.styling.LocalCircularProgressStyle -import org.jetbrains.jewel.styling.LocalDefaultButtonStyle -import org.jetbrains.jewel.styling.LocalDefaultDropdownStyle -import org.jetbrains.jewel.styling.LocalDefaultTabStyle -import org.jetbrains.jewel.styling.LocalDividerStyle -import org.jetbrains.jewel.styling.LocalEditorTabStyle -import org.jetbrains.jewel.styling.LocalGroupHeaderStyle -import org.jetbrains.jewel.styling.LocalHorizontalProgressBarStyle -import org.jetbrains.jewel.styling.LocalIconButtonStyle -import org.jetbrains.jewel.styling.LocalLabelledTextFieldStyle -import org.jetbrains.jewel.styling.LocalLazyTreeStyle -import org.jetbrains.jewel.styling.LocalLinkStyle -import org.jetbrains.jewel.styling.LocalMenuStyle -import org.jetbrains.jewel.styling.LocalOutlinedButtonStyle -import org.jetbrains.jewel.styling.LocalRadioButtonStyle -import org.jetbrains.jewel.styling.LocalScrollbarStyle -import org.jetbrains.jewel.styling.LocalTextAreaStyle -import org.jetbrains.jewel.styling.LocalTextFieldStyle -import org.jetbrains.jewel.styling.LocalTooltipStyle -import org.jetbrains.jewel.styling.LocalUndecoratedDropdownStyle -import org.jetbrains.jewel.styling.MenuStyle -import org.jetbrains.jewel.styling.RadioButtonStyle -import org.jetbrains.jewel.styling.ScrollbarStyle -import org.jetbrains.jewel.styling.TabStyle -import org.jetbrains.jewel.styling.TextAreaStyle -import org.jetbrains.jewel.styling.TextFieldStyle -import org.jetbrains.jewel.styling.TooltipStyle +import org.jetbrains.jewel.core.component.styling.LocalDefaultTabStyle +import org.jetbrains.jewel.core.component.styling.LocalEditorTabStyle +import org.jetbrains.jewel.core.component.styling.LocalTextAreaStyle +import org.jetbrains.jewel.core.component.styling.LocalTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LocalTooltipStyle +import org.jetbrains.jewel.core.component.styling.TabStyle +import org.jetbrains.jewel.core.component.styling.TextAreaStyle +import org.jetbrains.jewel.core.component.styling.TextFieldStyle +import org.jetbrains.jewel.core.component.styling.TooltipStyle @Stable @GenerateDataFunctions class ComponentStyling( - val checkboxStyle: CheckboxStyle, - val chipStyle: ChipStyle, - val circularProgressStyle: CircularProgressStyle, - val defaultButtonStyle: ButtonStyle, - val defaultDropdownStyle: DropdownStyle, + val checkboxStyle: org.jetbrains.jewel.core.component.styling.CheckboxStyle, + val chipStyle: org.jetbrains.jewel.core.component.styling.ChipStyle, + val circularProgressStyle: org.jetbrains.jewel.core.component.styling.CircularProgressStyle, + val defaultButtonStyle: org.jetbrains.jewel.core.component.styling.ButtonStyle, + val defaultDropdownStyle: org.jetbrains.jewel.core.component.styling.DropdownStyle, val defaultTabStyle: TabStyle, - val dividerStyle: DividerStyle, + val dividerStyle: org.jetbrains.jewel.core.component.styling.DividerStyle, val editorTabStyle: TabStyle, - val groupHeaderStyle: GroupHeaderStyle, - val horizontalProgressBarStyle: HorizontalProgressBarStyle, - val iconButtonStyle: IconButtonStyle, - val labelledTextFieldStyle: LabelledTextFieldStyle, - val lazyTreeStyle: LazyTreeStyle, - val linkStyle: LinkStyle, - val menuStyle: MenuStyle, - val outlinedButtonStyle: ButtonStyle, - val radioButtonStyle: RadioButtonStyle, - val scrollbarStyle: ScrollbarStyle, + val groupHeaderStyle: org.jetbrains.jewel.core.component.styling.GroupHeaderStyle, + val horizontalProgressBarStyle: org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle, + val iconButtonStyle: org.jetbrains.jewel.core.component.styling.IconButtonStyle, + val labelledTextFieldStyle: org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle, + val lazyTreeStyle: org.jetbrains.jewel.core.component.styling.LazyTreeStyle, + val linkStyle: org.jetbrains.jewel.core.component.styling.LinkStyle, + val menuStyle: org.jetbrains.jewel.core.component.styling.MenuStyle, + val outlinedButtonStyle: org.jetbrains.jewel.core.component.styling.ButtonStyle, + val radioButtonStyle: org.jetbrains.jewel.core.component.styling.RadioButtonStyle, + val scrollbarStyle: org.jetbrains.jewel.core.component.styling.ScrollbarStyle, val textAreaStyle: TextAreaStyle, val textFieldStyle: TextFieldStyle, val tooltipStyle: TooltipStyle, - val undecoratedDropdownStyle: DropdownStyle, + val undecoratedDropdownStyle: org.jetbrains.jewel.core.component.styling.DropdownStyle, ) { @Composable fun providedStyles(): Array> = arrayOf( - LocalCheckboxStyle provides checkboxStyle, - LocalChipStyle provides chipStyle, - LocalCircularProgressStyle provides circularProgressStyle, + org.jetbrains.jewel.core.component.styling.LocalCheckboxStyle provides checkboxStyle, + org.jetbrains.jewel.core.component.styling.LocalChipStyle provides chipStyle, + org.jetbrains.jewel.core.component.styling.LocalCircularProgressStyle provides circularProgressStyle, LocalContextMenuRepresentation provides ContextMenuRepresentation, - LocalDefaultButtonStyle provides defaultButtonStyle, - LocalDefaultDropdownStyle provides defaultDropdownStyle, + org.jetbrains.jewel.core.component.styling.LocalDefaultButtonStyle provides defaultButtonStyle, + org.jetbrains.jewel.core.component.styling.LocalDefaultDropdownStyle provides defaultDropdownStyle, LocalDefaultTabStyle provides defaultTabStyle, - LocalDividerStyle provides dividerStyle, + org.jetbrains.jewel.core.component.styling.LocalDividerStyle provides dividerStyle, LocalEditorTabStyle provides editorTabStyle, - LocalGroupHeaderStyle provides groupHeaderStyle, - LocalHorizontalProgressBarStyle provides horizontalProgressBarStyle, - LocalIconButtonStyle provides iconButtonStyle, - LocalLabelledTextFieldStyle provides labelledTextFieldStyle, - LocalLazyTreeStyle provides lazyTreeStyle, - LocalLinkStyle provides linkStyle, - LocalMenuStyle provides menuStyle, - LocalOutlinedButtonStyle provides outlinedButtonStyle, - LocalRadioButtonStyle provides radioButtonStyle, - LocalScrollbarStyle provides scrollbarStyle, + org.jetbrains.jewel.core.component.styling.LocalGroupHeaderStyle provides groupHeaderStyle, + org.jetbrains.jewel.core.component.styling.LocalHorizontalProgressBarStyle provides horizontalProgressBarStyle, + org.jetbrains.jewel.core.component.styling.LocalIconButtonStyle provides iconButtonStyle, + org.jetbrains.jewel.core.component.styling.LocalLabelledTextFieldStyle provides labelledTextFieldStyle, + org.jetbrains.jewel.core.component.styling.LocalLazyTreeStyle provides lazyTreeStyle, + org.jetbrains.jewel.core.component.styling.LocalLinkStyle provides linkStyle, + org.jetbrains.jewel.core.component.styling.LocalMenuStyle provides menuStyle, + org.jetbrains.jewel.core.component.styling.LocalOutlinedButtonStyle provides outlinedButtonStyle, + org.jetbrains.jewel.core.component.styling.LocalRadioButtonStyle provides radioButtonStyle, + org.jetbrains.jewel.core.component.styling.LocalScrollbarStyle provides scrollbarStyle, LocalTextAreaStyle provides textAreaStyle, LocalTextFieldStyle provides textFieldStyle, LocalTooltipStyle provides tooltipStyle, - LocalUndecoratedDropdownStyle provides undecoratedDropdownStyle, + org.jetbrains.jewel.core.component.styling.LocalUndecoratedDropdownStyle provides undecoratedDropdownStyle, ) } diff --git a/core/src/main/kotlin/org/jetbrains/jewel/ContextMenu.kt b/core/src/main/kotlin/org/jetbrains/jewel/ContextMenu.kt index 46d6b9d6e..bcb580420 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/ContextMenu.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/ContextMenu.kt @@ -18,7 +18,12 @@ import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupProperties import androidx.compose.ui.window.rememberCursorPositionProvider -import org.jetbrains.jewel.styling.MenuStyle +import org.jetbrains.jewel.core.component.MenuContent +import org.jetbrains.jewel.core.component.MenuScope +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.handlePopupMenuOnKeyEvent +import org.jetbrains.jewel.core.component.separator +import org.jetbrains.jewel.core.component.styling.MenuStyle object ContextMenuRepresentation : ContextMenuRepresentation { diff --git a/core/src/main/kotlin/org/jetbrains/jewel/GroupHeader.kt b/core/src/main/kotlin/org/jetbrains/jewel/GroupHeader.kt index a125b34c0..b59942fea 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/GroupHeader.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/GroupHeader.kt @@ -5,8 +5,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import org.jetbrains.jewel.styling.GroupHeaderStyle -import org.jetbrains.jewel.styling.LocalGroupHeaderStyle +import org.jetbrains.jewel.core.component.Divider +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.styling.GroupHeaderStyle +import org.jetbrains.jewel.core.component.styling.LocalGroupHeaderStyle @Composable fun GroupHeader( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/JewelTheme.kt b/core/src/main/kotlin/org/jetbrains/jewel/JewelTheme.kt index b3daa1a0e..0a047bfda 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/JewelTheme.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/JewelTheme.kt @@ -6,46 +6,48 @@ import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle -import org.jetbrains.jewel.styling.ButtonStyle -import org.jetbrains.jewel.styling.CheckboxStyle -import org.jetbrains.jewel.styling.ChipStyle -import org.jetbrains.jewel.styling.CircularProgressStyle -import org.jetbrains.jewel.styling.DividerStyle -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.GroupHeaderStyle -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle -import org.jetbrains.jewel.styling.IconButtonStyle -import org.jetbrains.jewel.styling.LabelledTextFieldStyle -import org.jetbrains.jewel.styling.LazyTreeStyle -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.LocalCheckboxStyle -import org.jetbrains.jewel.styling.LocalChipStyle -import org.jetbrains.jewel.styling.LocalCircularProgressStyle -import org.jetbrains.jewel.styling.LocalDefaultButtonStyle -import org.jetbrains.jewel.styling.LocalDefaultDropdownStyle -import org.jetbrains.jewel.styling.LocalDefaultTabStyle -import org.jetbrains.jewel.styling.LocalDividerStyle -import org.jetbrains.jewel.styling.LocalEditorTabStyle -import org.jetbrains.jewel.styling.LocalGroupHeaderStyle -import org.jetbrains.jewel.styling.LocalHorizontalProgressBarStyle -import org.jetbrains.jewel.styling.LocalIconButtonStyle -import org.jetbrains.jewel.styling.LocalLabelledTextFieldStyle -import org.jetbrains.jewel.styling.LocalLazyTreeStyle -import org.jetbrains.jewel.styling.LocalLinkStyle -import org.jetbrains.jewel.styling.LocalMenuStyle -import org.jetbrains.jewel.styling.LocalOutlinedButtonStyle -import org.jetbrains.jewel.styling.LocalRadioButtonStyle -import org.jetbrains.jewel.styling.LocalScrollbarStyle -import org.jetbrains.jewel.styling.LocalTextAreaStyle -import org.jetbrains.jewel.styling.LocalTextFieldStyle -import org.jetbrains.jewel.styling.LocalTooltipStyle -import org.jetbrains.jewel.styling.MenuStyle -import org.jetbrains.jewel.styling.RadioButtonStyle -import org.jetbrains.jewel.styling.ScrollbarStyle -import org.jetbrains.jewel.styling.TabStyle -import org.jetbrains.jewel.styling.TextAreaStyle -import org.jetbrains.jewel.styling.TextFieldStyle -import org.jetbrains.jewel.styling.TooltipStyle +import org.jetbrains.jewel.core.component.LocalContentColor +import org.jetbrains.jewel.core.component.LocalTextStyle +import org.jetbrains.jewel.core.component.styling.ButtonStyle +import org.jetbrains.jewel.core.component.styling.CheckboxStyle +import org.jetbrains.jewel.core.component.styling.ChipStyle +import org.jetbrains.jewel.core.component.styling.CircularProgressStyle +import org.jetbrains.jewel.core.component.styling.DividerStyle +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.GroupHeaderStyle +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle +import org.jetbrains.jewel.core.component.styling.IconButtonStyle +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LazyTreeStyle +import org.jetbrains.jewel.core.component.styling.LinkStyle +import org.jetbrains.jewel.core.component.styling.LocalCheckboxStyle +import org.jetbrains.jewel.core.component.styling.LocalChipStyle +import org.jetbrains.jewel.core.component.styling.LocalCircularProgressStyle +import org.jetbrains.jewel.core.component.styling.LocalDefaultButtonStyle +import org.jetbrains.jewel.core.component.styling.LocalDefaultDropdownStyle +import org.jetbrains.jewel.core.component.styling.LocalDefaultTabStyle +import org.jetbrains.jewel.core.component.styling.LocalDividerStyle +import org.jetbrains.jewel.core.component.styling.LocalEditorTabStyle +import org.jetbrains.jewel.core.component.styling.LocalGroupHeaderStyle +import org.jetbrains.jewel.core.component.styling.LocalHorizontalProgressBarStyle +import org.jetbrains.jewel.core.component.styling.LocalIconButtonStyle +import org.jetbrains.jewel.core.component.styling.LocalLabelledTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LocalLazyTreeStyle +import org.jetbrains.jewel.core.component.styling.LocalLinkStyle +import org.jetbrains.jewel.core.component.styling.LocalMenuStyle +import org.jetbrains.jewel.core.component.styling.LocalOutlinedButtonStyle +import org.jetbrains.jewel.core.component.styling.LocalRadioButtonStyle +import org.jetbrains.jewel.core.component.styling.LocalScrollbarStyle +import org.jetbrains.jewel.core.component.styling.LocalTextAreaStyle +import org.jetbrains.jewel.core.component.styling.LocalTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LocalTooltipStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.core.component.styling.RadioButtonStyle +import org.jetbrains.jewel.core.component.styling.ScrollbarStyle +import org.jetbrains.jewel.core.component.styling.TabStyle +import org.jetbrains.jewel.core.component.styling.TextAreaStyle +import org.jetbrains.jewel.core.component.styling.TextFieldStyle +import org.jetbrains.jewel.core.component.styling.TooltipStyle interface JewelTheme { @@ -238,11 +240,11 @@ internal val LocalSwingCompatMode = staticCompositionLocalOf { false } -val LocalColorPalette = staticCompositionLocalOf { +val LocalColorPalette = staticCompositionLocalOf { ThemeColorPalette.Empty } -val LocalIconData = staticCompositionLocalOf { +val LocalIconData = staticCompositionLocalOf { ThemeIconData.Empty } diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Button.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Button.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Button.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Button.kt index 279546d88..e8e4620bf 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Button.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Button.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -32,9 +32,12 @@ import org.jetbrains.jewel.CommonStateBitMask.Enabled import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed +import org.jetbrains.jewel.FocusableComponentState +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.ButtonStyle +import org.jetbrains.jewel.focusOutline import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border -import org.jetbrains.jewel.styling.ButtonStyle @Composable fun DefaultButton( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Checkbox.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Checkbox.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Checkbox.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Checkbox.kt index 5b6cbd117..623581d3f 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Checkbox.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Checkbox.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.Image import androidx.compose.foundation.interaction.FocusInteraction @@ -23,7 +23,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.takeOrElse @@ -37,16 +36,21 @@ import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Indeterminate import org.jetbrains.jewel.CommonStateBitMask.Pressed import org.jetbrains.jewel.CommonStateBitMask.Selected +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.LocalSwingCompatMode +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.ToggleableComponentState import org.jetbrains.jewel.ToggleableComponentState.Companion.readToggleableState +import org.jetbrains.jewel.core.component.styling.CheckboxColors +import org.jetbrains.jewel.core.component.styling.CheckboxIcons +import org.jetbrains.jewel.core.component.styling.CheckboxMetrics +import org.jetbrains.jewel.core.component.styling.LocalCheckboxStyle import org.jetbrains.jewel.foundation.Stroke +import org.jetbrains.jewel.outline import org.jetbrains.jewel.painter.PainterHint import org.jetbrains.jewel.painter.PainterSuffixHint import org.jetbrains.jewel.painter.hints.Selected import org.jetbrains.jewel.painter.hints.Stateful -import org.jetbrains.jewel.styling.CheckboxColors -import org.jetbrains.jewel.styling.CheckboxIcons -import org.jetbrains.jewel.styling.CheckboxMetrics -import org.jetbrains.jewel.styling.LocalCheckboxStyle @Composable fun Checkbox( @@ -227,7 +231,6 @@ fun TriStateCheckboxRow( ) } -@OptIn(ExperimentalComposeUiApi::class) @Composable private fun CheckboxImpl( state: ToggleableState, diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Chip.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Chip.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Chip.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Chip.kt index dd99e726e..7be566744 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Chip.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Chip.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -31,9 +31,13 @@ import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed import org.jetbrains.jewel.CommonStateBitMask.Selected +import org.jetbrains.jewel.FocusableComponentState +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.SelectableComponentState +import org.jetbrains.jewel.core.component.styling.ChipStyle +import org.jetbrains.jewel.focusOutline import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border -import org.jetbrains.jewel.styling.ChipStyle @Composable fun Chip( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/CircularProgressIndicator.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/CircularProgressIndicator.kt index 197edfdf9..25435ebe1 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/CircularProgressIndicator.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size @@ -17,7 +17,8 @@ import androidx.compose.ui.res.loadSvgPainter import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay -import org.jetbrains.jewel.styling.CircularProgressStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.CircularProgressStyle import org.jetbrains.jewel.util.toRgbaHexString @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Divider.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Divider.kt similarity index 89% rename from core/src/main/kotlin/org/jetbrains/jewel/Divider.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Divider.kt index 7f0c2b7ec..b764a7810 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Divider.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Divider.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -13,7 +13,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.takeOrElse import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.takeOrElse -import org.jetbrains.jewel.styling.DividerStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.Orientation +import org.jetbrains.jewel.core.component.styling.DividerStyle @Composable fun Divider( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Dropdown.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Dropdown.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/Dropdown.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Dropdown.kt index 9596c7687..c6412f9c3 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Dropdown.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Dropdown.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -41,12 +41,19 @@ import org.jetbrains.jewel.CommonStateBitMask.Enabled import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed +import org.jetbrains.jewel.FocusableComponentState +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.LocalMenuManager +import org.jetbrains.jewel.MenuManager +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.LocalMenuStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.focusOutline import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border +import org.jetbrains.jewel.outline import org.jetbrains.jewel.painter.hints.Stateful -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.LocalMenuStyle -import org.jetbrains.jewel.styling.MenuStyle import org.jetbrains.jewel.util.thenIf @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Icon.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Icon.kt similarity index 99% rename from core/src/main/kotlin/org/jetbrains/jewel/Icon.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Icon.kt index f3dd04ff8..4d12009e3 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Icon.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Icon.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component // Adapted from Icon in Compose Material package // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/material/material/src/commonMain/kotlin/androidx/compose/material/Icon.kt diff --git a/core/src/main/kotlin/org/jetbrains/jewel/IconButton.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/IconButton.kt similarity index 94% rename from core/src/main/kotlin/org/jetbrains/jewel/IconButton.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/IconButton.kt index 2e33a1783..8698f7aa9 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/IconButton.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/IconButton.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -21,7 +21,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.Role -import org.jetbrains.jewel.styling.IconButtonStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.NoIndication +import org.jetbrains.jewel.core.component.styling.IconButtonStyle @Composable fun IconButton( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/InputField.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/InputField.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/InputField.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/InputField.kt index f93a6a94c..9d5e29900 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/InputField.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/InputField.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.background import androidx.compose.foundation.interaction.FocusInteraction @@ -27,9 +27,13 @@ import org.jetbrains.jewel.CommonStateBitMask.Enabled import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed +import org.jetbrains.jewel.FocusableComponentState +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.core.component.styling.InputFieldStyle +import org.jetbrains.jewel.focusOutline import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border -import org.jetbrains.jewel.styling.InputFieldStyle +import org.jetbrains.jewel.outline import org.jetbrains.jewel.util.thenIf @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/LabelledTextField.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LabelledTextField.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/LabelledTextField.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/LabelledTextField.kt index 6147fcdcf..c7fad0971 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/LabelledTextField.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LabelledTextField.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box @@ -19,7 +19,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.offset -import org.jetbrains.jewel.styling.LabelledTextFieldStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle /** * @param label the label to display above the component. diff --git a/core/src/main/kotlin/org/jetbrains/jewel/LazyTree.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LazyTree.kt similarity index 93% rename from core/src/main/kotlin/org/jetbrains/jewel/LazyTree.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/LazyTree.kt index ad80f5b98..bfa6cd48b 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/LazyTree.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LazyTree.kt @@ -1,10 +1,13 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.takeOrElse +import org.jetbrains.jewel.ExperimentalJewelApi +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.LazyTreeStyle import org.jetbrains.jewel.foundation.lazy.SelectableLazyItemScope import org.jetbrains.jewel.foundation.tree.BasicLazyTree import org.jetbrains.jewel.foundation.tree.DefaultTreeViewKeyActions @@ -13,7 +16,6 @@ import org.jetbrains.jewel.foundation.tree.Tree import org.jetbrains.jewel.foundation.tree.TreeElementState import org.jetbrains.jewel.foundation.tree.TreeState import org.jetbrains.jewel.foundation.tree.rememberTreeState -import org.jetbrains.jewel.styling.LazyTreeStyle @ExperimentalJewelApi @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/LinearProgressBar.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LinearProgressBar.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/LinearProgressBar.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/LinearProgressBar.kt index ae2585e09..990e81f2a 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/LinearProgressBar.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LinearProgressBar.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -22,7 +22,8 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.TileMode import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.LayoutDirection -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle // TODO implement green/red/yellow variants based on com.intellij.openapi.progress.util.ColorProgressBar diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Link.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Link.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Link.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Link.kt index 98172d5e4..babe8fdf6 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Link.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Link.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.FocusInteraction @@ -34,19 +34,23 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit +import org.jetbrains.jewel.CommonStateBitMask import org.jetbrains.jewel.CommonStateBitMask.Active import org.jetbrains.jewel.CommonStateBitMask.Enabled import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed +import org.jetbrains.jewel.FocusableComponentState import org.jetbrains.jewel.JewelTheme.Companion.isSwingCompatMode +import org.jetbrains.jewel.core.component.styling.LinkStyle +import org.jetbrains.jewel.core.component.styling.LocalLinkStyle +import org.jetbrains.jewel.core.component.styling.LocalMenuStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.disabled +import org.jetbrains.jewel.focusOutline import org.jetbrains.jewel.foundation.onHover import org.jetbrains.jewel.painter.PainterProvider import org.jetbrains.jewel.painter.hints.Stateful -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.LocalLinkStyle -import org.jetbrains.jewel.styling.LocalMenuStyle -import org.jetbrains.jewel.styling.MenuStyle import org.jetbrains.jewel.util.thenIf import java.awt.Cursor diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Menu.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Menu.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/Menu.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Menu.kt index a9be6f775..6c077ce06 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Menu.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Menu.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.VerticalScrollbar import androidx.compose.foundation.background @@ -66,14 +66,19 @@ import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed import org.jetbrains.jewel.CommonStateBitMask.Selected +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.LocalMenuManager +import org.jetbrains.jewel.MenuManager +import org.jetbrains.jewel.Orientation +import org.jetbrains.jewel.SelectableComponentState +import org.jetbrains.jewel.core.component.styling.LocalMenuStyle +import org.jetbrains.jewel.core.component.styling.MenuItemColors +import org.jetbrains.jewel.core.component.styling.MenuItemMetrics +import org.jetbrains.jewel.core.component.styling.MenuStyle import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border import org.jetbrains.jewel.foundation.onHover import org.jetbrains.jewel.painter.hints.Stateful -import org.jetbrains.jewel.styling.LocalMenuStyle -import org.jetbrains.jewel.styling.MenuItemColors -import org.jetbrains.jewel.styling.MenuItemMetrics -import org.jetbrains.jewel.styling.MenuStyle @Composable fun PopupMenu( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Popup.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Popup.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/Popup.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Popup.kt index 9309b3f12..c5aeb60ea 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Popup.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Popup.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Immutable @@ -19,6 +19,7 @@ import androidx.compose.ui.unit.IntRect import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.window.PopupPositionProvider +import org.jetbrains.jewel.MenuManager internal fun handlePopupMenuOnKeyEvent( keyEvent: KeyEvent, diff --git a/core/src/main/kotlin/org/jetbrains/jewel/RadioButton.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/RadioButton.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/RadioButton.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/RadioButton.kt index 221212d16..354c5907b 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/RadioButton.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/RadioButton.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.Image import androidx.compose.foundation.interaction.FocusInteraction @@ -33,10 +33,15 @@ import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed import org.jetbrains.jewel.CommonStateBitMask.Selected +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.LocalSwingCompatMode +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.SelectableComponentState +import org.jetbrains.jewel.core.component.styling.RadioButtonStyle import org.jetbrains.jewel.foundation.Stroke +import org.jetbrains.jewel.outline import org.jetbrains.jewel.painter.hints.Selected import org.jetbrains.jewel.painter.hints.Stateful -import org.jetbrains.jewel.styling.RadioButtonStyle @Composable fun RadioButton( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Scrollbars.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Scrollbars.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Scrollbars.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Scrollbars.kt index 8432ed78a..570d2fb9e 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Scrollbars.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Scrollbars.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.HorizontalScrollbar import androidx.compose.foundation.LocalScrollbarStyle @@ -14,7 +14,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.styling.ScrollbarStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.ScrollbarStyle import kotlin.time.DurationUnit import androidx.compose.foundation.ScrollbarStyle as ComposeScrollbarStyle diff --git a/core/src/main/kotlin/org/jetbrains/jewel/SplitLayout.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/SplitLayout.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/SplitLayout.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/SplitLayout.kt index 7a81d118f..ae977b76a 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/SplitLayout.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/SplitLayout.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.gestures.draggable import androidx.compose.foundation.gestures.rememberDraggableState @@ -23,6 +23,8 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.Orientation import java.awt.Cursor import kotlin.math.roundToInt import androidx.compose.foundation.gestures.Orientation as ComposeOrientation diff --git a/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TabStrip.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/TabStrip.kt index 7d9210af9..ab96248e7 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TabStrip.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.LinearEasing @@ -27,6 +27,8 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.platform.LocalLayoutDirection +import org.jetbrains.jewel.CommonStateBitMask +import org.jetbrains.jewel.FocusableComponentState import org.jetbrains.jewel.foundation.onHover @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Tabs.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Tabs.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/Tabs.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Tabs.kt index 1292a439d..3689a4a27 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Tabs.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Tabs.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.Image import androidx.compose.foundation.LocalIndication @@ -42,6 +42,9 @@ import org.jetbrains.jewel.CommonStateBitMask.Focused import org.jetbrains.jewel.CommonStateBitMask.Hovered import org.jetbrains.jewel.CommonStateBitMask.Pressed import org.jetbrains.jewel.CommonStateBitMask.Selected +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.NoIndication +import org.jetbrains.jewel.SelectableComponentState import org.jetbrains.jewel.painter.hints.Stateful @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Text.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Text.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/Text.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Text.kt index e55355353..c5c81f529 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Text.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Text.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.text.BasicText import androidx.compose.foundation.text.InlineTextContent @@ -17,6 +17,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit +import org.jetbrains.jewel.JewelTheme @Composable fun Text( diff --git a/core/src/main/kotlin/org/jetbrains/jewel/TextArea.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TextArea.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/TextArea.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/TextArea.kt index f1dd64d6d..14cfac3f7 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/TextArea.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TextArea.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box @@ -24,7 +24,9 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.offset -import org.jetbrains.jewel.styling.TextAreaStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.core.component.styling.TextAreaStyle /** * @param placeholder the optional placeholder to be displayed over the diff --git a/core/src/main/kotlin/org/jetbrains/jewel/TextField.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TextField.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/TextField.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/TextField.kt index 2c0e7f3aa..331570597 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/TextField.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/TextField.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box @@ -24,7 +24,9 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.offset -import org.jetbrains.jewel.styling.TextFieldStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.Outline +import org.jetbrains.jewel.core.component.styling.TextFieldStyle import kotlin.math.max /** diff --git a/core/src/main/kotlin/org/jetbrains/jewel/Tooltip.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Tooltip.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/Tooltip.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/Tooltip.kt index beb669729..162024d27 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/Tooltip.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Tooltip.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel +package org.jetbrains.jewel.core.component import androidx.compose.foundation.TooltipArea import androidx.compose.foundation.TooltipPlacement @@ -25,7 +25,9 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.window.PopupPositionProvider -import org.jetbrains.jewel.styling.TooltipStyle +import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.OverrideDarkMode +import org.jetbrains.jewel.core.component.styling.TooltipStyle import org.jetbrains.jewel.util.isDark @Composable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/ButtonStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ButtonStyling.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/ButtonStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ButtonStyling.kt index 87453a896..574587877 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/ButtonStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ButtonStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize -import org.jetbrains.jewel.ButtonState import org.jetbrains.jewel.GenerateDataFunctions +import org.jetbrains.jewel.core.component.ButtonState @Stable @GenerateDataFunctions diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/CheckboxStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CheckboxStyling.kt similarity index 93% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/CheckboxStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CheckboxStyling.kt index 6323b2363..ec7e0ceba 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/CheckboxStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CheckboxStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.shape.CornerSize import androidx.compose.runtime.Composable @@ -10,8 +10,8 @@ import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.DpSize -import org.jetbrains.jewel.CheckboxState import org.jetbrains.jewel.GenerateDataFunctions +import org.jetbrains.jewel.core.component.CheckboxState import org.jetbrains.jewel.painter.PainterProvider @Immutable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/ChipStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ChipStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/ChipStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ChipStyling.kt index 1de7df973..5e74c447e 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/ChipStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ChipStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -10,9 +10,9 @@ import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp -import org.jetbrains.jewel.ChipState import org.jetbrains.jewel.GenerateDataFunctions import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.ChipState @Stable @GenerateDataFunctions diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CircularProgressStyle.kt similarity index 89% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CircularProgressStyle.kt index 90d574c84..1c96a94dd 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/CircularProgressStyle.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/DividerStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DividerStyling.kt similarity index 92% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/DividerStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DividerStyling.kt index a56455f21..b69e3bd06 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/DividerStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DividerStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/DropdownStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DropdownStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/DropdownStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DropdownStyling.kt index 50156c003..f1ed39d19 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/DropdownStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/DropdownStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize -import org.jetbrains.jewel.DropdownState import org.jetbrains.jewel.GenerateDataFunctions +import org.jetbrains.jewel.core.component.DropdownState import org.jetbrains.jewel.painter.PainterProvider @Stable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/GroupHeaderStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/GroupHeaderStyling.kt similarity index 93% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/GroupHeaderStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/GroupHeaderStyling.kt index f8cd5183d..1a03c503c 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/GroupHeaderStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/GroupHeaderStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/HorizontalProgressBarStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/HorizontalProgressBarStyling.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/HorizontalProgressBarStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/HorizontalProgressBarStyling.kt index 1338a1c3f..ad82b9c97 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/HorizontalProgressBarStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/HorizontalProgressBarStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.shape.CornerSize import androidx.compose.runtime.Immutable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/IconButtonMetrics.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/IconButtonMetrics.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/IconButtonMetrics.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/IconButtonMetrics.kt index c4c5b2371..30323d076 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/IconButtonMetrics.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/IconButtonMetrics.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -10,8 +10,8 @@ import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize -import org.jetbrains.jewel.ButtonState import org.jetbrains.jewel.GenerateDataFunctions +import org.jetbrains.jewel.core.component.ButtonState @Stable @GenerateDataFunctions diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/InputFieldStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/InputFieldStyling.kt similarity index 96% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/InputFieldStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/InputFieldStyling.kt index 221fdcc30..a706812db 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/InputFieldStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/InputFieldStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize -import org.jetbrains.jewel.InputFieldState +import org.jetbrains.jewel.core.component.InputFieldState @Stable interface InputFieldStyle { diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/LabelledTextFieldStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LabelledTextFieldStyling.kt similarity index 98% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/LabelledTextFieldStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LabelledTextFieldStyling.kt index 9d714440b..e6e77ab8f 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/LabelledTextFieldStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LabelledTextFieldStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/LazyTreeStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LazyTreeStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/LazyTreeStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LazyTreeStyling.kt index 76b56b119..0fafe3022 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/LazyTreeStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LazyTreeStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/LinkStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LinkStyling.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/LinkStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LinkStyling.kt index 1fe2e8120..5de1e208c 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/LinkStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/LinkStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.shape.CornerSize import androidx.compose.runtime.Composable @@ -10,7 +10,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import org.jetbrains.jewel.GenerateDataFunctions -import org.jetbrains.jewel.LinkState +import org.jetbrains.jewel.core.component.LinkState import org.jetbrains.jewel.painter.PainterProvider @Immutable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/MenuStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/MenuStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/MenuStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/MenuStyling.kt index 16d8fe5c1..379e3a46e 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/MenuStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/MenuStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize @@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import org.jetbrains.jewel.GenerateDataFunctions -import org.jetbrains.jewel.MenuItemState +import org.jetbrains.jewel.core.component.MenuItemState import org.jetbrains.jewel.painter.PainterProvider @Stable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/RadioButtonStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/RadioButtonStyling.kt similarity index 93% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/RadioButtonStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/RadioButtonStyling.kt index feb5d6c5d..67f6fe935 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/RadioButtonStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/RadioButtonStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable @@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import org.jetbrains.jewel.GenerateDataFunctions -import org.jetbrains.jewel.RadioButtonState +import org.jetbrains.jewel.core.component.RadioButtonState import org.jetbrains.jewel.painter.PainterProvider @Immutable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/ScrollbarStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ScrollbarStyling.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/ScrollbarStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ScrollbarStyling.kt index a8d9a9b93..4c6f98ccb 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/ScrollbarStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/ScrollbarStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/TabStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TabStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/TabStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TabStyling.kt index af6082085..9e5409eda 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/TabStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TabStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable @@ -9,7 +9,7 @@ import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import org.jetbrains.jewel.GenerateDataFunctions -import org.jetbrains.jewel.TabState +import org.jetbrains.jewel.core.component.TabState import org.jetbrains.jewel.painter.PainterProvider @Stable diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/TextAreaStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextAreaStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/TextAreaStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextAreaStyling.kt index f618ac65b..9015f7416 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/TextAreaStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextAreaStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/TextFieldStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextFieldStyling.kt similarity index 97% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/TextFieldStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextFieldStyling.kt index 3758ed981..b70ce44b6 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/TextFieldStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TextFieldStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/TooltipStyling.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TooltipStyling.kt similarity index 95% rename from core/src/main/kotlin/org/jetbrains/jewel/styling/TooltipStyling.kt rename to core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TooltipStyling.kt index 3d3ed3c64..fa65310b7 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/TooltipStyling.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/core/component/styling/TooltipStyling.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jewel.styling +package org.jetbrains.jewel.core.component.styling import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.shape.CornerSize diff --git a/core/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt b/core/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt index 78c2e8685..e23c931d8 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt @@ -190,7 +190,7 @@ interface SelectableColumnOnKeyEvent { val targetIndex = min((state.lastActiveItemIndex ?: 0) + visibleSize, keys.lastIndex) val newSelectionList = keys.subList(state.lastActiveItemIndex ?: 0, targetIndex) - .filter { it is Selectable } + .filterIsInstance() .let { state.selectedKeys + it.map { selectableKey -> selectableKey.key } } diff --git a/core/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt b/core/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt index 7dd81e165..d49f8cefc 100644 --- a/core/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt +++ b/core/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt @@ -4,6 +4,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.ui.graphics.Color import androidx.compose.ui.state.ToggleableState +import org.jetbrains.jewel.core.component.CheckboxState import org.jetbrains.jewel.painter.PainterHint import org.jetbrains.jewel.painter.PainterPathHint import org.jetbrains.jewel.painter.PainterResourcePathHint diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt index 8056163b3..54c61e784 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt @@ -14,13 +14,13 @@ import androidx.compose.ui.input.pointer.onPointerEvent import androidx.compose.ui.platform.LocalViewConfiguration import androidx.compose.ui.unit.dp import com.jetbrains.JBR -import org.jetbrains.jewel.Icon -import org.jetbrains.jewel.IconButton import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.IconButton +import org.jetbrains.jewel.core.component.styling.IconButtonStyle import org.jetbrains.jewel.painter.PainterHint import org.jetbrains.jewel.painter.PainterProvider import org.jetbrains.jewel.painter.PainterSuffixHint -import org.jetbrains.jewel.styling.IconButtonStyle import org.jetbrains.jewel.window.styling.TitleBarStyle import java.awt.Frame import java.awt.event.MouseEvent @@ -95,7 +95,7 @@ import java.awt.event.WindowEvent .size(style.metrics.titlePaneButtonSize), style = iconButtonStyle, ) { - Icon(painterProvider.getPainter(if (state.isActive) PainterHint.None else Inactive).value, description) + Icon(painterProvider.getPainter(if (state.isActive) PainterHint else Inactive).value, description) } } diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt index 4f628f586..7290c8d2d 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt @@ -39,10 +39,10 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.offset import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.LocalContentColor import org.jetbrains.jewel.OverrideDarkMode -import org.jetbrains.jewel.styling.LocalDefaultDropdownStyle -import org.jetbrains.jewel.styling.LocalIconButtonStyle +import org.jetbrains.jewel.core.component.LocalContentColor +import org.jetbrains.jewel.core.component.styling.LocalDefaultDropdownStyle +import org.jetbrains.jewel.core.component.styling.LocalIconButtonStyle import org.jetbrains.jewel.util.isDark import org.jetbrains.jewel.window.styling.TitleBarStyle import org.jetbrains.jewel.window.utils.DesktopPlatform diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt index d53022fce..d6f4627d4 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt @@ -9,9 +9,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import org.jetbrains.jewel.GenerateDataFunctions +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.IconButtonStyle import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.IconButtonStyle import org.jetbrains.jewel.window.DecoratedWindowState @Stable diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/ID.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/ID.kt index b6a0864b4..003a04439 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/ID.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/ID.kt @@ -17,8 +17,6 @@ internal class ID : NativeLong { override fun toShort(): Short = toInt().toShort() - override fun toInt(): Int = super.toInt() - companion object { @JvmField val NIL = ID(0L) diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt index 0f5ba844c..248cb170a 100644 --- a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt +++ b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt @@ -71,7 +71,7 @@ internal object MacUtil { fun updateColors(w: Window) { SwingUtilities.invokeLater { - val window = MacUtil.getWindowFromJavaWindow(w) + val window = getWindowFromJavaWindow(w) val delegate = Foundation.invoke(window, "delegate") if (Foundation.invoke(delegate, "respondsToSelector:", Foundation.createSelector("updateColors")) .booleanValue() diff --git a/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt b/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt index cee7a675b..404475cdf 100644 --- a/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt +++ b/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt @@ -25,8 +25,8 @@ val UITheme.icons: Map // TODO #116 replace with public API access once it's made available (IJP 233?) internal val UITheme.iconColorPalette: Map - get() = readMapField>(classUITheme.getDeclaredField("icons")) - .get("ColorPalette").orEmpty() + get() = readMapField>(classUITheme.getDeclaredField("icons"))["ColorPalette"] + .orEmpty() // TODO #116 replace with public API access once it's made available (IJP 233?) internal val UITheme.selectedIconColorPalette: Map diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt index d369ac81c..d32250367 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt @@ -4,7 +4,7 @@ import com.intellij.util.ui.DirProvider import org.jetbrains.jewel.painter.ResourcePainterProvider /** - * [ResourceResolver] to resolve resource in Intellij Module and Bridge module. + * [ResourcePainterProvider] to resolve resource in Intellij Module and Bridge module. */ fun bridgePainterProvider(path: String) = ResourcePainterProvider(path, DirProvider::class.java.classLoader, SwingBridgeService::class.java.classLoader) diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt index b631929b6..cee6b7358 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt @@ -22,7 +22,7 @@ fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette { val teal = readPaletteColors("Teal") val windowsPopupBorder = readPaletteColor("windowsPopupBorder") - val rawMap = buildMap { + val rawMap = buildMap { putAll(grey) putAll(blue) putAll(green) diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt index f29c0fd8d..5949bf3b9 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt @@ -113,7 +113,7 @@ fun Insets.toPaddingValues() = /** * Converts a [JBInsets] to [PaddingValues], in a scaling-aware way. This * means that the resulting [PaddingValues] will be constructed from the - * [JBInsets.unscaled] values, treated as [Dp]. This avoids double scaling. + * [JBInsets.getUnscaled] values, treated as [Dp]. This avoids double scaling. */ fun JBInsets.toPaddingValues() = PaddingValues(unscaled.left.dp, unscaled.top.dp, unscaled.right.dp, unscaled.bottom.dp) diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt index 586293d68..00c328306 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt @@ -27,75 +27,75 @@ import org.jetbrains.jewel.GlobalMetrics import org.jetbrains.jewel.ThemeColorPalette import org.jetbrains.jewel.ThemeDefinition import org.jetbrains.jewel.ThemeIconData +import org.jetbrains.jewel.core.component.styling.ButtonColors +import org.jetbrains.jewel.core.component.styling.ButtonMetrics +import org.jetbrains.jewel.core.component.styling.ButtonStyle +import org.jetbrains.jewel.core.component.styling.CheckboxColors +import org.jetbrains.jewel.core.component.styling.CheckboxIcons +import org.jetbrains.jewel.core.component.styling.CheckboxMetrics +import org.jetbrains.jewel.core.component.styling.CheckboxStyle +import org.jetbrains.jewel.core.component.styling.ChipColors +import org.jetbrains.jewel.core.component.styling.ChipMetrics +import org.jetbrains.jewel.core.component.styling.ChipStyle +import org.jetbrains.jewel.core.component.styling.CircularProgressStyle +import org.jetbrains.jewel.core.component.styling.DividerMetrics +import org.jetbrains.jewel.core.component.styling.DividerStyle +import org.jetbrains.jewel.core.component.styling.DropdownColors +import org.jetbrains.jewel.core.component.styling.DropdownIcons +import org.jetbrains.jewel.core.component.styling.DropdownMetrics +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.GroupHeaderColors +import org.jetbrains.jewel.core.component.styling.GroupHeaderMetrics +import org.jetbrains.jewel.core.component.styling.GroupHeaderStyle +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarColors +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarMetrics +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle +import org.jetbrains.jewel.core.component.styling.IconButtonColors +import org.jetbrains.jewel.core.component.styling.IconButtonMetrics +import org.jetbrains.jewel.core.component.styling.IconButtonStyle +import org.jetbrains.jewel.core.component.styling.InputFieldStyle +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldColors +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldMetrics +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldTextStyles +import org.jetbrains.jewel.core.component.styling.LazyTreeColors +import org.jetbrains.jewel.core.component.styling.LazyTreeIcons +import org.jetbrains.jewel.core.component.styling.LazyTreeMetrics +import org.jetbrains.jewel.core.component.styling.LazyTreeStyle +import org.jetbrains.jewel.core.component.styling.LinkColors +import org.jetbrains.jewel.core.component.styling.LinkIcons +import org.jetbrains.jewel.core.component.styling.LinkMetrics +import org.jetbrains.jewel.core.component.styling.LinkStyle +import org.jetbrains.jewel.core.component.styling.LinkTextStyles +import org.jetbrains.jewel.core.component.styling.MenuColors +import org.jetbrains.jewel.core.component.styling.MenuIcons +import org.jetbrains.jewel.core.component.styling.MenuItemColors +import org.jetbrains.jewel.core.component.styling.MenuItemMetrics +import org.jetbrains.jewel.core.component.styling.MenuMetrics +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.core.component.styling.RadioButtonColors +import org.jetbrains.jewel.core.component.styling.RadioButtonIcons +import org.jetbrains.jewel.core.component.styling.RadioButtonMetrics +import org.jetbrains.jewel.core.component.styling.RadioButtonStyle +import org.jetbrains.jewel.core.component.styling.ScrollbarColors +import org.jetbrains.jewel.core.component.styling.ScrollbarMetrics +import org.jetbrains.jewel.core.component.styling.ScrollbarStyle +import org.jetbrains.jewel.core.component.styling.SubmenuMetrics +import org.jetbrains.jewel.core.component.styling.TabColors +import org.jetbrains.jewel.core.component.styling.TabContentAlpha +import org.jetbrains.jewel.core.component.styling.TabIcons +import org.jetbrains.jewel.core.component.styling.TabMetrics +import org.jetbrains.jewel.core.component.styling.TabStyle +import org.jetbrains.jewel.core.component.styling.TextAreaColors +import org.jetbrains.jewel.core.component.styling.TextAreaMetrics +import org.jetbrains.jewel.core.component.styling.TextAreaStyle +import org.jetbrains.jewel.core.component.styling.TextFieldColors +import org.jetbrains.jewel.core.component.styling.TextFieldMetrics +import org.jetbrains.jewel.core.component.styling.TextFieldStyle +import org.jetbrains.jewel.core.component.styling.TooltipColors +import org.jetbrains.jewel.core.component.styling.TooltipMetrics +import org.jetbrains.jewel.core.component.styling.TooltipStyle import org.jetbrains.jewel.intui.core.styling.defaults -import org.jetbrains.jewel.styling.ButtonColors -import org.jetbrains.jewel.styling.ButtonMetrics -import org.jetbrains.jewel.styling.ButtonStyle -import org.jetbrains.jewel.styling.CheckboxColors -import org.jetbrains.jewel.styling.CheckboxIcons -import org.jetbrains.jewel.styling.CheckboxMetrics -import org.jetbrains.jewel.styling.CheckboxStyle -import org.jetbrains.jewel.styling.ChipColors -import org.jetbrains.jewel.styling.ChipMetrics -import org.jetbrains.jewel.styling.ChipStyle -import org.jetbrains.jewel.styling.CircularProgressStyle -import org.jetbrains.jewel.styling.DividerMetrics -import org.jetbrains.jewel.styling.DividerStyle -import org.jetbrains.jewel.styling.DropdownColors -import org.jetbrains.jewel.styling.DropdownIcons -import org.jetbrains.jewel.styling.DropdownMetrics -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.GroupHeaderColors -import org.jetbrains.jewel.styling.GroupHeaderMetrics -import org.jetbrains.jewel.styling.GroupHeaderStyle -import org.jetbrains.jewel.styling.HorizontalProgressBarColors -import org.jetbrains.jewel.styling.HorizontalProgressBarMetrics -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle -import org.jetbrains.jewel.styling.IconButtonColors -import org.jetbrains.jewel.styling.IconButtonMetrics -import org.jetbrains.jewel.styling.IconButtonStyle -import org.jetbrains.jewel.styling.InputFieldStyle -import org.jetbrains.jewel.styling.LabelledTextFieldColors -import org.jetbrains.jewel.styling.LabelledTextFieldMetrics -import org.jetbrains.jewel.styling.LabelledTextFieldStyle -import org.jetbrains.jewel.styling.LabelledTextFieldTextStyles -import org.jetbrains.jewel.styling.LazyTreeColors -import org.jetbrains.jewel.styling.LazyTreeIcons -import org.jetbrains.jewel.styling.LazyTreeMetrics -import org.jetbrains.jewel.styling.LazyTreeStyle -import org.jetbrains.jewel.styling.LinkColors -import org.jetbrains.jewel.styling.LinkIcons -import org.jetbrains.jewel.styling.LinkMetrics -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.LinkTextStyles -import org.jetbrains.jewel.styling.MenuColors -import org.jetbrains.jewel.styling.MenuIcons -import org.jetbrains.jewel.styling.MenuItemColors -import org.jetbrains.jewel.styling.MenuItemMetrics -import org.jetbrains.jewel.styling.MenuMetrics -import org.jetbrains.jewel.styling.MenuStyle -import org.jetbrains.jewel.styling.RadioButtonColors -import org.jetbrains.jewel.styling.RadioButtonIcons -import org.jetbrains.jewel.styling.RadioButtonMetrics -import org.jetbrains.jewel.styling.RadioButtonStyle -import org.jetbrains.jewel.styling.ScrollbarColors -import org.jetbrains.jewel.styling.ScrollbarMetrics -import org.jetbrains.jewel.styling.ScrollbarStyle -import org.jetbrains.jewel.styling.SubmenuMetrics -import org.jetbrains.jewel.styling.TabColors -import org.jetbrains.jewel.styling.TabContentAlpha -import org.jetbrains.jewel.styling.TabIcons -import org.jetbrains.jewel.styling.TabMetrics -import org.jetbrains.jewel.styling.TabStyle -import org.jetbrains.jewel.styling.TextAreaColors -import org.jetbrains.jewel.styling.TextAreaMetrics -import org.jetbrains.jewel.styling.TextAreaStyle -import org.jetbrains.jewel.styling.TextFieldColors -import org.jetbrains.jewel.styling.TextFieldMetrics -import org.jetbrains.jewel.styling.TextFieldStyle -import org.jetbrains.jewel.styling.TooltipColors -import org.jetbrains.jewel.styling.TooltipMetrics -import org.jetbrains.jewel.styling.TooltipStyle import org.jetbrains.skiko.DependsOnJBR import javax.swing.UIManager import kotlin.time.Duration.Companion.milliseconds diff --git a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/styling/CommonMetrics.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/styling/CommonMetrics.kt index d0604b351..3da69b4a7 100644 --- a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/styling/CommonMetrics.kt +++ b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/styling/CommonMetrics.kt @@ -6,8 +6,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.styling.DividerMetrics -import org.jetbrains.jewel.styling.TooltipMetrics +import org.jetbrains.jewel.core.component.styling.DividerMetrics +import org.jetbrains.jewel.core.component.styling.TooltipMetrics import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds 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 597bfd1ab..bc2c2c526 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 @@ -6,6 +6,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.DropdownColors +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.IconButtonColors +import org.jetbrains.jewel.core.component.styling.IconButtonMetrics +import org.jetbrains.jewel.core.component.styling.IconButtonStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.styling.Undecorated @@ -14,12 +20,6 @@ import org.jetbrains.jewel.intui.standalone.styling.defaults import org.jetbrains.jewel.intui.standalone.styling.light import org.jetbrains.jewel.intui.window.decoratedWindowPainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.DropdownColors -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.IconButtonColors -import org.jetbrains.jewel.styling.IconButtonMetrics -import org.jetbrains.jewel.styling.IconButtonStyle -import org.jetbrains.jewel.styling.MenuStyle import org.jetbrains.jewel.window.styling.TitleBarColors import org.jetbrains.jewel.window.styling.TitleBarIcons import org.jetbrains.jewel.window.styling.TitleBarMetrics diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt index c770db641..2b3cafae3 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt @@ -16,6 +16,25 @@ import org.jetbrains.jewel.JewelTheme import org.jetbrains.jewel.ThemeColorPalette import org.jetbrains.jewel.ThemeDefinition import org.jetbrains.jewel.ThemeIconData +import org.jetbrains.jewel.core.component.styling.ButtonStyle +import org.jetbrains.jewel.core.component.styling.CheckboxStyle +import org.jetbrains.jewel.core.component.styling.ChipStyle +import org.jetbrains.jewel.core.component.styling.CircularProgressStyle +import org.jetbrains.jewel.core.component.styling.DividerStyle +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.GroupHeaderStyle +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle +import org.jetbrains.jewel.core.component.styling.IconButtonStyle +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LazyTreeStyle +import org.jetbrains.jewel.core.component.styling.LinkStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.core.component.styling.RadioButtonStyle +import org.jetbrains.jewel.core.component.styling.ScrollbarStyle +import org.jetbrains.jewel.core.component.styling.TabStyle +import org.jetbrains.jewel.core.component.styling.TextAreaStyle +import org.jetbrains.jewel.core.component.styling.TextFieldStyle +import org.jetbrains.jewel.core.component.styling.TooltipStyle import org.jetbrains.jewel.intui.core.BaseIntUiTheme import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme @@ -26,25 +45,6 @@ import org.jetbrains.jewel.intui.standalone.styling.Undecorated import org.jetbrains.jewel.intui.standalone.styling.dark import org.jetbrains.jewel.intui.standalone.styling.light import org.jetbrains.jewel.painter.LocalPainterHintsProvider -import org.jetbrains.jewel.styling.ButtonStyle -import org.jetbrains.jewel.styling.CheckboxStyle -import org.jetbrains.jewel.styling.ChipStyle -import org.jetbrains.jewel.styling.CircularProgressStyle -import org.jetbrains.jewel.styling.DividerStyle -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.GroupHeaderStyle -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle -import org.jetbrains.jewel.styling.IconButtonStyle -import org.jetbrains.jewel.styling.LabelledTextFieldStyle -import org.jetbrains.jewel.styling.LazyTreeStyle -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.MenuStyle -import org.jetbrains.jewel.styling.RadioButtonStyle -import org.jetbrains.jewel.styling.ScrollbarStyle -import org.jetbrains.jewel.styling.TabStyle -import org.jetbrains.jewel.styling.TextAreaStyle -import org.jetbrains.jewel.styling.TextFieldStyle -import org.jetbrains.jewel.styling.TooltipStyle val JewelTheme.Companion.defaultTextStyle get() = TextStyle.Default.copy( 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 46f69f41e..dd26b4cd1 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 @@ -11,47 +11,44 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.ButtonColors -import org.jetbrains.jewel.styling.ButtonMetrics -import org.jetbrains.jewel.styling.ButtonStyle -val ButtonStyle.Companion.Default: IntUiDefaultButtonStyleFactory +val org.jetbrains.jewel.core.component.styling.ButtonStyle.Companion.Default: IntUiDefaultButtonStyleFactory get() = IntUiDefaultButtonStyleFactory object IntUiDefaultButtonStyleFactory { @Composable fun light( - colors: ButtonColors = ButtonColors.Default.light(), - metrics: ButtonMetrics = ButtonMetrics.default(), - ) = ButtonStyle(colors, metrics) + colors: org.jetbrains.jewel.core.component.styling.ButtonColors = org.jetbrains.jewel.core.component.styling.ButtonColors.Default.light(), + metrics: org.jetbrains.jewel.core.component.styling.ButtonMetrics = org.jetbrains.jewel.core.component.styling.ButtonMetrics.default(), + ) = org.jetbrains.jewel.core.component.styling.ButtonStyle(colors, metrics) @Composable fun dark( - colors: ButtonColors = ButtonColors.Default.dark(), - metrics: ButtonMetrics = ButtonMetrics.default(), - ) = ButtonStyle(colors, metrics) + colors: org.jetbrains.jewel.core.component.styling.ButtonColors = org.jetbrains.jewel.core.component.styling.ButtonColors.Default.dark(), + metrics: org.jetbrains.jewel.core.component.styling.ButtonMetrics = org.jetbrains.jewel.core.component.styling.ButtonMetrics.default(), + ) = org.jetbrains.jewel.core.component.styling.ButtonStyle(colors, metrics) } -val ButtonStyle.Companion.Outlined: IntUiOutlinedButtonStyleFactory +val org.jetbrains.jewel.core.component.styling.ButtonStyle.Companion.Outlined: IntUiOutlinedButtonStyleFactory get() = IntUiOutlinedButtonStyleFactory object IntUiOutlinedButtonStyleFactory { @Composable fun light( - colors: ButtonColors = ButtonColors.Outlined.light(), - metrics: ButtonMetrics = ButtonMetrics.outlined(), - ) = ButtonStyle(colors, metrics) + colors: org.jetbrains.jewel.core.component.styling.ButtonColors = org.jetbrains.jewel.core.component.styling.ButtonColors.Outlined.light(), + metrics: org.jetbrains.jewel.core.component.styling.ButtonMetrics = org.jetbrains.jewel.core.component.styling.ButtonMetrics.outlined(), + ) = org.jetbrains.jewel.core.component.styling.ButtonStyle(colors, metrics) @Composable fun dark( - colors: ButtonColors = ButtonColors.Outlined.dark(), - metrics: ButtonMetrics = ButtonMetrics.outlined(), - ) = ButtonStyle(colors, metrics) + colors: org.jetbrains.jewel.core.component.styling.ButtonColors = org.jetbrains.jewel.core.component.styling.ButtonColors.Outlined.dark(), + metrics: org.jetbrains.jewel.core.component.styling.ButtonMetrics = org.jetbrains.jewel.core.component.styling.ButtonMetrics.outlined(), + ) = org.jetbrains.jewel.core.component.styling.ButtonStyle(colors, metrics) } -val ButtonColors.Companion.Default: IntUiDefaultButtonColorFactory +val org.jetbrains.jewel.core.component.styling.ButtonColors.Companion.Default: IntUiDefaultButtonColorFactory get() = IntUiDefaultButtonColorFactory object IntUiDefaultButtonColorFactory { @@ -73,7 +70,7 @@ object IntUiDefaultButtonColorFactory { borderFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), borderPressed: Brush = border, borderHovered: Brush = border, - ) = ButtonColors( + ) = org.jetbrains.jewel.core.component.styling.ButtonColors( background, backgroundDisabled, backgroundFocused, @@ -108,7 +105,7 @@ object IntUiDefaultButtonColorFactory { borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(1)), borderPressed: Brush = border, borderHovered: Brush = border, - ) = ButtonColors( + ) = org.jetbrains.jewel.core.component.styling.ButtonColors( background, backgroundDisabled, backgroundFocused, @@ -127,7 +124,7 @@ object IntUiDefaultButtonColorFactory { ) } -val ButtonColors.Companion.Outlined: IntUiOutlinedButtonColorFactory +val org.jetbrains.jewel.core.component.styling.ButtonColors.Companion.Outlined: IntUiOutlinedButtonColorFactory get() = IntUiOutlinedButtonColorFactory object IntUiOutlinedButtonColorFactory { @@ -149,7 +146,7 @@ object IntUiOutlinedButtonColorFactory { borderFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), borderPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(7)), borderHovered: Brush = SolidColor(IntUiLightTheme.colors.grey(8)), - ) = ButtonColors( + ) = org.jetbrains.jewel.core.component.styling.ButtonColors( background, backgroundDisabled, backgroundFocused, @@ -184,7 +181,7 @@ object IntUiOutlinedButtonColorFactory { borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)), borderPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)), borderHovered: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)), - ) = ButtonColors( + ) = org.jetbrains.jewel.core.component.styling.ButtonColors( background, backgroundDisabled, backgroundFocused, @@ -203,16 +200,16 @@ object IntUiOutlinedButtonColorFactory { ) } -fun ButtonMetrics.Companion.default( +fun org.jetbrains.jewel.core.component.styling.ButtonMetrics.Companion.default( cornerSize: CornerSize = CornerSize(4.dp), padding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 6.dp), minSize: DpSize = DpSize(72.dp, 28.dp), borderWidth: Dp = 0.dp, -) = ButtonMetrics(cornerSize, padding, minSize, borderWidth) +) = org.jetbrains.jewel.core.component.styling.ButtonMetrics(cornerSize, padding, minSize, borderWidth) -fun ButtonMetrics.Companion.outlined( +fun org.jetbrains.jewel.core.component.styling.ButtonMetrics.Companion.outlined( cornerSize: CornerSize = CornerSize(4.dp), padding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 6.dp), minSize: DpSize = DpSize(72.dp, 28.dp), borderWidth: Dp = 1.dp, -) = ButtonMetrics(cornerSize, padding, minSize, borderWidth) +) = org.jetbrains.jewel.core.component.styling.ButtonMetrics(cornerSize, padding, minSize, borderWidth) 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 ba9c34b6d..a20e1995b 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 @@ -11,56 +11,58 @@ import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.CheckboxColors -import org.jetbrains.jewel.styling.CheckboxIcons -import org.jetbrains.jewel.styling.CheckboxMetrics -import org.jetbrains.jewel.styling.CheckboxStyle @Composable -fun CheckboxStyle.Companion.light( - colors: CheckboxColors = CheckboxColors.light(), - metrics: CheckboxMetrics = CheckboxMetrics.defaults(), - icons: CheckboxIcons = CheckboxIcons.light(), -) = CheckboxStyle(colors, metrics, icons) +fun org.jetbrains.jewel.core.component.styling.CheckboxStyle.Companion.light( + colors: org.jetbrains.jewel.core.component.styling.CheckboxColors = org.jetbrains.jewel.core.component.styling.CheckboxColors.light(), + metrics: org.jetbrains.jewel.core.component.styling.CheckboxMetrics = org.jetbrains.jewel.core.component.styling.CheckboxMetrics.defaults(), + icons: org.jetbrains.jewel.core.component.styling.CheckboxIcons = org.jetbrains.jewel.core.component.styling.CheckboxIcons.light(), +) = org.jetbrains.jewel.core.component.styling.CheckboxStyle(colors, metrics, icons) @Composable -fun CheckboxStyle.Companion.dark( - colors: CheckboxColors = CheckboxColors.dark(), - metrics: CheckboxMetrics = CheckboxMetrics.defaults(), - icons: CheckboxIcons = CheckboxIcons.dark(), -) = CheckboxStyle(colors, metrics, icons) +fun org.jetbrains.jewel.core.component.styling.CheckboxStyle.Companion.dark( + colors: org.jetbrains.jewel.core.component.styling.CheckboxColors = org.jetbrains.jewel.core.component.styling.CheckboxColors.dark(), + metrics: org.jetbrains.jewel.core.component.styling.CheckboxMetrics = org.jetbrains.jewel.core.component.styling.CheckboxMetrics.defaults(), + icons: org.jetbrains.jewel.core.component.styling.CheckboxIcons = org.jetbrains.jewel.core.component.styling.CheckboxIcons.dark(), +) = org.jetbrains.jewel.core.component.styling.CheckboxStyle(colors, metrics, icons) @Composable -fun CheckboxColors.Companion.light( +fun org.jetbrains.jewel.core.component.styling.CheckboxColors.Companion.light( content: Color = Color.Unspecified, contentDisabled: Color = IntUiLightTheme.colors.grey(8), contentSelected: Color = content, -) = CheckboxColors(content, contentDisabled, contentSelected) +) = org.jetbrains.jewel.core.component.styling.CheckboxColors(content, contentDisabled, contentSelected) @Composable -fun CheckboxColors.Companion.dark( +fun org.jetbrains.jewel.core.component.styling.CheckboxColors.Companion.dark( content: Color = Color.Unspecified, contentDisabled: Color = IntUiDarkTheme.colors.grey(7), contentSelected: Color = content, -) = CheckboxColors(content, contentDisabled, contentSelected) +) = org.jetbrains.jewel.core.component.styling.CheckboxColors(content, contentDisabled, contentSelected) -fun CheckboxMetrics.Companion.defaults( +fun org.jetbrains.jewel.core.component.styling.CheckboxMetrics.Companion.defaults( checkboxSize: DpSize = DpSize(19.dp, 19.dp), checkboxCornerSize: CornerSize = CornerSize(3.dp), outlineSize: DpSize = DpSize(15.dp, 15.dp), outlineOffset: DpOffset = DpOffset(2.5.dp, 1.5.dp), iconContentGap: Dp = 5.dp, -) = CheckboxMetrics(checkboxSize, checkboxCornerSize, outlineSize, outlineOffset, iconContentGap) +) = org.jetbrains.jewel.core.component.styling.CheckboxMetrics( + checkboxSize, + checkboxCornerSize, + outlineSize, + outlineOffset, + iconContentGap, +) @Composable -fun CheckboxIcons.Companion.light( +fun org.jetbrains.jewel.core.component.styling.CheckboxIcons.Companion.light( checkbox: PainterProvider = checkbox("com/intellij/ide/ui/laf/icons/intellij/checkBox.svg"), -) = CheckboxIcons(checkbox) +) = org.jetbrains.jewel.core.component.styling.CheckboxIcons(checkbox) @Composable -fun CheckboxIcons.Companion.dark( +fun org.jetbrains.jewel.core.component.styling.CheckboxIcons.Companion.dark( checkbox: PainterProvider = checkbox("com/intellij/ide/ui/laf/icons/darcula/checkBox.svg"), -) = CheckboxIcons(checkbox) +) = org.jetbrains.jewel.core.component.styling.CheckboxIcons(checkbox) @Composable private fun checkbox(basePath: String): PainterProvider = 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 910e8ec8e..db80fd546 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 @@ -8,11 +8,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.ChipColors +import org.jetbrains.jewel.core.component.styling.ChipMetrics +import org.jetbrains.jewel.core.component.styling.ChipStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.ChipColors -import org.jetbrains.jewel.styling.ChipMetrics -import org.jetbrains.jewel.styling.ChipStyle @Composable fun ChipStyle.Companion.light( diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt index e2538c220..c497fc446 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt @@ -3,7 +3,7 @@ package org.jetbrains.jewel.intui.standalone.styling import androidx.compose.ui.graphics.Color -import org.jetbrains.jewel.styling.CircularProgressStyle +import org.jetbrains.jewel.core.component.styling.CircularProgressStyle import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds 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 0a22d2edc..19a54b71f 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 @@ -2,11 +2,11 @@ package org.jetbrains.jewel.intui.standalone.styling import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color +import org.jetbrains.jewel.core.component.styling.DividerMetrics +import org.jetbrains.jewel.core.component.styling.DividerStyle import org.jetbrains.jewel.intui.core.styling.defaults import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.DividerMetrics -import org.jetbrains.jewel.styling.DividerStyle @Composable fun DividerStyle.Companion.light( 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 403da1b70..15f219fb6 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 @@ -9,16 +9,16 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.DropdownColors +import org.jetbrains.jewel.core.component.styling.DropdownIcons +import org.jetbrains.jewel.core.component.styling.DropdownMetrics +import org.jetbrains.jewel.core.component.styling.DropdownStyle +import org.jetbrains.jewel.core.component.styling.MenuStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.defaultTextStyle import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.DropdownColors -import org.jetbrains.jewel.styling.DropdownIcons -import org.jetbrains.jewel.styling.DropdownMetrics -import org.jetbrains.jewel.styling.DropdownStyle -import org.jetbrains.jewel.styling.MenuStyle val DropdownStyle.Companion.Default: IntUiDefaultDropdownStyleFactory get() = IntUiDefaultDropdownStyleFactory @@ -256,7 +256,13 @@ fun DropdownMetrics.Companion.default( cornerSize: CornerSize = CornerSize(4.dp), contentPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 3.dp), borderWidth: Dp = 1.dp, -) = DropdownMetrics(arrowMinSize, minSize, cornerSize, contentPadding, borderWidth) +) = DropdownMetrics( + arrowMinSize, + minSize, + cornerSize, + contentPadding, + borderWidth, +) fun DropdownMetrics.Companion.undecorated( arrowMinSize: DpSize = DpSize((23 + 3).dp, 24.dp), @@ -264,7 +270,13 @@ fun DropdownMetrics.Companion.undecorated( cornerSize: CornerSize = CornerSize(4.dp), contentPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 3.dp), borderWidth: Dp = 0.dp, -) = DropdownMetrics(arrowMinSize, minSize, cornerSize, contentPadding, borderWidth) +) = DropdownMetrics( + arrowMinSize, + minSize, + cornerSize, + contentPadding, + borderWidth, +) fun DropdownIcons.Companion.defaults( chevronDown: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"), 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 116a8c28a..3bdaa3f08 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 @@ -4,11 +4,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.GroupHeaderColors +import org.jetbrains.jewel.core.component.styling.GroupHeaderMetrics +import org.jetbrains.jewel.core.component.styling.GroupHeaderStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.GroupHeaderColors -import org.jetbrains.jewel.styling.GroupHeaderMetrics -import org.jetbrains.jewel.styling.GroupHeaderStyle @Composable fun GroupHeaderStyle.Companion.light( 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 2d0050375..887286040 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 @@ -5,11 +5,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarColors +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarMetrics +import org.jetbrains.jewel.core.component.styling.HorizontalProgressBarStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.HorizontalProgressBarColors -import org.jetbrains.jewel.styling.HorizontalProgressBarMetrics -import org.jetbrains.jewel.styling.HorizontalProgressBarStyle import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -33,7 +33,12 @@ fun HorizontalProgressBarColors.Companion.light( progress: Color = IntUiLightTheme.colors.blue(4), indeterminateBase: Color = IntUiLightTheme.colors.blue(9), indeterminateHighlight: Color = IntUiLightTheme.colors.blue(4), -) = HorizontalProgressBarColors(track, progress, indeterminateBase, indeterminateHighlight) +) = HorizontalProgressBarColors( + track, + progress, + indeterminateBase, + indeterminateHighlight, +) @Composable fun HorizontalProgressBarColors.Companion.dark( @@ -41,10 +46,19 @@ fun HorizontalProgressBarColors.Companion.dark( progress: Color = IntUiDarkTheme.colors.blue(7), indeterminateBase: Color = IntUiDarkTheme.colors.blue(9), indeterminateHighlight: Color = IntUiDarkTheme.colors.blue(5), -) = HorizontalProgressBarColors(track, progress, indeterminateBase, indeterminateHighlight) +) = HorizontalProgressBarColors( + track, + progress, + indeterminateBase, + indeterminateHighlight, +) fun HorizontalProgressBarMetrics.Companion.defaults( cornerSize: CornerSize = CornerSize(100), minHeight: Dp = 4.dp, indeterminateHighlightWidth: Dp = 140.dp, -) = HorizontalProgressBarMetrics(cornerSize, minHeight, indeterminateHighlightWidth) +) = HorizontalProgressBarMetrics( + cornerSize, + minHeight, + indeterminateHighlightWidth, +) 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 67a28a41e..854937a27 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 @@ -7,11 +7,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.IconButtonColors +import org.jetbrains.jewel.core.component.styling.IconButtonMetrics +import org.jetbrains.jewel.core.component.styling.IconButtonStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.IconButtonColors -import org.jetbrains.jewel.styling.IconButtonMetrics -import org.jetbrains.jewel.styling.IconButtonStyle @Composable fun IconButtonStyle.Companion.light( diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt index 73086422b..1d387461f 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt @@ -10,13 +10,13 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldColors +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldMetrics +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle +import org.jetbrains.jewel.core.component.styling.LabelledTextFieldTextStyles import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.defaultTextStyle -import org.jetbrains.jewel.styling.LabelledTextFieldColors -import org.jetbrains.jewel.styling.LabelledTextFieldMetrics -import org.jetbrains.jewel.styling.LabelledTextFieldStyle -import org.jetbrains.jewel.styling.LabelledTextFieldTextStyles @Composable fun LabelledTextFieldStyle.Companion.light( @@ -143,7 +143,14 @@ fun LabelledTextFieldMetrics.Companion.defaults( borderWidth: Dp = 1.dp, labelSpacing: Dp = 6.dp, hintSpacing: Dp = 6.dp, -) = LabelledTextFieldMetrics(borderWidth, contentPadding, cornerSize, minSize, labelSpacing, hintSpacing) +) = LabelledTextFieldMetrics( + borderWidth, + contentPadding, + cornerSize, + minSize, + labelSpacing, + hintSpacing, +) fun LabelledTextFieldTextStyles.Companion.light( label: TextStyle = JewelTheme.defaultTextStyle, 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 f02b55088..46d67299f 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 @@ -6,14 +6,14 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.LazyTreeColors +import org.jetbrains.jewel.core.component.styling.LazyTreeIcons +import org.jetbrains.jewel.core.component.styling.LazyTreeMetrics +import org.jetbrains.jewel.core.component.styling.LazyTreeStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.LazyTreeColors -import org.jetbrains.jewel.styling.LazyTreeIcons -import org.jetbrains.jewel.styling.LazyTreeMetrics -import org.jetbrains.jewel.styling.LazyTreeStyle @Composable fun LazyTreeStyle.Companion.light( @@ -88,4 +88,9 @@ fun LazyTreeIcons.Companion.defaults( chevronExpanded: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"), chevronSelectedCollapsed: PainterProvider = chevronCollapsed, chevronSelectedExpanded: PainterProvider = chevronExpanded, -) = LazyTreeIcons(chevronCollapsed, chevronExpanded, chevronSelectedCollapsed, chevronSelectedExpanded) +) = LazyTreeIcons( + chevronCollapsed, + chevronExpanded, + chevronSelectedCollapsed, + chevronSelectedExpanded, +) 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 f0774a1f6..c7053de11 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 @@ -14,37 +14,32 @@ import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.defaultTextStyle import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.LinkColors -import org.jetbrains.jewel.styling.LinkIcons -import org.jetbrains.jewel.styling.LinkMetrics -import org.jetbrains.jewel.styling.LinkStyle -import org.jetbrains.jewel.styling.LinkTextStyles @Composable -fun LinkStyle.Companion.light( - colors: LinkColors = LinkColors.light(), - metrics: LinkMetrics = LinkMetrics.defaults(), - icons: LinkIcons = LinkIcons.defaults(), - textStyles: LinkTextStyles = LinkTextStyles.light(), -) = LinkStyle(colors, metrics, icons, textStyles) +fun org.jetbrains.jewel.core.component.styling.LinkStyle.Companion.light( + colors: org.jetbrains.jewel.core.component.styling.LinkColors = org.jetbrains.jewel.core.component.styling.LinkColors.light(), + metrics: org.jetbrains.jewel.core.component.styling.LinkMetrics = org.jetbrains.jewel.core.component.styling.LinkMetrics.defaults(), + icons: org.jetbrains.jewel.core.component.styling.LinkIcons = org.jetbrains.jewel.core.component.styling.LinkIcons.defaults(), + textStyles: org.jetbrains.jewel.core.component.styling.LinkTextStyles = org.jetbrains.jewel.core.component.styling.LinkTextStyles.light(), +) = org.jetbrains.jewel.core.component.styling.LinkStyle(colors, metrics, icons, textStyles) @Composable -fun LinkStyle.Companion.dark( - colors: LinkColors = LinkColors.dark(), - metrics: LinkMetrics = LinkMetrics.defaults(), - icons: LinkIcons = LinkIcons.defaults(), - textStyles: LinkTextStyles = LinkTextStyles.dark(), -) = LinkStyle(colors, metrics, icons, textStyles) +fun org.jetbrains.jewel.core.component.styling.LinkStyle.Companion.dark( + colors: org.jetbrains.jewel.core.component.styling.LinkColors = org.jetbrains.jewel.core.component.styling.LinkColors.dark(), + metrics: org.jetbrains.jewel.core.component.styling.LinkMetrics = org.jetbrains.jewel.core.component.styling.LinkMetrics.defaults(), + icons: org.jetbrains.jewel.core.component.styling.LinkIcons = org.jetbrains.jewel.core.component.styling.LinkIcons.defaults(), + textStyles: org.jetbrains.jewel.core.component.styling.LinkTextStyles = org.jetbrains.jewel.core.component.styling.LinkTextStyles.dark(), +) = org.jetbrains.jewel.core.component.styling.LinkStyle(colors, metrics, icons, textStyles) @Composable -fun LinkColors.Companion.light( +fun org.jetbrains.jewel.core.component.styling.LinkColors.Companion.light( content: Color = IntUiLightTheme.colors.blue(2), contentDisabled: Color = IntUiLightTheme.colors.grey(8), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, contentVisited: Color = content, -) = LinkColors( +) = org.jetbrains.jewel.core.component.styling.LinkColors( content, contentDisabled, contentFocused, @@ -54,14 +49,14 @@ fun LinkColors.Companion.light( ) @Composable -fun LinkColors.Companion.dark( +fun org.jetbrains.jewel.core.component.styling.LinkColors.Companion.dark( content: Color = IntUiDarkTheme.colors.blue(9), contentDisabled: Color = IntUiDarkTheme.colors.grey(7), contentFocused: Color = content, contentPressed: Color = content, contentHovered: Color = content, contentVisited: Color = content, -) = LinkColors( +) = org.jetbrains.jewel.core.component.styling.LinkColors( content, contentDisabled, contentFocused, @@ -70,33 +65,35 @@ fun LinkColors.Companion.dark( contentVisited, ) -fun LinkMetrics.Companion.defaults( +fun org.jetbrains.jewel.core.component.styling.LinkMetrics.Companion.defaults( focusHaloCornerSize: CornerSize = CornerSize(2.dp), textIconGap: Dp = 0.dp, iconSize: DpSize = DpSize(16.dp, 16.dp), -) = LinkMetrics(focusHaloCornerSize, textIconGap, iconSize) +) = org.jetbrains.jewel.core.component.styling.LinkMetrics(focusHaloCornerSize, textIconGap, iconSize) -fun LinkIcons.Companion.defaults( +fun org.jetbrains.jewel.core.component.styling.LinkIcons.Companion.defaults( dropdownChevron: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"), externalLink: PainterProvider = standalonePainterProvider("expui/ide/externalLink.svg"), -) = LinkIcons(dropdownChevron, externalLink) +) = org.jetbrains.jewel.core.component.styling.LinkIcons(dropdownChevron, externalLink) @Composable -fun LinkTextStyles.Companion.light( +fun org.jetbrains.jewel.core.component.styling.LinkTextStyles.Companion.light( normal: TextStyle = JewelTheme.defaultTextStyle.copy(textDecoration = TextDecoration.Underline), disabled: TextStyle = JewelTheme.defaultTextStyle, focused: TextStyle = normal, pressed: TextStyle = normal, hovered: TextStyle = normal, visited: TextStyle = normal, -): LinkTextStyles = LinkTextStyles(normal, disabled, focused, pressed, hovered, visited) +): org.jetbrains.jewel.core.component.styling.LinkTextStyles = + org.jetbrains.jewel.core.component.styling.LinkTextStyles(normal, disabled, focused, pressed, hovered, visited) @Composable -fun LinkTextStyles.Companion.dark( +fun org.jetbrains.jewel.core.component.styling.LinkTextStyles.Companion.dark( normal: TextStyle = JewelTheme.defaultTextStyle.copy(textDecoration = TextDecoration.Underline), disabled: TextStyle = JewelTheme.defaultTextStyle, focused: TextStyle = normal, pressed: TextStyle = normal, hovered: TextStyle = normal, visited: TextStyle = normal, -): LinkTextStyles = LinkTextStyles(normal, disabled, focused, pressed, hovered, visited) +): org.jetbrains.jewel.core.component.styling.LinkTextStyles = + org.jetbrains.jewel.core.component.styling.LinkTextStyles(normal, disabled, focused, pressed, hovered, visited) 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 5c0e9d034..dc3b3c414 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 @@ -7,17 +7,17 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.MenuColors +import org.jetbrains.jewel.core.component.styling.MenuIcons +import org.jetbrains.jewel.core.component.styling.MenuItemColors +import org.jetbrains.jewel.core.component.styling.MenuItemMetrics +import org.jetbrains.jewel.core.component.styling.MenuMetrics +import org.jetbrains.jewel.core.component.styling.MenuStyle +import org.jetbrains.jewel.core.component.styling.SubmenuMetrics import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.MenuColors -import org.jetbrains.jewel.styling.MenuIcons -import org.jetbrains.jewel.styling.MenuItemColors -import org.jetbrains.jewel.styling.MenuItemMetrics -import org.jetbrains.jewel.styling.MenuMetrics -import org.jetbrains.jewel.styling.MenuStyle -import org.jetbrains.jewel.styling.SubmenuMetrics @Composable fun MenuStyle.Companion.light( @@ -132,7 +132,16 @@ fun MenuMetrics.Companion.defaults( borderWidth: Dp = 1.dp, itemMetrics: MenuItemMetrics = MenuItemMetrics.defaults(), submenuMetrics: SubmenuMetrics = SubmenuMetrics.defaults(), -) = MenuMetrics(cornerSize, menuMargin, contentPadding, offset, shadowSize, borderWidth, itemMetrics, submenuMetrics) +) = MenuMetrics( + cornerSize, + menuMargin, + contentPadding, + offset, + shadowSize, + borderWidth, + itemMetrics, + submenuMetrics, +) fun MenuItemMetrics.Companion.defaults( selectionCornerSize: CornerSize = CornerSize(4.dp), @@ -140,7 +149,13 @@ fun MenuItemMetrics.Companion.defaults( contentPadding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 4.dp), separatorPadding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 4.dp), separatorThickness: Dp = 1.dp, -) = MenuItemMetrics(selectionCornerSize, outerPadding, contentPadding, separatorPadding, separatorThickness) +) = MenuItemMetrics( + selectionCornerSize, + outerPadding, + contentPadding, + separatorPadding, + separatorThickness, +) fun SubmenuMetrics.Companion.defaults( offset: DpOffset = DpOffset(0.dp, (-8).dp), 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 a9e67075e..849e3a594 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 @@ -5,14 +5,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.RadioButtonColors +import org.jetbrains.jewel.core.component.styling.RadioButtonIcons +import org.jetbrains.jewel.core.component.styling.RadioButtonMetrics +import org.jetbrains.jewel.core.component.styling.RadioButtonStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.RadioButtonColors -import org.jetbrains.jewel.styling.RadioButtonIcons -import org.jetbrains.jewel.styling.RadioButtonMetrics -import org.jetbrains.jewel.styling.RadioButtonStyle @Composable fun RadioButtonStyle.Companion.light( diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt index 0582b1f51..33265d2f9 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt @@ -6,9 +6,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.styling.ScrollbarColors -import org.jetbrains.jewel.styling.ScrollbarMetrics -import org.jetbrains.jewel.styling.ScrollbarStyle +import org.jetbrains.jewel.core.component.styling.ScrollbarColors +import org.jetbrains.jewel.core.component.styling.ScrollbarMetrics +import org.jetbrains.jewel.core.component.styling.ScrollbarStyle import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -43,4 +43,9 @@ fun ScrollbarMetrics.Companion.defaults( thumbThickness: Dp = 8.dp, minThumbLength: Dp = 16.dp, trackPadding: PaddingValues = PaddingValues(start = 7.dp, end = 3.dp), -) = ScrollbarMetrics(thumbCornerSize, thumbThickness, minThumbLength, trackPadding) +) = ScrollbarMetrics( + thumbCornerSize, + thumbThickness, + minThumbLength, + trackPadding, +) 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 c7209050b..ec30b75cf 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 @@ -5,15 +5,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import org.jetbrains.jewel.core.component.styling.TabColors +import org.jetbrains.jewel.core.component.styling.TabContentAlpha +import org.jetbrains.jewel.core.component.styling.TabIcons +import org.jetbrains.jewel.core.component.styling.TabMetrics +import org.jetbrains.jewel.core.component.styling.TabStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.standalonePainterProvider import org.jetbrains.jewel.painter.PainterProvider -import org.jetbrains.jewel.styling.TabColors -import org.jetbrains.jewel.styling.TabContentAlpha -import org.jetbrains.jewel.styling.TabIcons -import org.jetbrains.jewel.styling.TabMetrics -import org.jetbrains.jewel.styling.TabStyle val TabStyle.Companion.Default get() = IntUiDefaultTabStyleFactory 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 9231b43a7..c99ffd5fb 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 @@ -9,12 +9,12 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.TextAreaColors +import org.jetbrains.jewel.core.component.styling.TextAreaMetrics +import org.jetbrains.jewel.core.component.styling.TextAreaStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.defaultTextStyle -import org.jetbrains.jewel.styling.TextAreaColors -import org.jetbrains.jewel.styling.TextAreaMetrics -import org.jetbrains.jewel.styling.TextAreaStyle @Composable fun TextAreaStyle.Companion.light( 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 72817ce07..b9fb5f266 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 @@ -9,12 +9,12 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import org.jetbrains.jewel.JewelTheme +import org.jetbrains.jewel.core.component.styling.TextFieldColors +import org.jetbrains.jewel.core.component.styling.TextFieldMetrics +import org.jetbrains.jewel.core.component.styling.TextFieldStyle import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme import org.jetbrains.jewel.intui.standalone.defaultTextStyle -import org.jetbrains.jewel.styling.TextFieldColors -import org.jetbrains.jewel.styling.TextFieldMetrics -import org.jetbrains.jewel.styling.TextFieldStyle @Composable fun TextFieldStyle.Companion.light( 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 a71925f37..968b69f58 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 @@ -2,12 +2,12 @@ package org.jetbrains.jewel.intui.standalone.styling import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color +import org.jetbrains.jewel.core.component.styling.TooltipColors +import org.jetbrains.jewel.core.component.styling.TooltipMetrics +import org.jetbrains.jewel.core.component.styling.TooltipStyle import org.jetbrains.jewel.intui.core.styling.defaults import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme -import org.jetbrains.jewel.styling.TooltipColors -import org.jetbrains.jewel.styling.TooltipMetrics -import org.jetbrains.jewel.styling.TooltipStyle @Composable fun TooltipStyle.Companion.light( diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt index bd3fe6b7d..01b56dd7d 100644 --- a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt +++ b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt @@ -26,21 +26,21 @@ import androidx.compose.ui.unit.dp import com.intellij.icons.AllIcons import com.intellij.ui.JBColor import icons.JewelIcons -import org.jetbrains.jewel.CheckboxRow -import org.jetbrains.jewel.CircularProgressIndicator -import org.jetbrains.jewel.CircularProgressIndicatorBig -import org.jetbrains.jewel.DefaultButton -import org.jetbrains.jewel.Icon -import org.jetbrains.jewel.IconButton import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.LazyTree -import org.jetbrains.jewel.OutlinedButton -import org.jetbrains.jewel.RadioButtonRow -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.TextField -import org.jetbrains.jewel.Tooltip import org.jetbrains.jewel.bridge.SwingBridgeTheme import org.jetbrains.jewel.bridge.toComposeColor +import org.jetbrains.jewel.core.component.CheckboxRow +import org.jetbrains.jewel.core.component.CircularProgressIndicator +import org.jetbrains.jewel.core.component.CircularProgressIndicatorBig +import org.jetbrains.jewel.core.component.DefaultButton +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.IconButton +import org.jetbrains.jewel.core.component.LazyTree +import org.jetbrains.jewel.core.component.OutlinedButton +import org.jetbrains.jewel.core.component.RadioButtonRow +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.TextField +import org.jetbrains.jewel.core.component.Tooltip import org.jetbrains.jewel.foundation.tree.buildTree @Composable internal fun ComponentShowcaseTab() { diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt index 43c25947a..be8c9a94a 100644 --- a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt +++ b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt @@ -73,24 +73,24 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.datetime.toJavaLocalDate -import org.jetbrains.jewel.HorizontalSplitLayout -import org.jetbrains.jewel.Icon import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.PopupMenu -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.TextField -import org.jetbrains.jewel.VerticalScrollbar import org.jetbrains.jewel.bridge.SwingBridgeTheme import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified import org.jetbrains.jewel.bridge.retrieveTextStyle import org.jetbrains.jewel.bridge.toComposeColor import org.jetbrains.jewel.bridge.toFontFamily +import org.jetbrains.jewel.core.component.HorizontalSplitLayout +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.PopupMenu +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.TextField +import org.jetbrains.jewel.core.component.VerticalScrollbar +import org.jetbrains.jewel.core.component.items import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn import org.jetbrains.jewel.foundation.lazy.SelectionMode import org.jetbrains.jewel.foundation.lazy.items import org.jetbrains.jewel.foundation.lazy.rememberSelectableLazyListState import org.jetbrains.jewel.foundation.onHover -import org.jetbrains.jewel.items import org.jetbrains.jewel.painter.rememberResourcePainterProvider import org.jetbrains.jewel.util.thenIf import org.jetbrains.skiko.DependsOnJBR diff --git a/samples/ide-plugin/src/main/resources/android-releases/11.svg b/samples/ide-plugin/src/main/resources/android-releases/11.svg index dfbe24b1a..65576a2e7 100644 --- a/samples/ide-plugin/src/main/resources/android-releases/11.svg +++ b/samples/ide-plugin/src/main/resources/android-releases/11.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/samples/ide-plugin/src/main/resources/android-releases/14.svg b/samples/ide-plugin/src/main/resources/android-releases/14.svg index 790e77cfc..454f85808 100644 --- a/samples/ide-plugin/src/main/resources/android-releases/14.svg +++ b/samples/ide-plugin/src/main/resources/android-releases/14.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt index e28cf47d5..7075d8254 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt @@ -31,16 +31,17 @@ import androidx.compose.ui.res.loadSvgPainter import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp import androidx.compose.ui.window.application -import org.jetbrains.jewel.CheckboxRow -import org.jetbrains.jewel.Divider -import org.jetbrains.jewel.Dropdown -import org.jetbrains.jewel.Icon -import org.jetbrains.jewel.IconButton import org.jetbrains.jewel.JewelTheme import org.jetbrains.jewel.Orientation -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.Tooltip -import org.jetbrains.jewel.VerticalScrollbar +import org.jetbrains.jewel.core.component.CheckboxRow +import org.jetbrains.jewel.core.component.Divider +import org.jetbrains.jewel.core.component.Dropdown +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.IconButton +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.Tooltip +import org.jetbrains.jewel.core.component.VerticalScrollbar +import org.jetbrains.jewel.core.component.separator import org.jetbrains.jewel.intui.standalone.IntUiTheme import org.jetbrains.jewel.intui.standalone.darkThemeDefinition import org.jetbrains.jewel.intui.standalone.lightThemeDefinition @@ -61,7 +62,6 @@ import org.jetbrains.jewel.samples.standalone.components.Tabs import org.jetbrains.jewel.samples.standalone.components.TextAreas import org.jetbrains.jewel.samples.standalone.components.TextFields import org.jetbrains.jewel.samples.standalone.components.Tooltips -import org.jetbrains.jewel.separator import org.jetbrains.jewel.window.DecoratedWindow import org.jetbrains.jewel.window.TitleBar import org.jetbrains.jewel.window.newFullscreenControls diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt index 1452d108e..645c253c3 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.OutlinedButton -import org.jetbrains.jewel.RadioButtonRow -import org.jetbrains.jewel.Text +import org.jetbrains.jewel.core.component.OutlinedButton +import org.jetbrains.jewel.core.component.RadioButtonRow +import org.jetbrains.jewel.core.component.Text import org.jetbrains.jewel.foundation.Stroke import org.jetbrains.jewel.foundation.border diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Buttons.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Buttons.kt index 05dc89976..0faeda660 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Buttons.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Buttons.kt @@ -4,16 +4,15 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.DefaultButton import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.Icon -import org.jetbrains.jewel.IconButton -import org.jetbrains.jewel.OutlinedButton -import org.jetbrains.jewel.Text +import org.jetbrains.jewel.core.component.DefaultButton +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.IconButton +import org.jetbrains.jewel.core.component.OutlinedButton +import org.jetbrains.jewel.core.component.Text import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons @Composable diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Checkboxes.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Checkboxes.kt index 3937172b5..752aee04b 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Checkboxes.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Checkboxes.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.Outline -import org.jetbrains.jewel.TriStateCheckboxRow +import org.jetbrains.jewel.core.component.TriStateCheckboxRow @Composable fun Checkboxes() { diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt index 93d785ede..a017e84bc 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt @@ -22,13 +22,13 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.Chip import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.LazyTree -import org.jetbrains.jewel.RadioButtonChip -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.ToggleableChip +import org.jetbrains.jewel.core.component.Chip +import org.jetbrains.jewel.core.component.LazyTree +import org.jetbrains.jewel.core.component.RadioButtonChip +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.ToggleableChip import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn import org.jetbrains.jewel.foundation.tree.buildTree diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Dropdowns.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Dropdowns.kt index 31ad70bd7..4b4b78879 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Dropdowns.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Dropdowns.kt @@ -9,11 +9,11 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.Dropdown import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.Outline -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.separator +import org.jetbrains.jewel.core.component.Dropdown +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.separator @Composable fun Dropdowns() { diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Icons.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Icons.kt index bc7fc45d1..0e593e888 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Icons.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Icons.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.Icon +import org.jetbrains.jewel.core.component.Icon import org.jetbrains.jewel.painter.rememberResourcePainterProvider import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Links.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Links.kt index 710853398..7660af7ec 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Links.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Links.kt @@ -9,12 +9,12 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.unit.dp -import org.jetbrains.jewel.DropdownLink -import org.jetbrains.jewel.ExternalLink import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.Link -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.separator +import org.jetbrains.jewel.core.component.DropdownLink +import org.jetbrains.jewel.core.component.ExternalLink +import org.jetbrains.jewel.core.component.Link +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.separator @Composable fun Links() { diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ProgressBar.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ProgressBar.kt index 004327e31..28d2279e9 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ProgressBar.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ProgressBar.kt @@ -18,12 +18,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay -import org.jetbrains.jewel.CircularProgressIndicator -import org.jetbrains.jewel.CircularProgressIndicatorBig import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.HorizontalProgressBar -import org.jetbrains.jewel.IndeterminateHorizontalProgressBar -import org.jetbrains.jewel.Text +import org.jetbrains.jewel.core.component.CircularProgressIndicator +import org.jetbrains.jewel.core.component.CircularProgressIndicatorBig +import org.jetbrains.jewel.core.component.HorizontalProgressBar +import org.jetbrains.jewel.core.component.IndeterminateHorizontalProgressBar +import org.jetbrains.jewel.core.component.Text @Composable fun ProgressBar() { diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/RadioButtons.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/RadioButtons.kt index 9481ad763..8cc2c7c39 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/RadioButtons.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/RadioButtons.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.Outline -import org.jetbrains.jewel.RadioButtonRow +import org.jetbrains.jewel.core.component.RadioButtonRow @Composable fun RadioButtons() { diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tabs.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tabs.kt index d95c7d021..1e3b3c2da 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tabs.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tabs.kt @@ -25,12 +25,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.Icon import org.jetbrains.jewel.JewelTheme import org.jetbrains.jewel.NoIndication -import org.jetbrains.jewel.TabData -import org.jetbrains.jewel.TabStrip -import org.jetbrains.jewel.Text +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.TabData +import org.jetbrains.jewel.core.component.TabStrip +import org.jetbrains.jewel.core.component.Text import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons import kotlin.math.max diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextAreas.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextAreas.kt index f85ca02e3..287065d8c 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextAreas.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextAreas.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.Outline -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.TextArea +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.TextArea @Suppress("SpellCheckingInspection") private const val LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. \n" + diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextFields.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextFields.kt index 9101f43ea..640404126 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextFields.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/TextFields.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader -import org.jetbrains.jewel.Icon -import org.jetbrains.jewel.LabelledTextField import org.jetbrains.jewel.Outline -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.TextField +import org.jetbrains.jewel.core.component.Icon +import org.jetbrains.jewel.core.component.LabelledTextField +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.TextField import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons @Composable diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tooltips.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tooltips.kt index 119471962..60222b388 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tooltips.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Tooltips.kt @@ -7,8 +7,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import org.jetbrains.jewel.GroupHeader import org.jetbrains.jewel.JewelTheme -import org.jetbrains.jewel.Text -import org.jetbrains.jewel.Tooltip +import org.jetbrains.jewel.core.component.Text +import org.jetbrains.jewel.core.component.Tooltip @Composable fun Tooltips() { diff --git a/samples/standalone/src/main/resources/icons/gradleIcon.svg b/samples/standalone/src/main/resources/icons/gradleIcon.svg index 7ce330c4c..a527ff717 100644 --- a/samples/standalone/src/main/resources/icons/gradleIcon.svg +++ b/samples/standalone/src/main/resources/icons/gradleIcon.svg @@ -1,5 +1,5 @@ - + diff --git a/samples/standalone/src/main/resources/icons/gradleIcon_dark.svg b/samples/standalone/src/main/resources/icons/gradleIcon_dark.svg index f1988996b..1b575a087 100644 --- a/samples/standalone/src/main/resources/icons/gradleIcon_dark.svg +++ b/samples/standalone/src/main/resources/icons/gradleIcon_dark.svg @@ -1,4 +1,4 @@ - + @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/samples/standalone/src/main/resources/icons/kotlin.svg b/samples/standalone/src/main/resources/icons/kotlin.svg index 3a8fd1bca..c2a7cfc39 100644 --- a/samples/standalone/src/main/resources/icons/kotlin.svg +++ b/samples/standalone/src/main/resources/icons/kotlin.svg @@ -2,16 +2,15 @@