diff --git a/platform/jewel/foundation/metalava/foundation-api-0.39.0.txt b/platform/jewel/foundation/metalava/foundation-api-0.39.0.txt index bd331e21be24..9daf071410ad 100644 --- a/platform/jewel/foundation/metalava/foundation-api-0.39.0.txt +++ b/platform/jewel/foundation/metalava/foundation-api-0.39.0.txt @@ -151,7 +151,6 @@ package org.jetbrains.jewel.foundation { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TextColors { - ctor @KotlinOnly @Deprecated public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error); ctor @KotlinOnly public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color disabledSelected, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error, androidx.compose.ui.graphics.Color warning); property public androidx.compose.ui.graphics.Color disabled; property public androidx.compose.ui.graphics.Color disabledSelected; @@ -1017,7 +1016,6 @@ package org.jetbrains.jewel.foundation.theme { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ThemeDefinition { - ctor @KotlinOnly @Deprecated public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData); ctor @KotlinOnly public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData, org.jetbrains.jewel.foundation.DisabledAppearanceValues disabledAppearanceValues); method public org.jetbrains.jewel.foundation.theme.ThemeColorPalette getColorPalette(); method public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); diff --git a/platform/jewel/foundation/metalava/foundation-api-0.40.0.txt b/platform/jewel/foundation/metalava/foundation-api-0.40.0.txt index bd331e21be24..9daf071410ad 100644 --- a/platform/jewel/foundation/metalava/foundation-api-0.40.0.txt +++ b/platform/jewel/foundation/metalava/foundation-api-0.40.0.txt @@ -151,7 +151,6 @@ package org.jetbrains.jewel.foundation { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TextColors { - ctor @KotlinOnly @Deprecated public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error); ctor @KotlinOnly public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color disabledSelected, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error, androidx.compose.ui.graphics.Color warning); property public androidx.compose.ui.graphics.Color disabled; property public androidx.compose.ui.graphics.Color disabledSelected; @@ -1017,7 +1016,6 @@ package org.jetbrains.jewel.foundation.theme { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ThemeDefinition { - ctor @KotlinOnly @Deprecated public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData); ctor @KotlinOnly public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData, org.jetbrains.jewel.foundation.DisabledAppearanceValues disabledAppearanceValues); method public org.jetbrains.jewel.foundation.theme.ThemeColorPalette getColorPalette(); method public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); diff --git a/platform/jewel/foundation/metalava/foundation-api-stable-0.39.0.txt b/platform/jewel/foundation/metalava/foundation-api-stable-0.39.0.txt index 9fe0215d68a2..0e52ed2ad63c 100644 --- a/platform/jewel/foundation/metalava/foundation-api-stable-0.39.0.txt +++ b/platform/jewel/foundation/metalava/foundation-api-stable-0.39.0.txt @@ -139,7 +139,6 @@ package org.jetbrains.jewel.foundation { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TextColors { - ctor @KotlinOnly @Deprecated public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error); ctor @KotlinOnly public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color disabledSelected, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error, androidx.compose.ui.graphics.Color warning); property public androidx.compose.ui.graphics.Color disabled; property public androidx.compose.ui.graphics.Color disabledSelected; @@ -985,7 +984,6 @@ package org.jetbrains.jewel.foundation.theme { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ThemeDefinition { - ctor @KotlinOnly @Deprecated public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData); ctor @KotlinOnly public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData, org.jetbrains.jewel.foundation.DisabledAppearanceValues disabledAppearanceValues); method public org.jetbrains.jewel.foundation.theme.ThemeColorPalette getColorPalette(); method public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); diff --git a/platform/jewel/foundation/metalava/foundation-api-stable-0.40.0.txt b/platform/jewel/foundation/metalava/foundation-api-stable-0.40.0.txt index 9fe0215d68a2..0e52ed2ad63c 100644 --- a/platform/jewel/foundation/metalava/foundation-api-stable-0.40.0.txt +++ b/platform/jewel/foundation/metalava/foundation-api-stable-0.40.0.txt @@ -139,7 +139,6 @@ package org.jetbrains.jewel.foundation { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TextColors { - ctor @KotlinOnly @Deprecated public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error); ctor @KotlinOnly public TextColors(androidx.compose.ui.graphics.Color normal, androidx.compose.ui.graphics.Color selected, androidx.compose.ui.graphics.Color disabled, androidx.compose.ui.graphics.Color disabledSelected, androidx.compose.ui.graphics.Color info, androidx.compose.ui.graphics.Color error, androidx.compose.ui.graphics.Color warning); property public androidx.compose.ui.graphics.Color disabled; property public androidx.compose.ui.graphics.Color disabledSelected; @@ -985,7 +984,6 @@ package org.jetbrains.jewel.foundation.theme { } @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ThemeDefinition { - ctor @KotlinOnly @Deprecated public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData); ctor @KotlinOnly public ThemeDefinition(String name, boolean isDark, org.jetbrains.jewel.foundation.GlobalColors globalColors, org.jetbrains.jewel.foundation.GlobalMetrics globalMetrics, androidx.compose.ui.text.TextStyle defaultTextStyle, androidx.compose.ui.text.TextStyle editorTextStyle, androidx.compose.ui.text.TextStyle consoleTextStyle, androidx.compose.ui.graphics.Color contentColor, org.jetbrains.jewel.foundation.theme.ThemeColorPalette colorPalette, org.jetbrains.jewel.foundation.theme.ThemeIconData iconData, org.jetbrains.jewel.foundation.DisabledAppearanceValues disabledAppearanceValues); method public org.jetbrains.jewel.foundation.theme.ThemeColorPalette getColorPalette(); method public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt index 26ddc01082e7..d904dc6b2997 100644 --- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt +++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt @@ -94,18 +94,6 @@ public class TextColors( public val error: Color, public val warning: Color, ) { - @Deprecated( - "Use the primary constructors with disabledSelected and warning, instead.", - ReplaceWith("TextColors(normal, selected, disabled, disabled, info, error, normal)"), - ) - public constructor( - normal: Color, - selected: Color, - disabled: Color, - info: Color, - error: Color, - ) : this(normal, selected, disabled, disabled, info, error, normal) - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt index d6369dc5a7a6..7a7ae4f65330 100644 --- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt +++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt @@ -23,32 +23,6 @@ public class ThemeDefinition( public val iconData: ThemeIconData, public val disabledAppearanceValues: DisabledAppearanceValues, ) { - @Deprecated("Use the primary constructor and provide DisabledAppearanceValues.") - public constructor( - name: String, - isDark: Boolean, - globalColors: GlobalColors, - globalMetrics: GlobalMetrics, - defaultTextStyle: TextStyle, - editorTextStyle: TextStyle, - consoleTextStyle: TextStyle, - contentColor: Color, - colorPalette: ThemeColorPalette, - iconData: ThemeIconData, - ) : this( - name, - isDark, - globalColors, - globalMetrics, - defaultTextStyle, - editorTextStyle, - consoleTextStyle, - contentColor, - colorPalette, - iconData, - DisabledAppearanceValues(0, 0, 0), - ) - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false diff --git a/platform/jewel/ide-laf-bridge/api-dump-experimental.txt b/platform/jewel/ide-laf-bridge/api-dump-experimental.txt index 7b9e36c3ee04..75b90b01510c 100644 --- a/platform/jewel/ide-laf-bridge/api-dump-experimental.txt +++ b/platform/jewel/ide-laf-bridge/api-dump-experimental.txt @@ -4,15 +4,10 @@ f:org.jetbrains.jewel.bridge.BridgeUtilsKt - *sf:toNonNegativeDpSize(com.intellij.util.ui.JBDimension):J - *sf:toNonNegativeDpSize(java.awt.Dimension):J f:org.jetbrains.jewel.bridge.JewelComposePanelWrapperKt -- *bsf:JewelComposeNoThemePanel(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent - *sf:JewelComposeNoThemePanel(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent -- *bs:JewelComposeNoThemePanel$default(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent - *bs:JewelComposeNoThemePanel$default(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent -- *bsf:composeWithoutTheme(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent - *sf:composeWithoutTheme(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent -- *bs:composeWithoutTheme$default(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent - *bs:composeWithoutTheme$default(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent -- *sf:getLocalComponent():androidx.compose.runtime.ProvidableCompositionLocal f:org.jetbrains.jewel.bridge.component.HostPopupResizeKt - *sf:resizeHostOnContentSizeChange(androidx.compose.ui.Modifier,kotlin.jvm.functions.Function0,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I):androidx.compose.ui.Modifier f:org.jetbrains.jewel.bridge.theme.IntUiBridgeTextKt diff --git a/platform/jewel/ide-laf-bridge/api-dump.txt b/platform/jewel/ide-laf-bridge/api-dump.txt index 868904b7de13..a4bc922b0cb0 100644 --- a/platform/jewel/ide-laf-bridge/api-dump.txt +++ b/platform/jewel/ide-laf-bridge/api-dump.txt @@ -1,8 +1,5 @@ f:org.jetbrains.jewel.bridge.BridgeIconDataKt - sf:readFromLaF(org.jetbrains.jewel.foundation.theme.ThemeIconData$Companion):org.jetbrains.jewel.foundation.theme.ThemeIconData -f:org.jetbrains.jewel.bridge.BridgeResourceResolverKt -- sf:bridgePainterProvider(java.lang.String):org.jetbrains.jewel.ui.painter.ResourcePainterProvider -- sf:bridgePainterProvider(org.jetbrains.jewel.ui.icon.IconKey):org.jetbrains.jewel.ui.painter.ResourcePainterProvider f:org.jetbrains.jewel.bridge.BridgeTypography - org.jetbrains.jewel.ui.Typography - sf:$stable:I @@ -73,25 +70,15 @@ f:org.jetbrains.jewel.bridge.JewelBridgeException$KeysNotFoundException - sf:$stable:I - (java.util.List,java.lang.String):V f:org.jetbrains.jewel.bridge.JewelComposePanelWrapperKt -- bsf:JewelComposePanel(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent - sf:JewelComposePanel(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent -- bs:JewelComposePanel$default(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent - bs:JewelComposePanel$default(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent -- bsf:compose(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent - sf:compose(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2):javax.swing.JComponent -- bs:compose$default(kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent - bs:compose$default(Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,I,java.lang.Object):javax.swing.JComponent f:org.jetbrains.jewel.bridge.ToolWindowExtensionsKt -- bsf:addComposeTab(com.intellij.openapi.wm.ToolWindow,java.lang.String,Z,Z,kotlin.jvm.functions.Function3):V - sf:addComposeTab(com.intellij.openapi.wm.ToolWindow,java.lang.String,Z,Z,Z,kotlin.jvm.functions.Function3):V -- bs:addComposeTab$default(com.intellij.openapi.wm.ToolWindow,java.lang.String,Z,Z,kotlin.jvm.functions.Function3,I,java.lang.Object):V - bs:addComposeTab$default(com.intellij.openapi.wm.ToolWindow,java.lang.String,Z,Z,Z,kotlin.jvm.functions.Function3,I,java.lang.Object):V org.jetbrains.jewel.bridge.ToolWindowScope - a:getToolWindow():com.intellij.openapi.wm.ToolWindow -f:org.jetbrains.jewel.bridge.TypographyKt -- sf:medium(org.jetbrains.jewel.ui.component.Typography,androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- sf:regular(org.jetbrains.jewel.ui.component.Typography,androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- sf:small(org.jetbrains.jewel.ui.component.Typography,androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle f:org.jetbrains.jewel.bridge.code.highlighting.CodeHighlighterFactory - sf:$stable:I - sf:Companion:org.jetbrains.jewel.bridge.code.highlighting.CodeHighlighterFactory$Companion diff --git a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.39.0.txt b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.39.0.txt index 7631bf288eb6..e002c0be88f9 100644 --- a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.39.0.txt +++ b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.39.0.txt @@ -5,11 +5,6 @@ package org.jetbrains.jewel.bridge { method public static org.jetbrains.jewel.foundation.theme.ThemeIconData readFromLaF(org.jetbrains.jewel.foundation.theme.ThemeIconData.Companion); } - public final class BridgeResourceResolverKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(String path); - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(org.jetbrains.jewel.ui.icon.IconKey iconKey); - } - public final class BridgeTypography implements org.jetbrains.jewel.ui.Typography { method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getEditorTextStyle(); @@ -93,20 +88,13 @@ package org.jetbrains.jewel.bridge { public final class JewelComposePanelWrapperKt { method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent JewelComposeNoThemePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent JewelComposeNoThemePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent JewelComposePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent JewelComposePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent compose(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent compose(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent composeWithoutTheme(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent composeWithoutTheme(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.runtime.ProvidableCompositionLocal getLocalComponent(); - property @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.runtime.ProvidableCompositionLocal LocalComponent; } public final class ToolWindowExtensionsKt { method public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, optional boolean focusOnClickInside, kotlin.jvm.functions.Function1 content); - method @Deprecated public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, kotlin.jvm.functions.Function1 content); } public interface ToolWindowScope { @@ -114,12 +102,6 @@ package org.jetbrains.jewel.bridge { property public abstract com.intellij.openapi.wm.ToolWindow toolWindow; } - public final class TypographyKt { - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle medium(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle regular(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle small(org.jetbrains.jewel.ui.component.Typography); - } - } package org.jetbrains.jewel.bridge.code.highlighting { diff --git a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.40.0.txt b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.40.0.txt index 7631bf288eb6..e002c0be88f9 100644 --- a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.40.0.txt +++ b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-0.40.0.txt @@ -5,11 +5,6 @@ package org.jetbrains.jewel.bridge { method public static org.jetbrains.jewel.foundation.theme.ThemeIconData readFromLaF(org.jetbrains.jewel.foundation.theme.ThemeIconData.Companion); } - public final class BridgeResourceResolverKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(String path); - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(org.jetbrains.jewel.ui.icon.IconKey iconKey); - } - public final class BridgeTypography implements org.jetbrains.jewel.ui.Typography { method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getEditorTextStyle(); @@ -93,20 +88,13 @@ package org.jetbrains.jewel.bridge { public final class JewelComposePanelWrapperKt { method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent JewelComposeNoThemePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent JewelComposeNoThemePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent JewelComposePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent JewelComposePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent compose(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent compose(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent composeWithoutTheme(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static javax.swing.JComponent composeWithoutTheme(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.runtime.ProvidableCompositionLocal getLocalComponent(); - property @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.runtime.ProvidableCompositionLocal LocalComponent; } public final class ToolWindowExtensionsKt { method public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, optional boolean focusOnClickInside, kotlin.jvm.functions.Function1 content); - method @Deprecated public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, kotlin.jvm.functions.Function1 content); } public interface ToolWindowScope { @@ -114,12 +102,6 @@ package org.jetbrains.jewel.bridge { property public abstract com.intellij.openapi.wm.ToolWindow toolWindow; } - public final class TypographyKt { - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle medium(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle regular(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle small(org.jetbrains.jewel.ui.component.Typography); - } - } package org.jetbrains.jewel.bridge.code.highlighting { diff --git a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.39.0.txt b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.39.0.txt index d07a7de4e3b0..345b2eca3b59 100644 --- a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.39.0.txt +++ b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.39.0.txt @@ -5,11 +5,6 @@ package org.jetbrains.jewel.bridge { method public static org.jetbrains.jewel.foundation.theme.ThemeIconData readFromLaF(org.jetbrains.jewel.foundation.theme.ThemeIconData.Companion); } - public final class BridgeResourceResolverKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(String path); - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(org.jetbrains.jewel.ui.icon.IconKey iconKey); - } - public final class BridgeTypography implements org.jetbrains.jewel.ui.Typography { method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getEditorTextStyle(); @@ -89,14 +84,11 @@ package org.jetbrains.jewel.bridge { public final class JewelComposePanelWrapperKt { method public static javax.swing.JComponent JewelComposePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent JewelComposePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent compose(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent compose(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); } public final class ToolWindowExtensionsKt { method public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, optional boolean focusOnClickInside, kotlin.jvm.functions.Function1 content); - method @Deprecated public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, kotlin.jvm.functions.Function1 content); } public interface ToolWindowScope { @@ -104,12 +96,6 @@ package org.jetbrains.jewel.bridge { property public abstract com.intellij.openapi.wm.ToolWindow toolWindow; } - public final class TypographyKt { - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle medium(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle regular(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle small(org.jetbrains.jewel.ui.component.Typography); - } - } package org.jetbrains.jewel.bridge.code.highlighting { diff --git a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.40.0.txt b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.40.0.txt index d07a7de4e3b0..345b2eca3b59 100644 --- a/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.40.0.txt +++ b/platform/jewel/ide-laf-bridge/metalava/ide-laf-bridge-api-stable-0.40.0.txt @@ -5,11 +5,6 @@ package org.jetbrains.jewel.bridge { method public static org.jetbrains.jewel.foundation.theme.ThemeIconData readFromLaF(org.jetbrains.jewel.foundation.theme.ThemeIconData.Companion); } - public final class BridgeResourceResolverKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(String path); - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider bridgePainterProvider(org.jetbrains.jewel.ui.icon.IconKey iconKey); - } - public final class BridgeTypography implements org.jetbrains.jewel.ui.Typography { method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getConsoleTextStyle(); method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle getEditorTextStyle(); @@ -89,14 +84,11 @@ package org.jetbrains.jewel.bridge { public final class JewelComposePanelWrapperKt { method public static javax.swing.JComponent JewelComposePanel(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent JewelComposePanel(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); method public static javax.swing.JComponent compose(optional boolean focusOnClickInside, optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); - method @Deprecated public static javax.swing.JComponent compose(optional kotlin.jvm.functions.Function1 config, kotlin.jvm.functions.Function0 content); } public final class ToolWindowExtensionsKt { method public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, optional boolean focusOnClickInside, kotlin.jvm.functions.Function1 content); - method @Deprecated public static void addComposeTab(com.intellij.openapi.wm.ToolWindow, optional @com.intellij.openapi.util.NlsContexts.TabTitle String? tabDisplayName, optional boolean isLockable, optional boolean isCloseable, kotlin.jvm.functions.Function1 content); } public interface ToolWindowScope { @@ -104,12 +96,6 @@ package org.jetbrains.jewel.bridge { property public abstract com.intellij.openapi.wm.ToolWindow toolWindow; } - public final class TypographyKt { - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle medium(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle regular(org.jetbrains.jewel.ui.component.Typography); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.text.TextStyle small(org.jetbrains.jewel.ui.component.Typography); - } - } package org.jetbrains.jewel.bridge.code.highlighting { diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt deleted file mode 100644 index 5a3132090035..000000000000 --- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.jetbrains.jewel.bridge - -import com.intellij.util.ui.DirProvider -import org.jetbrains.jewel.ui.icon.IconKey -import org.jetbrains.jewel.ui.painter.ResourcePainterProvider - -/** [ResourcePainterProvider] to resolve resources in Intellij Module and Bridge module. */ -@Deprecated("Use IconKeys and the Icon composable instead") -public fun bridgePainterProvider(path: String): ResourcePainterProvider = - ResourcePainterProvider(path, DirProvider::class.java.classLoader, SwingBridgeReader::class.java.classLoader) - -/** [ResourcePainterProvider] to resolve resources in Intellij Module and Bridge module. */ -@Deprecated("Use the Icon composable instead") -public fun bridgePainterProvider(iconKey: IconKey): ResourcePainterProvider { - val isNewUi = isNewUiTheme() - return ResourcePainterProvider( - iconKey.path(isNewUi), - DirProvider::class.java.classLoader, - SwingBridgeReader::class.java.classLoader, - ) -} diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelComposePanelWrapper.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelComposePanelWrapper.kt index f83dd9e1f1f9..e176921ddf78 100644 --- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelComposePanelWrapper.kt +++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelComposePanelWrapper.kt @@ -2,7 +2,6 @@ package org.jetbrains.jewel.bridge import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.ui.awt.ComposePanel import com.intellij.diagnostic.PluginException import com.intellij.ide.plugins.PluginUtil @@ -43,18 +42,6 @@ public fun compose( content: @Composable () -> Unit, ): JComponent = JewelComposePanel(focusOnClickInside, config, content) -/** - * Creates a Swing component that can host Compose content. - * - * The [content] is wrapped in a [SwingBridgeTheme], which will be derived from the current Swing LaF. - * - * @param config A lambda to configure the underlying [ComposePanel]. - * @param content The Composable content to display. - */ -@Deprecated("Use the version with 'focusOnClickInside' parameter", level = DeprecationLevel.HIDDEN) -public fun compose(config: ComposePanel.() -> Unit = {}, content: @Composable () -> Unit): JComponent = - JewelComposePanel(focusOnClickInside = false, config, content) - /** * Creates a Swing component that can host Compose content. * @@ -87,21 +74,6 @@ public fun JewelComposePanel( } } -/** - * Creates a Swing component that can host Compose content. - * - * The [content] is wrapped in a [SwingBridgeTheme], which will be derived from the current Swing LaF. - * - * This is the same as [compose]. - * - * @param config A lambda to configure the underlying [ComposePanel]. - * @param content The Composable content to display. - */ -@Suppress("ktlint:standard:function-naming", "FunctionName") // Swing to Compose bridge API -@Deprecated("Use the version with 'focusOnClickInside' parameter", level = DeprecationLevel.HIDDEN) -public fun JewelComposePanel(config: ComposePanel.() -> Unit = {}, content: @Composable () -> Unit): JComponent = - JewelComposePanel(focusOnClickInside = false, config, content) - /** * Creates a Swing component that can host Compose content. * @@ -122,23 +94,6 @@ public fun composeWithoutTheme( content: @Composable () -> Unit, ): JComponent = JewelComposeNoThemePanel(focusOnClickInside, config, content) -/** - * Creates a Swing component that can host Compose content. - * - * The [content] is **not** wrapped in a theme, meaning that you **MUST** wrap the content in a theme by yourself. - * - * This is not normally what you want; use this only if you want to provide a completely custom theme. - * - * @param config A lambda to configure the underlying [ComposePanel]. - * @param content The Composable content to display. - */ -@ApiStatus.Experimental -@ExperimentalJewelApi -@Suppress("ktlint:standard:function-naming") // Swing to Compose bridge API -@Deprecated("Use the version with 'focusOnClickInside' parameter", level = DeprecationLevel.HIDDEN) -public fun composeWithoutTheme(config: ComposePanel.() -> Unit = {}, content: @Composable () -> Unit): JComponent = - JewelComposeNoThemePanel(focusOnClickInside = false, config, content) - /** * Creates a Swing component that can host Compose content. * @@ -174,25 +129,6 @@ public fun JewelComposeNoThemePanel( } } -/** - * Creates a Swing component that can host Compose content. - * - * The [content] is **not** wrapped in a theme, meaning that you **MUST** wrap the content in a theme by yourself. - * - * This is not normally what you want; use this only if you want to provide a completely custom theme. - * - * This is the same as [composeWithoutTheme]. - * - * @param config A lambda to configure the underlying [ComposePanel]. - * @param content The Composable content to display. - */ -@ApiStatus.Experimental -@ExperimentalJewelApi -@Suppress("ktlint:standard:function-naming", "FunctionName") // Swing to Compose bridge API -@Deprecated("Use the version with 'focusOnClickInside' parameter", level = DeprecationLevel.HIDDEN) -public fun JewelComposeNoThemePanel(config: ComposePanel.() -> Unit = {}, content: @Composable () -> Unit): JComponent = - JewelComposeNoThemePanel(focusOnClickInside = false, config, content) - private fun createJewelComposePanel( focusOnClickInside: Boolean, config: ComposePanel.(JewelComposePanelWrapper) -> Unit, @@ -261,13 +197,3 @@ public class JewelComposePanelWrapper(private val focusOnClickInside: Boolean) : targetProvider?.uiDataSnapshot(sink) } } - -/** Provides the root component used to host the current Compose hierarchy. */ -@Suppress("CompositionLocalAllowlist") -@ApiStatus.Experimental -@ExperimentalJewelApi -@Deprecated( - "Use the LocalComponent from the foundation API", - replaceWith = ReplaceWith("LocalComponent", "org.jetbrains.jewel.foundation.LocalComponent"), -) -public val LocalComponent: ProvidableCompositionLocal = LocalComponentFoundation diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt index 8d8903dd3e24..e1afcaaeb252 100644 --- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt +++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt @@ -43,24 +43,6 @@ public fun ToolWindow.addComposeTab( contentManager.addContent(tabContent) } -/** - * Adds a new tab to the tool window with Compose content. - * - * @param tabDisplayName The title of the tab. - * @param isLockable Whether the tab can be locked. - * @param isCloseable Whether the tab can be closed. - * @param content The Composable content of the tab. - */ -@Deprecated("Use the version with 'focusOnClickInside' parameter", level = DeprecationLevel.HIDDEN) -public fun ToolWindow.addComposeTab( - @TabTitle tabDisplayName: String? = null, - isLockable: Boolean = true, - isCloseable: Boolean = false, - content: @Composable ToolWindowScope.() -> Unit, -) { - addComposeTab(tabDisplayName, isLockable, isCloseable, focusOnClickInside = true, content) -} - /** A scope for the content of a tool window tab. */ public interface ToolWindowScope { /** The tool window in which the tab is displayed. */ diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/TypographyCompat.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/TypographyCompat.kt deleted file mode 100644 index 8aa16468b7aa..000000000000 --- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/TypographyCompat.kt +++ /dev/null @@ -1,66 +0,0 @@ -@file:Suppress("DEPRECATION") // This is a compat layer -@file:JvmName("TypographyKt") - -package org.jetbrains.jewel.bridge - -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.TextStyle -import org.jetbrains.jewel.foundation.theme.JewelTheme -import org.jetbrains.jewel.ui.component.Typography -import org.jetbrains.jewel.ui.typography - -/** - * The text style to use for regular text. Identical to - * [org.jetbrains.jewel.foundation.theme.JewelTheme.defaultTextStyle]. - * - * Only available when running in the IntelliJ Platform. - */ -@Deprecated( - "Moved to org.jetbrains.jewel.ui", - ReplaceWith( - "JewelTheme.typography.regular", - "org.jetbrains.jewel.ui.typography", - "org.jetbrains.jewel.foundation.theme.JewelTheme", - ), -) -@Composable -public fun Typography.regular(): TextStyle = JewelTheme.typography.regular - -/** - * The text style to use for medium text. Smaller than [regular]. - * - * Only available when running in the IntelliJ Platform. - * - * **Note:** when using the Classic UI on Windows, this returns the same value as [regular] (the default TextStyle from - * the theme). This is the same behavior implemented by [com.intellij.util.ui.JBFont]. - */ -@Deprecated( - "Moved to org.jetbrains.jewel.ui", - ReplaceWith( - "JewelTheme.typography.medium", - "org.jetbrains.jewel.ui.typography", - "org.jetbrains.jewel.foundation.theme.JewelTheme", - ), -) -@Composable -public fun Typography.medium(): TextStyle = JewelTheme.typography.medium - -/** - * The text style to use for small text. Smaller than [medium]. Should be avoided when running in the New UI, in favor - * of [medium], unless it's absolutely necessary. - * - * Only available when running in the IntelliJ Platform. - * - * **Note:** when using the Classic UI on Windows, this returns the same value as [regular] (the default TextStyle from - * the theme). This is the same behavior implemented by [com.intellij.util.ui.JBFont]. - */ -@Deprecated( - "Moved to org.jetbrains.jewel.ui", - ReplaceWith( - "JewelTheme.typography.small", - "org.jetbrains.jewel.ui.typography", - "org.jetbrains.jewel.foundation.theme.JewelTheme", - ), -) -@Composable -public fun Typography.small(): TextStyle = JewelTheme.typography.small diff --git a/platform/jewel/int-ui/int-ui-standalone/api-dump.txt b/platform/jewel/int-ui/int-ui-standalone/api-dump.txt index b951d13843dd..20fe3f9654b5 100644 --- a/platform/jewel/int-ui/int-ui-standalone/api-dump.txt +++ b/platform/jewel/int-ui/int-ui-standalone/api-dump.txt @@ -34,8 +34,6 @@ f:org.jetbrains.jewel.intui.standalone.InterFontKt - sf:getInter(androidx.compose.ui.text.font.FontFamily$Companion):androidx.compose.ui.text.font.FontFamily f:org.jetbrains.jewel.intui.standalone.JetBrainsMonoFontKt - sf:getJetBrainsMono(androidx.compose.ui.text.font.FontFamily$Companion):androidx.compose.ui.text.font.FontFamily -f:org.jetbrains.jewel.intui.standalone.PainterProviderKt -- sf:standalonePainterProvider(java.lang.String):org.jetbrains.jewel.ui.painter.ResourcePainterProvider f:org.jetbrains.jewel.intui.standalone.StandalonePainterHintsProvider - org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider - sf:$stable:I @@ -548,8 +546,6 @@ f:org.jetbrains.jewel.intui.standalone.styling.IntUiScrollbarStylingKt - sf:dark(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle$Companion):org.jetbrains.jewel.ui.component.styling.ScrollbarStyle - sf:default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$AlwaysVisible$Companion):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$AlwaysVisible - sf:default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling$Companion):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling -- sf:default-TZvXluI(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling$Companion,F,F,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,J,J,J,J):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling -- bs:default-TZvXluI$default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling$Companion,F,F,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,J,J,J,J,I,java.lang.Object):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling - sf:light(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle$Companion):org.jetbrains.jewel.ui.component.styling.ScrollbarStyle - sf:macOs-TZvXluI(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling$Companion,F,F,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,J,J,J,J):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling - bs:macOs-TZvXluI$default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling$Companion,F,F,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,J,J,J,J,I,java.lang.Object):org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility$WhenScrolling diff --git a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.39.0.txt b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.39.0.txt index e9093f6f117f..be161193ac7f 100644 --- a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.39.0.txt +++ b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.39.0.txt @@ -70,10 +70,6 @@ package org.jetbrains.jewel.intui.standalone { field public static final org.jetbrains.jewel.intui.standalone.JewelIntUIBundle INSTANCE; } - public final class PainterProviderKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider standalonePainterProvider(String path); - } - public final class StandalonePainterHintsProvider extends org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider { ctor public StandalonePainterHintsProvider(org.jetbrains.jewel.foundation.theme.ThemeDefinition theme); method protected org.jetbrains.jewel.ui.painter.PainterHint getCheckBoxByColorPaletteHint(); @@ -570,7 +566,6 @@ package org.jetbrains.jewel.intui.standalone.styling { method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle dark(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion); - method @Deprecated public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion, optional float trackThickness, optional float trackThicknessExpanded, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional androidx.compose.foundation.layout.PaddingValues trackPaddingWithBorder, optional long trackColorAnimationDuration, optional long expandAnimationDuration, optional long thumbColorAnimationDuration, optional long lingerDuration); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle light(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics.Companion, optional androidx.compose.foundation.shape.CornerSize thumbCornerSize, optional float minThumbLength); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion, optional float trackThickness, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional long thumbColorAnimationDuration, optional long scrollbarBackgroundColorLight, optional long scrollbarBackgroundColorDark); diff --git a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.40.0.txt b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.40.0.txt index e9093f6f117f..be161193ac7f 100644 --- a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.40.0.txt +++ b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-0.40.0.txt @@ -70,10 +70,6 @@ package org.jetbrains.jewel.intui.standalone { field public static final org.jetbrains.jewel.intui.standalone.JewelIntUIBundle INSTANCE; } - public final class PainterProviderKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider standalonePainterProvider(String path); - } - public final class StandalonePainterHintsProvider extends org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider { ctor public StandalonePainterHintsProvider(org.jetbrains.jewel.foundation.theme.ThemeDefinition theme); method protected org.jetbrains.jewel.ui.painter.PainterHint getCheckBoxByColorPaletteHint(); @@ -570,7 +566,6 @@ package org.jetbrains.jewel.intui.standalone.styling { method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle dark(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion); - method @Deprecated public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion, optional float trackThickness, optional float trackThicknessExpanded, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional androidx.compose.foundation.layout.PaddingValues trackPaddingWithBorder, optional long trackColorAnimationDuration, optional long expandAnimationDuration, optional long thumbColorAnimationDuration, optional long lingerDuration); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle light(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics.Companion, optional androidx.compose.foundation.shape.CornerSize thumbCornerSize, optional float minThumbLength); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion, optional float trackThickness, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional long thumbColorAnimationDuration, optional long scrollbarBackgroundColorLight, optional long scrollbarBackgroundColorDark); diff --git a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.39.0.txt b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.39.0.txt index c2af06bbeeed..4b79dead3fb6 100644 --- a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.39.0.txt +++ b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.39.0.txt @@ -66,10 +66,6 @@ package org.jetbrains.jewel.intui.standalone { property public static androidx.compose.ui.text.font.FontFamily androidx.compose.ui.text.font.FontFamily.Companion.JetBrainsMono; } - public final class PainterProviderKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider standalonePainterProvider(String path); - } - public final class StandalonePainterHintsProvider extends org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider { ctor public StandalonePainterHintsProvider(org.jetbrains.jewel.foundation.theme.ThemeDefinition theme); method protected org.jetbrains.jewel.ui.painter.PainterHint getCheckBoxByColorPaletteHint(); @@ -548,7 +544,6 @@ package org.jetbrains.jewel.intui.standalone.styling { method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle dark(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion); - method @Deprecated public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion, optional float trackThickness, optional float trackThicknessExpanded, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional androidx.compose.foundation.layout.PaddingValues trackPaddingWithBorder, optional long trackColorAnimationDuration, optional long expandAnimationDuration, optional long thumbColorAnimationDuration, optional long lingerDuration); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle light(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics.Companion, optional androidx.compose.foundation.shape.CornerSize thumbCornerSize, optional float minThumbLength); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion, optional float trackThickness, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional long thumbColorAnimationDuration, optional long scrollbarBackgroundColorLight, optional long scrollbarBackgroundColorDark); diff --git a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.40.0.txt b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.40.0.txt index c2af06bbeeed..4b79dead3fb6 100644 --- a/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.40.0.txt +++ b/platform/jewel/int-ui/int-ui-standalone/metalava/int-ui-standalone-api-stable-0.40.0.txt @@ -66,10 +66,6 @@ package org.jetbrains.jewel.intui.standalone { property public static androidx.compose.ui.text.font.FontFamily androidx.compose.ui.text.font.FontFamily.Companion.JetBrainsMono; } - public final class PainterProviderKt { - method @Deprecated public static org.jetbrains.jewel.ui.painter.ResourcePainterProvider standalonePainterProvider(String path); - } - public final class StandalonePainterHintsProvider extends org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider { ctor public StandalonePainterHintsProvider(org.jetbrains.jewel.foundation.theme.ThemeDefinition theme); method protected org.jetbrains.jewel.ui.painter.PainterHint getCheckBoxByColorPaletteHint(); @@ -548,7 +544,6 @@ package org.jetbrains.jewel.intui.standalone.styling { method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle dark(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion); - method @Deprecated public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling default(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.WhenScrolling.Companion, optional float trackThickness, optional float trackThicknessExpanded, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional androidx.compose.foundation.layout.PaddingValues trackPaddingWithBorder, optional long trackColorAnimationDuration, optional long expandAnimationDuration, optional long thumbColorAnimationDuration, optional long lingerDuration); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarStyle light(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle.Companion); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarMetrics.Companion, optional androidx.compose.foundation.shape.CornerSize thumbCornerSize, optional float minThumbLength); method public static org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible macOs(org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility.AlwaysVisible.Companion, optional float trackThickness, optional androidx.compose.foundation.layout.PaddingValues trackPadding, optional long thumbColorAnimationDuration, optional long scrollbarBackgroundColorLight, optional long scrollbarBackgroundColorDark); diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt deleted file mode 100644 index fc28f1979d7c..000000000000 --- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.jetbrains.jewel.intui.standalone - -import org.jetbrains.jewel.foundation.theme.JewelTheme -import org.jetbrains.jewel.ui.painter.ResourcePainterProvider - -/** Create a [PainterProvider][org.jetbrains.jewel.ui.painter.PainterProvider] to load a resource from the classpath. */ -@Deprecated("Use IconKeys and the Icon composable instead") -public fun standalonePainterProvider(path: String): ResourcePainterProvider = - ResourcePainterProvider(path, JewelTheme::class.java.classLoader) diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt index 565e2100f48a..2c924d74b9ff 100644 --- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt +++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt @@ -410,41 +410,6 @@ public fun AlwaysVisible.Companion.windowsAndLinux( scrollbarBackgroundColorDark = Color.Unspecified, ) -/** - * Creates a [WhenScrolling] scrollbar visibility configuration with custom parameters. - * - * @param trackThickness The thickness of the scrollbar track when not expanded. - * @param trackThicknessExpanded The thickness of the scrollbar track when expanded. - * @param trackPadding The padding around the scrollbar track. - * @param trackPaddingWithBorder The padding around the scrollbar track when it has a border. - * @param trackColorAnimationDuration The duration of track color animations. - * @param expandAnimationDuration The duration of track expansion animations. - * @param thumbColorAnimationDuration The duration of thumb color animations. - * @param lingerDuration The duration the scrollbar remains visible after scrolling stops. - * @return A [WhenScrolling] configuration with the specified parameters. - */ -@Deprecated("Use the variant without parameters to get the defaults", ReplaceWith("WhenScrolling.Companion.default()")) -public fun WhenScrolling.Companion.default( - trackThickness: Dp = 11.dp, - trackThicknessExpanded: Dp = 14.dp, - trackPadding: PaddingValues = PaddingValues(2.dp), - trackPaddingWithBorder: PaddingValues = PaddingValues(1.dp), - trackColorAnimationDuration: Duration = 125.milliseconds, - expandAnimationDuration: Duration = trackColorAnimationDuration, - thumbColorAnimationDuration: Duration = trackColorAnimationDuration, - lingerDuration: Duration = 700.milliseconds, -): WhenScrolling = - WhenScrolling( - trackThickness = trackThickness, - trackThicknessExpanded = trackThicknessExpanded, - trackPadding = trackPadding, - trackPaddingWithBorder = trackPaddingWithBorder, - trackColorAnimationDuration = trackColorAnimationDuration, - expandAnimationDuration = expandAnimationDuration, - thumbColorAnimationDuration = thumbColorAnimationDuration, - lingerDuration = lingerDuration, - ) - /** * Creates a [WhenScrolling] scrollbar visibility configuration appropriate for the current operating system. * diff --git a/platform/jewel/markdown/core/api-dump-experimental.txt b/platform/jewel/markdown/core/api-dump-experimental.txt index 372563123880..8b358c72136b 100644 --- a/platform/jewel/markdown/core/api-dump-experimental.txt +++ b/platform/jewel/markdown/core/api-dump-experimental.txt @@ -214,11 +214,8 @@ - equals(java.lang.Object):Z - hashCode():I f:org.jetbrains.jewel.markdown.MarkdownKt -- *sf:LazyMarkdown(java.util.List,androidx.compose.ui.Modifier,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.lazy.LazyListState,Z,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V - *sf:LazyMarkdown(java.util.List,androidx.compose.ui.Modifier,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.lazy.LazyListState,Z,Z,kotlin.jvm.functions.Function1,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V -- *sf:Markdown(java.lang.String,androidx.compose.ui.Modifier,Z,Z,kotlinx.coroutines.CoroutineDispatcher,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V - *sf:Markdown(java.lang.String,androidx.compose.ui.Modifier,Z,Z,kotlinx.coroutines.CoroutineDispatcher,kotlin.jvm.functions.Function1,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V -- *sf:Markdown(java.util.List,java.lang.String,androidx.compose.ui.Modifier,Z,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V - *sf:Markdown(java.util.List,java.lang.String,androidx.compose.ui.Modifier,Z,Z,kotlin.jvm.functions.Function1,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,androidx.compose.runtime.Composer,I,I):V *:org.jetbrains.jewel.markdown.MarkdownMode *f:org.jetbrains.jewel.markdown.MarkdownMode$EditorPreview @@ -254,7 +251,6 @@ f:org.jetbrains.jewel.markdown.SemanticsKt *:org.jetbrains.jewel.markdown.extensions.MarkdownBlockRendererExtension - a:RenderCustomBlock(org.jetbrains.jewel.markdown.MarkdownBlock$CustomBlock,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer,Z,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I):V - a:canRender(org.jetbrains.jewel.markdown.MarkdownBlock$CustomBlock):Z -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CustomBlock,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer,Z,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.runtime.Composer,I):V *:org.jetbrains.jewel.markdown.extensions.MarkdownDelimitedInlineProcessorExtension - a:canProcess(org.commonmark.node.Delimited):Z - a:processDelimitedInline(org.commonmark.node.Delimited,org.jetbrains.jewel.markdown.processing.MarkdownProcessor):org.jetbrains.jewel.markdown.InlineMarkdown$CustomDelimitedNode @@ -373,21 +369,6 @@ f:org.jetbrains.jewel.markdown.processing.ProcessingUtilKt - getRendererExtensions():java.util.List - getRootStyling():org.jetbrains.jewel.markdown.rendering.MarkdownStyling - *:plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension):org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer -- render(java.util.List,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$BlockQuote,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$BlockQuote,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$FencedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$IndentedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Indented,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Heading,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$HN,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Heading,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$HtmlBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$HtmlBlock,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock$OrderedList,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Ordered,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock$UnorderedList,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Unordered,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListItem,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Paragraph,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Paragraph,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$ThematicBreak,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V *f:org.jetbrains.jewel.markdown.rendering.DefaultMarkdownBlockRenderer$Companion *:org.jetbrains.jewel.markdown.rendering.ImageSourceResolver - *sf:Companion:org.jetbrains.jewel.markdown.rendering.ImageSourceResolver$Companion @@ -433,7 +414,6 @@ f:org.jetbrains.jewel.markdown.rendering.InlineMarkdownRendererKt - sf:$stable:I - *sf:Companion:org.jetbrains.jewel.markdown.rendering.InlinesStyling$Companion - (androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle):V -- b:(androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,Z):V - equals(java.lang.Object):Z - f:getEmphasis():androidx.compose.ui.text.SpanStyle - f:getInlineCode():androidx.compose.ui.text.SpanStyle @@ -473,21 +453,6 @@ f:org.jetbrains.jewel.markdown.rendering.InlineMarkdownRendererKt - a:getRendererExtensions():java.util.List - a:getRootStyling():org.jetbrains.jewel.markdown.rendering.MarkdownStyling - *a:plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension):org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer -- render(java.util.List,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$BlockQuote,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$BlockQuote,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$FencedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock$IndentedCodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Indented,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$CodeBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Heading,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$HN,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Heading,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$HtmlBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$HtmlBlock,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock$OrderedList,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Ordered,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock$UnorderedList,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Unordered,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListBlock,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$ListItem,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock$Paragraph,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Paragraph,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- render(org.jetbrains.jewel.markdown.MarkdownBlock,Z,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V -- renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$ThematicBreak,Z,androidx.compose.ui.Modifier,androidx.compose.runtime.Composer,I):V *f:org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer$Companion *f:org.jetbrains.jewel.markdown.rendering.MarkdownStyling - sf:$stable:I diff --git a/platform/jewel/markdown/core/metalava/core-api-0.39.0.txt b/platform/jewel/markdown/core/metalava/core-api-0.39.0.txt index f0b9850945c9..5fa5f40bce73 100644 --- a/platform/jewel/markdown/core/metalava/core-api-0.39.0.txt +++ b/platform/jewel/markdown/core/metalava/core-api-0.39.0.txt @@ -203,11 +203,8 @@ package org.jetbrains.jewel.markdown { } public final class MarkdownKt { - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void LazyMarkdown(java.util.List markdownBlocks, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.lazy.LazyListState state, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void LazyMarkdown(java.util.List blocks, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.lazy.LazyListState state, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(@org.intellij.lang.annotations.Language("Markdown") String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean selectable, optional boolean enabled, optional kotlinx.coroutines.CoroutineDispatcher renderingDispatcher, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor processor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(@org.intellij.lang.annotations.Language("Markdown") String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean selectable, optional boolean enabled, optional kotlinx.coroutines.CoroutineDispatcher processingDispatcher, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor processor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(java.util.List markdownBlocks, String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(java.util.List markdownBlocks, String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); } @@ -274,7 +271,6 @@ package org.jetbrains.jewel.markdown.extensions { @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public interface MarkdownBlockRendererExtension { method @androidx.compose.runtime.Composable public void RenderCustomBlock(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer, org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer, boolean enabled, androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1 onUrlClick); method public boolean canRender(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer, org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer, boolean enabled, androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick); } @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public interface MarkdownDelimitedInlineProcessorExtension { @@ -447,21 +443,6 @@ package org.jetbrains.jewel.markdown.rendering { method public java.util.List getRendererExtensions(); method public org.jetbrains.jewel.markdown.rendering.MarkdownStyling getRootStyling(); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public operator org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension extension); - method @androidx.compose.runtime.Composable public void render(java.util.List blocks, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.BlockQuote block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.FencedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.IndentedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading.HN styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.HtmlBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.HtmlBlock styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.OrderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Ordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.UnorderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Unordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListItem block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Paragraph styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.ThematicBreak styling, boolean enabled, androidx.compose.ui.Modifier modifier); property public org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer; property public java.util.List rendererExtensions; property public org.jetbrains.jewel.markdown.rendering.MarkdownStyling rootStyling; @@ -577,21 +558,6 @@ package org.jetbrains.jewel.markdown.rendering { method public java.util.List getRendererExtensions(); method public org.jetbrains.jewel.markdown.rendering.MarkdownStyling getRootStyling(); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public operator org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension extension); - method @Deprecated @androidx.compose.runtime.Composable public default void render(java.util.List blocks, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.BlockQuote block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.FencedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.IndentedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading.HN styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.HtmlBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.HtmlBlock styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.OrderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Ordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.UnorderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Unordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListItem block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Paragraph styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.ThematicBreak styling, boolean enabled, androidx.compose.ui.Modifier modifier); property public abstract org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer; property public abstract java.util.List rendererExtensions; property public abstract org.jetbrains.jewel.markdown.rendering.MarkdownStyling rootStyling; diff --git a/platform/jewel/markdown/core/metalava/core-api-0.40.0.txt b/platform/jewel/markdown/core/metalava/core-api-0.40.0.txt index f0b9850945c9..5fa5f40bce73 100644 --- a/platform/jewel/markdown/core/metalava/core-api-0.40.0.txt +++ b/platform/jewel/markdown/core/metalava/core-api-0.40.0.txt @@ -203,11 +203,8 @@ package org.jetbrains.jewel.markdown { } public final class MarkdownKt { - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void LazyMarkdown(java.util.List markdownBlocks, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.lazy.LazyListState state, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void LazyMarkdown(java.util.List blocks, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.lazy.LazyListState state, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(@org.intellij.lang.annotations.Language("Markdown") String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean selectable, optional boolean enabled, optional kotlinx.coroutines.CoroutineDispatcher renderingDispatcher, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor processor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(@org.intellij.lang.annotations.Language("Markdown") String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean selectable, optional boolean enabled, optional kotlinx.coroutines.CoroutineDispatcher processingDispatcher, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor processor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(java.util.List markdownBlocks, String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional kotlin.jvm.functions.Function0 onTextClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void Markdown(java.util.List markdownBlocks, String markdown, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean selectable, optional kotlin.jvm.functions.Function1 onUrlClick, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer); } @@ -274,7 +271,6 @@ package org.jetbrains.jewel.markdown.extensions { @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public interface MarkdownBlockRendererExtension { method @androidx.compose.runtime.Composable public void RenderCustomBlock(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer, org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer, boolean enabled, androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1 onUrlClick); method public boolean canRender(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CustomBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer blockRenderer, org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer, boolean enabled, androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick); } @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public interface MarkdownDelimitedInlineProcessorExtension { @@ -447,21 +443,6 @@ package org.jetbrains.jewel.markdown.rendering { method public java.util.List getRendererExtensions(); method public org.jetbrains.jewel.markdown.rendering.MarkdownStyling getRootStyling(); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public operator org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension extension); - method @androidx.compose.runtime.Composable public void render(java.util.List blocks, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.BlockQuote block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.FencedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.IndentedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading.HN styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.HtmlBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.HtmlBlock styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.OrderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Ordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.UnorderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Unordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListItem block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void render(org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Paragraph styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @androidx.compose.runtime.Composable public void renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.ThematicBreak styling, boolean enabled, androidx.compose.ui.Modifier modifier); property public org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer; property public java.util.List rendererExtensions; property public org.jetbrains.jewel.markdown.rendering.MarkdownStyling rootStyling; @@ -577,21 +558,6 @@ package org.jetbrains.jewel.markdown.rendering { method public java.util.List getRendererExtensions(); method public org.jetbrains.jewel.markdown.rendering.MarkdownStyling getRootStyling(); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public operator org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer plus(org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension extension); - method @Deprecated @androidx.compose.runtime.Composable public default void render(java.util.List blocks, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.BlockQuote block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.FencedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.IndentedCodeBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Heading block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Heading.HN styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.HtmlBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.HtmlBlock styling, boolean enabled, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.OrderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Ordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.UnorderedList block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.List.Unordered styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.ListItem block, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void render(org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph block, org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Paragraph styling, boolean enabled, kotlin.jvm.functions.Function1 onUrlClick, kotlin.jvm.functions.Function0 onTextClick, androidx.compose.ui.Modifier modifier); - method @Deprecated @androidx.compose.runtime.Composable public default void renderThematicBreak(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.ThematicBreak styling, boolean enabled, androidx.compose.ui.Modifier modifier); property public abstract org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer inlineRenderer; property public abstract java.util.List rendererExtensions; property public abstract org.jetbrains.jewel.markdown.rendering.MarkdownStyling rootStyling; diff --git a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/Markdown.kt b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/Markdown.kt index ba615fd98c81..b9cfaeba9124 100644 --- a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/Markdown.kt +++ b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/Markdown.kt @@ -35,58 +35,6 @@ import org.jetbrains.jewel.markdown.rendering.DefaultMarkdownBlockRenderer import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer import org.jetbrains.jewel.markdown.rendering.MarkdownStyling -/** - * A Composable that renders a Markdown string. - * - * For large amounts of Markdown, such as documents, you can consider using [LazyMarkdown] instead to get better - * performance. - * - * @param markdown The Markdown string to render. - * @param modifier The modifier to apply to this layout node. - * @param selectable Whether the text can be selected. - * @param enabled Whether the rendered content is enabled. - * @param renderingDispatcher The dispatcher to use for processing the Markdown. - * @param onUrlClick The callback to be invoked when a URL is clicked. - * @param onTextClick This parameter is ignored and is only here for binary/source compat reasons. - * @param markdownStyling The styling to use for the rendered Markdown. - * @param processor The processor to use for parsing the Markdown. - * @param blockRenderer The renderer to use for rendering the Markdown blocks. - */ -@Deprecated( - "Use the Markdown overload without onTextClick instead.", - ReplaceWith( - "Markdown(markdown, modifier, selectable, enabled, renderingDispatcher, onUrlClick, " + - "markdownStyling, processor, blockRenderer)" - ), -) -@ApiStatus.Experimental -@ExperimentalJewelApi -@Composable -public fun Markdown( - @Language("Markdown") markdown: String, - modifier: Modifier = Modifier, - selectable: Boolean = false, - enabled: Boolean = true, - renderingDispatcher: CoroutineDispatcher = Dispatchers.Default, - onUrlClick: (String) -> Unit = {}, - @Suppress("UnusedParameter", "RedundantSuppression") onTextClick: () -> Unit = {}, - markdownStyling: MarkdownStyling = JewelTheme.markdownStyling, - processor: MarkdownProcessor = JewelTheme.markdownProcessor, - blockRenderer: MarkdownBlockRenderer = DefaultMarkdownBlockRenderer(markdownStyling), -) { - Markdown( - markdown, - modifier, - selectable, - enabled, - renderingDispatcher, - onUrlClick, - markdownStyling, - processor, - blockRenderer, - ) -} - /** * A Composable that renders a Markdown string. * @@ -135,48 +83,6 @@ public fun Markdown( ) } -/** - * A Composable that renders a list of [MarkdownBlock]s in a column. - * - * For large amounts of Markdown, such as documents, you can consider using [LazyMarkdown] instead to get better - * performance. - * - * Note: the [onTextClick] parameter is ignored in this overload. - * - * @param markdownBlocks The list of Markdown blocks to render. - * @param markdown The original Markdown string. - * @param modifier The modifier to apply to this layout node. - * @param enabled Whether the rendered content is enabled. - * @param selectable Whether the text can be selected. - * @param onUrlClick The callback to be invoked when a URL is clicked. - * @param onTextClick This parameter is ignored and is only here for binary/source compat reasons. - * @param markdownStyling The styling to use for the rendered Markdown. - * @param blockRenderer The renderer to use for rendering the Markdown blocks. - * @see Markdown - */ -@Deprecated( - "Use the Markdown overload without onTextClick instead.", - ReplaceWith( - "Markdown(markdownBlocks, markdown, modifier, enabled, selectable, onUrlClick, markdownStyling, blockRenderer)" - ), -) -@ApiStatus.Experimental -@ExperimentalJewelApi -@Composable -public fun Markdown( - markdownBlocks: List, - markdown: String, - modifier: Modifier = Modifier, - enabled: Boolean = true, - selectable: Boolean = false, - onUrlClick: (String) -> Unit = {}, - @Suppress("UnusedParameter", "RedundantSuppression") onTextClick: () -> Unit = {}, - markdownStyling: MarkdownStyling = JewelTheme.markdownStyling, - blockRenderer: MarkdownBlockRenderer = DefaultMarkdownBlockRenderer(markdownStyling), -) { - Markdown(markdownBlocks, markdown, modifier, enabled, selectable, onUrlClick, markdownStyling, blockRenderer) -} - /** * A Composable that renders a list of [MarkdownBlock]s in a column. * @@ -220,58 +126,6 @@ public fun Markdown( } } -/** - * A Composable that renders a list of [MarkdownBlock]s in a lazy-loading column. - * - * For small amounts of Markdown, such as UI text, you should consider using [Markdown] instead to get better - * performance. - * - * @param markdownBlocks The list of Markdown blocks to render. - * @param modifier The modifier to apply to this layout node. - * @param contentPadding The padding to apply to the content. - * @param state The state of the lazy list. - * @param enabled Whether the rendered content is enabled. - * @param selectable Whether the text can be selected. - * @param onUrlClick The callback to be invoked when a URL is clicked. - * @param onTextClick This parameter is ignored and is only here for binary/source compat reasons. - * @param markdownStyling The styling to use for the rendered Markdown. - * @param blockRenderer The renderer to use for rendering the Markdown blocks. - */ -@Deprecated( - "Use the LazyMarkdown overload without onTextClick instead.", - ReplaceWith( - "LazyMarkdown(markdownBlocks, modifier, contentPadding, state, enabled, selectable, onUrlClick, " + - "markdownStyling, blockRenderer)" - ), -) -@ApiStatus.Experimental -@ExperimentalJewelApi -@Composable -public fun LazyMarkdown( - markdownBlocks: List, - modifier: Modifier = Modifier, - contentPadding: PaddingValues = PaddingValues(0.dp), - state: LazyListState = rememberLazyListState(), - enabled: Boolean = true, - selectable: Boolean = false, - onUrlClick: (String) -> Unit = {}, - @Suppress("UnusedParameter", "RedundantSuppression", "RedundantSuppression") onTextClick: () -> Unit = {}, - markdownStyling: MarkdownStyling = JewelTheme.markdownStyling, - blockRenderer: MarkdownBlockRenderer = JewelTheme.markdownBlockRenderer, -) { - LazyMarkdown( - markdownBlocks, - modifier, - contentPadding, - state, - enabled, - selectable, - onUrlClick, - markdownStyling, - blockRenderer, - ) -} - /** * A Composable that renders a list of [MarkdownBlock]s in a lazy-loading column. * diff --git a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/MarkdownBlockRendererExtension.kt b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/MarkdownBlockRendererExtension.kt index fdc7398475eb..72b9a94e5a61 100644 --- a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/MarkdownBlockRendererExtension.kt +++ b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/MarkdownBlockRendererExtension.kt @@ -36,36 +36,6 @@ public interface MarkdownBlockRendererExtension { */ public fun canRender(block: CustomBlock): Boolean - /** - * Render a [MarkdownBlock.CustomBlock] as a native Composable. Note that if [canRender] returns `false` for - * [block], the implementation might throw. - * - * @param block The [MarkdownBlock.CustomBlock] to render. - * @param blockRenderer The [MarkdownBlockRenderer] to use to render other blocks if necessary. - * @param inlineRenderer The [InlineMarkdownRenderer] to use to render inline elements if necessary. - * @param enabled Whether The rendered content should be enabled. - * @param modifier The modifier to be applied to the composable. - * @param onUrlClick The callback to invoke when a URL is clicked. - * @param onTextClick The callback to invoke when a text part is clicked. **Ignored.** - */ - @Deprecated( - "Use RenderCustomBlock instead; the onTextClick parameter is no longer supported.", - ReplaceWith("RenderCustomBlock(block, blockRenderer, inlineRenderer, enabled, modifier, onUrlClick)"), - ) - @Suppress("ComposableNaming") - @Composable - public fun render( - block: CustomBlock, - blockRenderer: MarkdownBlockRenderer, - inlineRenderer: InlineMarkdownRenderer, - enabled: Boolean, - modifier: Modifier, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - ) { - RenderCustomBlock(block, blockRenderer, inlineRenderer, enabled, modifier, onUrlClick) - } - /** * Renders a [MarkdownBlock.CustomBlock] as a native Composable. * diff --git a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRenderer.kt b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRenderer.kt index 7c1d79179166..96e618f682b3 100644 --- a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRenderer.kt +++ b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRenderer.kt @@ -114,7 +114,7 @@ internal const val COMPOSE_INLINE_CONTENT_ANNOTATION_TAG = "androidx.compose.fou * * @see MarkdownBlockRenderer */ -@Suppress("OVERRIDE_DEPRECATION", "LargeClass") +@Suppress("LargeClass") @ApiStatus.Experimental @ExperimentalJewelApi public open class DefaultMarkdownBlockRenderer( @@ -122,17 +122,6 @@ public open class DefaultMarkdownBlockRenderer( override val rendererExtensions: List = emptyList(), override val inlineRenderer: InlineMarkdownRenderer = InlineMarkdownRenderer.create(rendererExtensions), ) : MarkdownBlockRenderer { - @Composable - override fun render( - blocks: List, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlocks(blocks, enabled, onUrlClick, modifier) - } - @Composable override fun RenderBlocks( blocks: List, @@ -147,17 +136,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: MarkdownBlock, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlock(block, enabled, onUrlClick, modifier) - } - @Composable override fun RenderBlock(block: MarkdownBlock, enabled: Boolean, onUrlClick: (String) -> Unit, modifier: Modifier) { when (block) { @@ -190,18 +168,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: Paragraph, - styling: MarkdownStyling.Paragraph, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderParagraph(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderParagraph( block: Paragraph, @@ -281,18 +247,6 @@ public open class DefaultMarkdownBlockRenderer( ) } - @Composable - override fun render( - block: Heading, - styling: MarkdownStyling.Heading, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderHeading(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderHeading( block: Heading, @@ -312,18 +266,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: Heading, - styling: MarkdownStyling.Heading.HN, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderHeading(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderHeading( block: Heading, @@ -354,18 +296,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: BlockQuote, - styling: MarkdownStyling.BlockQuote, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlockQuote(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderBlockQuote( block: BlockQuote, @@ -399,18 +329,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: ListBlock, - styling: MarkdownStyling.List, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderList(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderList( block: ListBlock, @@ -425,18 +343,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: OrderedList, - styling: MarkdownStyling.List.Ordered, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderOrderedList(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderOrderedList( block: OrderedList, @@ -485,18 +391,6 @@ public open class DefaultMarkdownBlockRenderer( else -> thirdLevel } - @Composable - override fun render( - block: UnorderedList, - styling: MarkdownStyling.List.Unordered, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderUnorderedList(block, styling, enabled, onUrlClick, modifier) - } - @Composable override fun RenderUnorderedList( block: UnorderedList, @@ -543,17 +437,6 @@ public open class DefaultMarkdownBlockRenderer( else -> thirdLevel } - @Composable - override fun render( - block: ListItem, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderListItem(block, enabled, onUrlClick, modifier) - } - @Composable override fun RenderListItem(block: ListItem, enabled: Boolean, onUrlClick: (String) -> Unit, modifier: Modifier) { Column(modifier, verticalArrangement = Arrangement.spacedBy(2.dp)) { @@ -563,11 +446,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render(block: CodeBlock, styling: MarkdownStyling.Code, enabled: Boolean, modifier: Modifier) { - RenderCodeBlock(block, styling, enabled, modifier) - } - @Composable override fun RenderCodeBlock( block: CodeBlock, @@ -576,21 +454,11 @@ public open class DefaultMarkdownBlockRenderer( modifier: Modifier, ) { when (block) { - is FencedCodeBlock -> render(block, styling.fenced, enabled, modifier) - is IndentedCodeBlock -> render(block, styling.indented, enabled, modifier) + is FencedCodeBlock -> RenderFencedCodeBlock(block, styling.fenced, enabled, modifier) + is IndentedCodeBlock -> RenderIndentedCodeBlock(block, styling.indented, enabled, modifier) } } - @Composable - override fun render( - block: IndentedCodeBlock, - styling: MarkdownStyling.Code.Indented, - enabled: Boolean, - modifier: Modifier, - ) { - RenderIndentedCodeBlock(block, styling, enabled, modifier) - } - @Composable override fun RenderIndentedCodeBlock( block: IndentedCodeBlock, @@ -619,16 +487,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun render( - block: FencedCodeBlock, - styling: MarkdownStyling.Code.Fenced, - enabled: Boolean, - modifier: Modifier, - ) { - RenderFencedCodeBlock(block, styling, enabled, modifier) - } - @Composable override fun RenderFencedCodeBlock( block: FencedCodeBlock, @@ -748,11 +606,6 @@ public open class DefaultMarkdownBlockRenderer( } } - @Composable - override fun renderThematicBreak(styling: MarkdownStyling.ThematicBreak, enabled: Boolean, modifier: Modifier) { - RenderThematicBreak(styling, enabled, modifier) - } - @Composable override fun RenderThematicBreak(styling: MarkdownStyling.ThematicBreak, enabled: Boolean, modifier: Modifier) { Divider( @@ -763,11 +616,6 @@ public open class DefaultMarkdownBlockRenderer( ) } - @Composable - override fun render(block: HtmlBlock, styling: MarkdownStyling.HtmlBlock, enabled: Boolean, modifier: Modifier) { - RenderHtmlBlock(block, styling, enabled, modifier) - } - @Composable override fun RenderHtmlBlock( block: HtmlBlock, diff --git a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownBlockRenderer.kt b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownBlockRenderer.kt index 3cfb36a9b599..0e2798166f3b 100644 --- a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownBlockRenderer.kt +++ b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownBlockRenderer.kt @@ -39,27 +39,6 @@ public interface MarkdownBlockRenderer { public val rendererExtensions: List public val inlineRenderer: InlineMarkdownRenderer - /** - * Renders a list of [MarkdownBlock]s into a Compose UI. - * - * @param blocks The list of blocks to render. - * @param enabled True if the blocks should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the root composable (usually, a `Column` or `LazyColumn`). - */ - @Deprecated("Use RenderBlocks instead.", ReplaceWith("RenderBlocks(blocks, enabled, onUrlClick, modifier)")) - @Composable - public fun render( - blocks: List, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlocks(blocks, enabled, onUrlClick, modifier) - } - /** * Renders a list of [MarkdownBlock]s into a Compose UI. * @@ -76,27 +55,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [MarkdownBlock] into a Compose UI. - * - * @param block The block to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderBlock instead.", ReplaceWith("RenderBlock(block, enabled, onUrlClick, modifier)")) - @Composable - public fun render( - block: MarkdownBlock, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlock(block, enabled, onUrlClick, modifier) - } - /** * Renders a [MarkdownBlock] into a Compose UI. * @@ -108,32 +66,6 @@ public interface MarkdownBlockRenderer { @Composable public fun RenderBlock(block: MarkdownBlock, enabled: Boolean, onUrlClick: (String) -> Unit, modifier: Modifier) - /** - * Renders a [Paragraph] into a Compose UI. - * - * @param block The paragraph to render. - * @param styling The [`Paragraph`][MarkdownStyling.Paragraph] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderParagraph instead.", - ReplaceWith("RenderParagraph(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: Paragraph, - styling: MarkdownStyling.Paragraph, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderParagraph(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [Paragraph] into a Compose UI. * @@ -192,32 +124,6 @@ public interface MarkdownBlockRenderer { maxLines: Int, ) - /** - * Renders a [MarkdownBlock.Heading] into a Compose UI. - * - * @param block The heading to render. - * @param styling The [`Heading`][MarkdownStyling.Heading] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderHeading instead.", - ReplaceWith("RenderHeading(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: MarkdownBlock.Heading, - styling: MarkdownStyling.Heading, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderHeading(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [MarkdownBlock.Heading] into a Compose UI. * @@ -236,32 +142,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [MarkdownBlock.Heading] into a Compose UI, using a specific [`HN`][MarkdownStyling.Heading.HN] styling. - * - * @param block The heading to render. - * @param styling The [`Heading.HN`][MarkdownStyling.Heading.HN] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderHeading instead.", - ReplaceWith("RenderHeading(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: MarkdownBlock.Heading, - styling: MarkdownStyling.Heading.HN, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderHeading(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [MarkdownBlock.Heading] into a Compose UI, using a specific [`HN`][MarkdownStyling.Heading.HN] styling. * @@ -280,32 +160,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [BlockQuote] into a Compose UI. - * - * @param block The blockquote to render. - * @param styling The [`BlockQuote`][MarkdownStyling.BlockQuote] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderBlockQuote instead.", - ReplaceWith("RenderBlockQuote(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: BlockQuote, - styling: MarkdownStyling.BlockQuote, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderBlockQuote(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [BlockQuote] into a Compose UI. * @@ -324,29 +178,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [ListBlock] into a Compose UI. - * - * @param block The list to render. - * @param styling The [`List`][MarkdownStyling.List] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderList instead.", ReplaceWith("RenderList(block, styling, enabled, onUrlClick, modifier)")) - @Composable - public fun render( - block: ListBlock, - styling: MarkdownStyling.List, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderList(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [ListBlock] into a Compose UI. * @@ -365,32 +196,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [OrderedList] into a Compose UI. - * - * @param block The ordered list to render. - * @param styling The [`List.Ordered`][MarkdownStyling.List.Ordered] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderOrderedList instead.", - ReplaceWith("RenderOrderedList(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: OrderedList, - styling: MarkdownStyling.List.Ordered, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderOrderedList(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [OrderedList] into a Compose UI. * @@ -409,32 +214,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [UnorderedList] into a Compose UI. - * - * @param block The unordered list to render. - * @param styling The [`List.Unordered`][MarkdownStyling.List.Unordered] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderUnorderedList instead.", - ReplaceWith("RenderUnorderedList(block, styling, enabled, onUrlClick, modifier)"), - ) - @Composable - public fun render( - block: UnorderedList, - styling: MarkdownStyling.List.Unordered, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderUnorderedList(block, styling, enabled, onUrlClick, modifier) - } - /** * Renders a [UnorderedList] into a Compose UI. * @@ -453,27 +232,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [ListItem] into a Compose UI. - * - * @param block The list item to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param onUrlClick The callback invoked when the user clicks on a URL. - * @param onTextClick The callback invoked when the user clicks on a text. **Ignored.** - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderListItem instead.", ReplaceWith("RenderListItem(block, enabled, onUrlClick, modifier)")) - @Composable - public fun render( - block: ListItem, - enabled: Boolean, - onUrlClick: (String) -> Unit, - onTextClick: () -> Unit, - modifier: Modifier, - ) { - RenderListItem(block, enabled, onUrlClick, modifier) - } - /** * Renders a [ListItem] into a Compose UI. * @@ -485,20 +243,6 @@ public interface MarkdownBlockRenderer { @Composable public fun RenderListItem(block: ListItem, enabled: Boolean, onUrlClick: (String) -> Unit, modifier: Modifier) - /** - * Renders a [CodeBlock] into a Compose UI. - * - * @param block The code block to render. - * @param styling The [`Code`][MarkdownStyling.Code] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderCodeBlock instead.", ReplaceWith("RenderCodeBlock(block, styling, enabled, modifier)")) - @Composable - public fun render(block: CodeBlock, styling: MarkdownStyling.Code, enabled: Boolean, modifier: Modifier) { - RenderCodeBlock(block, styling, enabled, modifier) - } - /** * Renders a [CodeBlock] into a Compose UI. * @@ -510,28 +254,6 @@ public interface MarkdownBlockRenderer { @Composable public fun RenderCodeBlock(block: CodeBlock, styling: MarkdownStyling.Code, enabled: Boolean, modifier: Modifier) - /** - * Renders a [IndentedCodeBlock] into a Compose UI. - * - * @param block The indented code block to render. - * @param styling The [`Code.Indented`][MarkdownStyling.Code.Indented] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated( - "Use RenderIndentedCodeBlock instead.", - ReplaceWith("RenderIndentedCodeBlock(block, styling, enabled, modifier)"), - ) - @Composable - public fun render( - block: IndentedCodeBlock, - styling: MarkdownStyling.Code.Indented, - enabled: Boolean, - modifier: Modifier, - ) { - RenderIndentedCodeBlock(block, styling, enabled, modifier) - } - /** * Renders a [IndentedCodeBlock] into a Compose UI. * @@ -548,30 +270,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a [FencedCodeBlock] into a Compose UI. If the fenced block defines a language, it can be - * syntax-highlighted by the [org.jetbrains.jewel.foundation.code.highlighting.LocalCodeHighlighter]. - * - * @param block The fenced code block to render. - * @param styling The [`Code.Fenced`][MarkdownStyling.Code.Fenced] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param modifier The modifier to be applied to the composable. - * @see org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter - */ - @Deprecated( - "Use RenderFencedCodeBlock instead.", - ReplaceWith("RenderFencedCodeBlock(block, styling, enabled, modifier)"), - ) - @Composable - public fun render( - block: FencedCodeBlock, - styling: MarkdownStyling.Code.Fenced, - enabled: Boolean, - modifier: Modifier, - ) { - RenderFencedCodeBlock(block, styling, enabled, modifier) - } - /** * Renders a [FencedCodeBlock] into a Compose UI. If the fenced block defines a language, it can be * syntax-highlighted by the [org.jetbrains.jewel.foundation.code.highlighting.LocalCodeHighlighter]. @@ -590,19 +288,6 @@ public interface MarkdownBlockRenderer { modifier: Modifier, ) - /** - * Renders a thematic break (horizontal divider) into a Compose UI. - * - * @param styling The [`ThematicBreak`][MarkdownStyling.ThematicBreak] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderThematicBreak instead.", ReplaceWith("RenderThematicBreak(styling, enabled, modifier)")) - @Composable - public fun renderThematicBreak(styling: MarkdownStyling.ThematicBreak, enabled: Boolean, modifier: Modifier) { - RenderThematicBreak(styling, enabled, modifier) - } - /** * Renders a thematic break (horizontal divider) into a Compose UI. * @@ -613,21 +298,6 @@ public interface MarkdownBlockRenderer { @Composable public fun RenderThematicBreak(styling: MarkdownStyling.ThematicBreak, enabled: Boolean, modifier: Modifier) - /** - * Renders a [HtmlBlock] into a Compose UI. Since Compose can't render HTML out of the box, this might result in a - * no-op (e.g., in [DefaultMarkdownBlockRenderer.render]). - * - * @param block The HTML block to render. - * @param styling The [`HtmlBlock`][MarkdownStyling.HtmlBlock] styling to use to render. - * @param enabled True if the block should be enabled, false otherwise. - * @param modifier The modifier to be applied to the composable. - */ - @Deprecated("Use RenderHtmlBlock instead.", ReplaceWith("RenderHtmlBlock(block, styling, enabled, modifier)")) - @Composable - public fun render(block: HtmlBlock, styling: MarkdownStyling.HtmlBlock, enabled: Boolean, modifier: Modifier) { - RenderHtmlBlock(block, styling, enabled, modifier) - } - /** * Renders a [HtmlBlock] into a Compose UI. Since Compose can't render HTML out of the box, this might result in a * no-op (e.g., in [DefaultMarkdownBlockRenderer.render]). diff --git a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownStyling.kt b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownStyling.kt index e969874ada2d..dded86a6434c 100644 --- a/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownStyling.kt +++ b/platform/jewel/markdown/core/src/main/kotlin/org/jetbrains/jewel/markdown/rendering/MarkdownStyling.kt @@ -1095,34 +1095,6 @@ public class InlinesStyling( public val strongEmphasis: SpanStyle, public val inlineHtml: SpanStyle, ) { - @Deprecated("Use variant without renderInlineHtml instead.", level = DeprecationLevel.HIDDEN) - public constructor( - textStyle: TextStyle, - inlineCode: SpanStyle, - link: SpanStyle, - linkDisabled: SpanStyle, - linkFocused: SpanStyle, - linkHovered: SpanStyle, - linkPressed: SpanStyle, - linkVisited: SpanStyle, - emphasis: SpanStyle, - strongEmphasis: SpanStyle, - inlineHtml: SpanStyle, - @Suppress("UnusedPrivateProperty") renderInlineHtml: Boolean, - ) : this( - textStyle, - inlineCode, - link, - linkDisabled, - linkFocused, - linkHovered, - linkPressed, - linkVisited, - emphasis, - strongEmphasis, - inlineHtml, - ) - public val textLinkStyles: TextLinkStyles = TextLinkStyles(style = link, focusedStyle = linkFocused, hoveredStyle = linkHovered, pressedStyle = linkPressed) diff --git a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRendererTest.kt b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRendererTest.kt index 32eb1d59c834..f435caf229ee 100644 --- a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRendererTest.kt +++ b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/DefaultMarkdownBlockRendererTest.kt @@ -34,13 +34,7 @@ public class DefaultMarkdownBlockRendererTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render( - blocks, - enabled = true, - onUrlClick = onUrlClick, - onTextClick = {}, - modifier = Modifier, - ) + renderer.RenderBlocks(blocks, enabled = true, onUrlClick = onUrlClick, modifier = Modifier) } } @@ -72,11 +66,10 @@ public class DefaultMarkdownBlockRendererTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render( + renderer.RenderBlocks( blocks, enabled = enabled, onUrlClick = { url -> clickedUrl = url }, - onTextClick = {}, modifier = Modifier, ) } @@ -113,13 +106,7 @@ public class DefaultMarkdownBlockRendererTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render( - blocks, - enabled = enabled, - onUrlClick = onUrlClick, - onTextClick = {}, - modifier = Modifier, - ) + renderer.RenderBlocks(blocks, enabled = enabled, onUrlClick = onUrlClick, modifier = Modifier) } } diff --git a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/OrderedListRenderingTest.kt b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/OrderedListRenderingTest.kt index fa705590fce9..573432f1d301 100644 --- a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/OrderedListRenderingTest.kt +++ b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/rendering/OrderedListRenderingTest.kt @@ -27,7 +27,7 @@ public class OrderedListRenderingTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render(blocks, enabled = true, onUrlClick = {}, onTextClick = {}, modifier = Modifier) + renderer.RenderBlocks(blocks = blocks, enabled = true, onUrlClick = {}, modifier = Modifier) } } @@ -50,7 +50,7 @@ public class OrderedListRenderingTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render(blocks, enabled = true, onUrlClick = {}, onTextClick = {}, modifier = Modifier) + renderer.RenderBlocks(blocks = blocks, enabled = true, onUrlClick = {}, modifier = Modifier) } } @@ -75,7 +75,7 @@ public class OrderedListRenderingTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render(blocks, enabled = true, onUrlClick = {}, onTextClick = {}, modifier = Modifier) + renderer.RenderBlocks(blocks = blocks, enabled = true, onUrlClick = {}, modifier = Modifier) } } @@ -99,7 +99,7 @@ public class OrderedListRenderingTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(createMarkdownTestStyling(), emptyList()) - renderer.render(blocks, enabled = true, onUrlClick = {}, onTextClick = {}, modifier = Modifier) + renderer.RenderBlocks(blocks = blocks, enabled = true, onUrlClick = {}, modifier = Modifier) } } diff --git a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/scrolling/ScrollingSynchronizerTest.kt b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/scrolling/ScrollingSynchronizerTest.kt index 8420fd35b4c7..a4b7b05d0218 100644 --- a/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/scrolling/ScrollingSynchronizerTest.kt +++ b/platform/jewel/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/scrolling/ScrollingSynchronizerTest.kt @@ -788,7 +788,7 @@ public class ScrollingSynchronizerTest { ) { JewelTheme(createMarkdownTestThemeDefinition()) { val blocks = processor.yieldBlocks() - renderer.render(blocks, true, {}, {}, Modifier) + renderer.RenderBlocks(blocks, true, {}, Modifier) } } } diff --git a/platform/jewel/markdown/extensions/gfm-tables/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/tables/GitHubTableBlockRendererRememberKeysTest.kt b/platform/jewel/markdown/extensions/gfm-tables/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/tables/GitHubTableBlockRendererRememberKeysTest.kt index a05f964a70ad..6487825e1775 100644 --- a/platform/jewel/markdown/extensions/gfm-tables/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/tables/GitHubTableBlockRendererRememberKeysTest.kt +++ b/platform/jewel/markdown/extensions/gfm-tables/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/tables/GitHubTableBlockRendererRememberKeysTest.kt @@ -48,13 +48,7 @@ public class GitHubTableBlockRendererRememberKeysTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(markdownStyling, listOf(rendererExtension)) - renderer.render( - blocks, - enabled = true, - onUrlClick = onUrlClick, - onTextClick = {}, - modifier = Modifier, - ) + renderer.RenderBlocks(blocks, enabled = true, onUrlClick = onUrlClick, modifier = Modifier) } } @@ -96,11 +90,10 @@ public class GitHubTableBlockRendererRememberKeysTest { setContent { MarkdownTestTheme { val renderer = DefaultMarkdownBlockRenderer(markdownStyling, listOf(rendererExtension)) - renderer.render( + renderer.RenderBlocks( blocks, enabled = enabled, onUrlClick = { url -> clickedUrl = url }, - onTextClick = {}, modifier = Modifier, ) } diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/api-dump-experimental.txt b/platform/jewel/markdown/ide-laf-bridge-styling/api-dump-experimental.txt index 26f01a6e90bd..a0a98826a53f 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/api-dump-experimental.txt +++ b/platform/jewel/markdown/ide-laf-bridge-styling/api-dump-experimental.txt @@ -4,17 +4,14 @@ f:org.jetbrains.jewel.intui.markdown.bridge.BridgeMarkdownBlockRendererExtension f:org.jetbrains.jewel.intui.markdown.bridge.BridgeProvideMarkdownStylingKt - *sf:ProvideMarkdownStyling(com.intellij.openapi.project.Project,org.jetbrains.jewel.markdown.rendering.ImageSourceResolver,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.MarkdownMode,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - *sf:ProvideMarkdownStyling(com.intellij.openapi.project.Project,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.MarkdownMode,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- *sf:ProvideMarkdownStyling(java.lang.String,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.MarkdownMode,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - *sf:ProvideMarkdownStyling(org.jetbrains.jewel.markdown.rendering.ImageSourceResolver,org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.MarkdownMode,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - *sf:ProvideMarkdownStyling(org.jetbrains.jewel.markdown.rendering.MarkdownStyling,org.jetbrains.jewel.markdown.MarkdownMode,org.jetbrains.jewel.markdown.processing.MarkdownProcessor,org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer,org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V f:org.jetbrains.jewel.intui.markdown.bridge.styling.BridgeMarkdownStylingKt -- *bsf:create(org.jetbrains.jewel.markdown.rendering.InlinesStyling$Companion,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,Z):org.jetbrains.jewel.markdown.rendering.InlinesStyling - *sf:create(org.jetbrains.jewel.markdown.rendering.InlinesStyling$Companion,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle):org.jetbrains.jewel.markdown.rendering.InlinesStyling - *sf:create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Companion,androidx.compose.ui.text.TextStyle,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Indented,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code - *sf:create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$Companion,androidx.compose.ui.text.TextStyle,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H1,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H2,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H3,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H4,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H5,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H6):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading - *sf:create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Companion,androidx.compose.ui.text.TextStyle,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Ordered,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List$Unordered):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$List - *sf:create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Paragraph$Companion,org.jetbrains.jewel.markdown.rendering.InlinesStyling):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Paragraph -- *bs:create$default(org.jetbrains.jewel.markdown.rendering.InlinesStyling$Companion,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,Z,I,java.lang.Object):org.jetbrains.jewel.markdown.rendering.InlinesStyling - *bs:create$default(org.jetbrains.jewel.markdown.rendering.InlinesStyling$Companion,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.TextStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,androidx.compose.ui.text.SpanStyle,I,java.lang.Object):org.jetbrains.jewel.markdown.rendering.InlinesStyling - *bs:create$default(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Companion,androidx.compose.ui.text.TextStyle,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Indented,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code$Fenced,I,java.lang.Object):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Code - *bs:create$default(org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$Companion,androidx.compose.ui.text.TextStyle,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H1,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H2,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H3,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H4,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H5,org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading$H6,I,java.lang.Object):org.jetbrains.jewel.markdown.rendering.MarkdownStyling$Heading diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.39.0.txt b/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.39.0.txt index 23990810cfa1..467a984a08c4 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.39.0.txt +++ b/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.39.0.txt @@ -8,7 +8,6 @@ package org.jetbrains.jewel.intui.markdown.bridge { public final class BridgeProvideMarkdownStylingKt { method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(com.intellij.openapi.project.Project project, org.jetbrains.jewel.markdown.rendering.ImageSourceResolver imageSourceResolver, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(com.intellij.openapi.project.Project project, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(optional String themeName, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(org.jetbrains.jewel.markdown.rendering.ImageSourceResolver imageSourceResolver, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); } @@ -18,7 +17,6 @@ package org.jetbrains.jewel.intui.markdown.bridge { package org.jetbrains.jewel.intui.markdown.bridge.styling { public final class BridgeMarkdownStylingKt { - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.InlinesStyling create(org.jetbrains.jewel.markdown.rendering.InlinesStyling.Companion, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.ui.text.SpanStyle inlineCode, optional androidx.compose.ui.text.SpanStyle link, optional androidx.compose.ui.text.SpanStyle linkDisabled, optional androidx.compose.ui.text.SpanStyle linkHovered, optional androidx.compose.ui.text.SpanStyle linkFocused, optional androidx.compose.ui.text.SpanStyle linkPressed, optional androidx.compose.ui.text.SpanStyle linkVisited, optional androidx.compose.ui.text.SpanStyle emphasis, optional androidx.compose.ui.text.SpanStyle strongEmphasis, optional androidx.compose.ui.text.SpanStyle inlineHtml, optional boolean renderInlineHtml); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.InlinesStyling create(org.jetbrains.jewel.markdown.rendering.InlinesStyling.Companion, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.ui.text.TextStyle editorTextStyle, optional androidx.compose.ui.text.SpanStyle inlineCode, optional androidx.compose.ui.text.SpanStyle link, optional androidx.compose.ui.text.SpanStyle linkDisabled, optional androidx.compose.ui.text.SpanStyle linkHovered, optional androidx.compose.ui.text.SpanStyle linkFocused, optional androidx.compose.ui.text.SpanStyle linkPressed, optional androidx.compose.ui.text.SpanStyle linkVisited, optional androidx.compose.ui.text.SpanStyle emphasis, optional androidx.compose.ui.text.SpanStyle strongEmphasis, optional androidx.compose.ui.text.SpanStyle inlineHtml); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote.Companion, optional androidx.compose.foundation.layout.PaddingValues padding, optional float lineWidth, optional long lineColor, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional int strokeCap, optional long textColor); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Companion, optional androidx.compose.ui.text.TextStyle editorTextStyle, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented indented, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced fenced); diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.40.0.txt b/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.40.0.txt index 23990810cfa1..467a984a08c4 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.40.0.txt +++ b/platform/jewel/markdown/ide-laf-bridge-styling/metalava/ide-laf-bridge-styling-api-0.40.0.txt @@ -8,7 +8,6 @@ package org.jetbrains.jewel.intui.markdown.bridge { public final class BridgeProvideMarkdownStylingKt { method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(com.intellij.openapi.project.Project project, org.jetbrains.jewel.markdown.rendering.ImageSourceResolver imageSourceResolver, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(com.intellij.openapi.project.Project project, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, kotlin.jvm.functions.Function0 content); - method @Deprecated @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(optional String themeName, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(org.jetbrains.jewel.markdown.rendering.ImageSourceResolver imageSourceResolver, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static void ProvideMarkdownStyling(optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling markdownStyling, optional org.jetbrains.jewel.markdown.MarkdownMode markdownMode, optional org.jetbrains.jewel.markdown.processing.MarkdownProcessor markdownProcessor, optional org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer markdownBlockRenderer, optional org.jetbrains.jewel.foundation.code.highlighting.CodeHighlighter codeHighlighter, kotlin.jvm.functions.Function0 content); } @@ -18,7 +17,6 @@ package org.jetbrains.jewel.intui.markdown.bridge { package org.jetbrains.jewel.intui.markdown.bridge.styling { public final class BridgeMarkdownStylingKt { - method @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.InlinesStyling create(org.jetbrains.jewel.markdown.rendering.InlinesStyling.Companion, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.ui.text.SpanStyle inlineCode, optional androidx.compose.ui.text.SpanStyle link, optional androidx.compose.ui.text.SpanStyle linkDisabled, optional androidx.compose.ui.text.SpanStyle linkHovered, optional androidx.compose.ui.text.SpanStyle linkFocused, optional androidx.compose.ui.text.SpanStyle linkPressed, optional androidx.compose.ui.text.SpanStyle linkVisited, optional androidx.compose.ui.text.SpanStyle emphasis, optional androidx.compose.ui.text.SpanStyle strongEmphasis, optional androidx.compose.ui.text.SpanStyle inlineHtml, optional boolean renderInlineHtml); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.InlinesStyling create(org.jetbrains.jewel.markdown.rendering.InlinesStyling.Companion, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.ui.text.TextStyle editorTextStyle, optional androidx.compose.ui.text.SpanStyle inlineCode, optional androidx.compose.ui.text.SpanStyle link, optional androidx.compose.ui.text.SpanStyle linkDisabled, optional androidx.compose.ui.text.SpanStyle linkHovered, optional androidx.compose.ui.text.SpanStyle linkFocused, optional androidx.compose.ui.text.SpanStyle linkPressed, optional androidx.compose.ui.text.SpanStyle linkVisited, optional androidx.compose.ui.text.SpanStyle emphasis, optional androidx.compose.ui.text.SpanStyle strongEmphasis, optional androidx.compose.ui.text.SpanStyle inlineHtml); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.BlockQuote.Companion, optional androidx.compose.foundation.layout.PaddingValues padding, optional float lineWidth, optional long lineColor, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional int strokeCap, optional long textColor); method @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code create(org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Companion, optional androidx.compose.ui.text.TextStyle editorTextStyle, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Indented indented, optional org.jetbrains.jewel.markdown.rendering.MarkdownStyling.Code.Fenced fenced); diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeProvideMarkdownStyling.kt b/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeProvideMarkdownStyling.kt index c11dc0b8b1e9..a61c72bad38a 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeProvideMarkdownStyling.kt +++ b/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeProvideMarkdownStyling.kt @@ -26,30 +26,6 @@ import org.jetbrains.jewel.markdown.rendering.LocalMarkdownImageSourceResolver import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer import org.jetbrains.jewel.markdown.rendering.MarkdownStyling -@Deprecated("Please use the MarkdownStyling without a themeName") -@ExperimentalJewelApi -@ApiStatus.Experimental -@Composable -public fun ProvideMarkdownStyling( - themeName: String = JewelTheme.name, - markdownStyling: MarkdownStyling = remember(themeName) { MarkdownStyling.create() }, - markdownMode: MarkdownMode = MarkdownMode.Standalone, - markdownProcessor: MarkdownProcessor = remember { MarkdownProcessor(markdownMode = markdownMode) }, - markdownBlockRenderer: MarkdownBlockRenderer = - remember(markdownStyling) { MarkdownBlockRenderer.create(markdownStyling) }, - codeHighlighter: CodeHighlighter = remember { NoOpCodeHighlighter }, - content: @Composable () -> Unit, -) { - ProvideMarkdownStyling( - markdownStyling, - markdownMode, - markdownProcessor, - markdownBlockRenderer, - codeHighlighter, - content, - ) -} - /** * Provide Markdown styling, for scenarios where you have access to a [Project]. * diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt b/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt index 1c2b3c4773bd..b15bc818b6d0 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt +++ b/platform/jewel/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt @@ -492,54 +492,6 @@ public fun InlinesStyling.Companion.create( inlineHtml = inlineHtml, ) -@Deprecated("Use the variant without renderInlineHtml instead", level = DeprecationLevel.HIDDEN) -@ApiStatus.Experimental -@ExperimentalJewelApi -public fun InlinesStyling.Companion.create( - textStyle: TextStyle = defaultTextStyle, - inlineCode: SpanStyle = - defaultEditorTextStyle - .copy(fontSize = textStyle.fontSize * .85, background = inlineCodeBackgroundColor) - .toSpanStyle(), - link: SpanStyle = textStyle.copy(color = JBUI.CurrentTheme.Link.Foreground.ENABLED.toComposeColor()).toSpanStyle(), - linkDisabled: SpanStyle = link.copy(color = JBUI.CurrentTheme.Link.Foreground.DISABLED.toComposeColor()), - linkHovered: SpanStyle = - link.copy( - color = JBUI.CurrentTheme.Link.Foreground.HOVERED.toComposeColor(), - textDecoration = TextDecoration.Underline, - ), - linkFocused: SpanStyle = - link.copy( - color = JBUI.CurrentTheme.Link.Foreground.ENABLED.toComposeColor(), - background = JBUI.CurrentTheme.ActionButton.hoverBackground().toComposeColor(), - textDecoration = TextDecoration.Underline, - ), - linkPressed: SpanStyle = - link.copy( - color = JBUI.CurrentTheme.Link.Foreground.PRESSED.toComposeColor(), - background = JBUI.CurrentTheme.ActionButton.pressedBackground().toComposeColor(), - textDecoration = TextDecoration.Underline, - ), - linkVisited: SpanStyle = link.copy(color = JBUI.CurrentTheme.Link.Foreground.VISITED.toComposeColor()), - emphasis: SpanStyle = textStyle.copy(fontStyle = FontStyle.Italic).toSpanStyle(), - strongEmphasis: SpanStyle = textStyle.copy(fontWeight = FontWeight.Bold).toSpanStyle(), - inlineHtml: SpanStyle = textStyle.toSpanStyle(), - @Suppress("UnusedParameter") renderInlineHtml: Boolean = true, -): InlinesStyling = - InlinesStyling( - textStyle = textStyle, - inlineCode = inlineCode, - link = link, - linkDisabled = linkDisabled, - linkHovered = linkHovered, - linkFocused = linkFocused, - linkPressed = linkPressed, - linkVisited = linkVisited, - emphasis = emphasis, - strongEmphasis = strongEmphasis, - inlineHtml = inlineHtml, - ) - private val defaultTextStyle get() = retrieveDefaultTextStyle().copy(color = Color.Unspecified) diff --git a/platform/jewel/ui-tests/src/test/kotlin/org/jetbrains/jewel/ui/util/ColorExtensionsTest.kt b/platform/jewel/ui-tests/src/test/kotlin/org/jetbrains/jewel/ui/util/ColorExtensionsTest.kt index 011be0a5033d..15924f59d2ec 100644 --- a/platform/jewel/ui-tests/src/test/kotlin/org/jetbrains/jewel/ui/util/ColorExtensionsTest.kt +++ b/platform/jewel/ui-tests/src/test/kotlin/org/jetbrains/jewel/ui/util/ColorExtensionsTest.kt @@ -11,20 +11,6 @@ import org.junit.Test class ColorExtensionsTest { // region ================ AwtColor.toRgbaHexString() ================ - @Suppress("DEPRECATION") // Testing deprecated APIs - @Test - fun `old AwtColor_toRgbaHexString should format opaque color with hash sign and no alpha component`() { - val color = AwtColor.RED - assertEquals("#ff0000", color.toRgbaHexString()) - } - - @Suppress("DEPRECATION") // Testing deprecated APIs - @Test - fun `old AwtColor_toRgbaHexString should format transparent color with hash sign and alpha component`() { - val color = AwtColor(255, 0, 0, 128) - assertEquals("#ff000080", color.toRgbaHexString()) - } - @Test fun `AwtColor_toRgbaHexString should format opaque color without hash when includeHashSymbol is false`() { val color = AwtColor.BLUE @@ -76,20 +62,6 @@ class ColorExtensionsTest { // endregion // region ================ Color.toRgbaHexString() ================ - @Suppress("DEPRECATION") // Testing deprecated APIs - @Test - fun `old Color_toRgbaHexString should format opaque color with hash sign and no alpha component`() { - val color = Color.Red - assertEquals("#ff0000", color.toRgbaHexString()) - } - - @Suppress("DEPRECATION") // Testing deprecated APIs - @Test - fun `old Color_toRgbaHexString should format transparent color with hash sign and alpha component`() { - val color = Color(255, 0, 0, 128) - assertEquals("#ff000080", color.toRgbaHexString()) - } - @Test fun `Color_toRgbaHexString should format opaque color without hash when includeHashSymbol is false`() { val color = Color.Blue @@ -300,16 +272,6 @@ class ColorExtensionsTest { assertNull(Color.fromRgbaHexStringOrNull(" ")) } - @Suppress("DEPRECATION") // Testing deprecated APIs - @Test - fun `fromRGBAHexStringOrNull should work same as fromRgbaHexStringOrNull`() { - assertEquals(Color.fromRgbaHexStringOrNull("ff0"), Color.fromRGBAHexStringOrNull("ff0")) - assertEquals(Color.fromRgbaHexStringOrNull("ff0000"), Color.fromRGBAHexStringOrNull("ff0000")) - assertEquals(Color.fromRgbaHexStringOrNull("ffff0000"), Color.fromRGBAHexStringOrNull("ffff0000")) - assertEquals(Color.fromRgbaHexStringOrNull("banana"), Color.fromRGBAHexStringOrNull("banana")) - assertEquals(Color.fromRgbaHexStringOrNull(""), Color.fromRGBAHexStringOrNull("")) - } - // endregion // region ================ Color.fromArgbHexStringOrNull() ================ diff --git a/platform/jewel/ui/api-dump.txt b/platform/jewel/ui/api-dump.txt index b95658e0b998..541ab17a9c61 100644 --- a/platform/jewel/ui/api-dump.txt +++ b/platform/jewel/ui/api-dump.txt @@ -62,8 +62,6 @@ f:org.jetbrains.jewel.ui.DefaultComponentStyling - styles(androidx.compose.runtime.Composer,I):androidx.compose.runtime.ProvidedValue[] f:org.jetbrains.jewel.ui.DisabledAppearanceKt - sf:disabledAppearance(androidx.compose.ui.Modifier,I,I,I,androidx.compose.runtime.Composer,I,I):androidx.compose.ui.Modifier -f:org.jetbrains.jewel.ui.DisabledColorFilterKt -- sf:disabled(androidx.compose.ui.graphics.ColorFilter$Companion):androidx.compose.ui.graphics.ColorFilter org.jetbrains.jewel.ui.MenuItemShortcutHintProvider - a:getShortcutHint(org.jetbrains.jewel.ui.component.ContextMenuItemOptionAction):java.lang.String f:org.jetbrains.jewel.ui.MenuItemShortcutHintProviderKt @@ -114,14 +112,6 @@ f:org.jetbrains.jewel.ui.TypographyKt f:org.jetbrains.jewel.ui.component.ActionButtonKt - sf:ActionButton(kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,Z,Z,org.jetbrains.jewel.ui.component.styling.IconButtonStyle,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:ActionButton(kotlin.jvm.functions.Function0,kotlin.jvm.functions.Function2,androidx.compose.ui.Modifier,Z,Z,org.jetbrains.jewel.ui.component.styling.IconButtonStyle,androidx.compose.foundation.layout.PaddingValues,org.jetbrains.jewel.ui.component.styling.TooltipStyle,androidx.compose.foundation.TooltipPlacement,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I,I):V -e:org.jetbrains.jewel.ui.component.AutoHideBehavior -- java.lang.Enum -- sf:Long:org.jetbrains.jewel.ui.component.AutoHideBehavior -- sf:Never:org.jetbrains.jewel.ui.component.AutoHideBehavior -- sf:Normal:org.jetbrains.jewel.ui.component.AutoHideBehavior -- s:getEntries():kotlin.enums.EnumEntries -- s:valueOf(java.lang.String):org.jetbrains.jewel.ui.component.AutoHideBehavior -- s:values():org.jetbrains.jewel.ui.component.AutoHideBehavior[] f:org.jetbrains.jewel.ui.component.BadgeKt - sf:Badge(androidx.compose.ui.Modifier,kotlin.jvm.functions.Function0,Z,androidx.compose.foundation.interaction.MutableInteractionSource,org.jetbrains.jewel.ui.component.styling.BadgeStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V f:org.jetbrains.jewel.ui.component.BadgeState @@ -161,10 +151,6 @@ f:org.jetbrains.jewel.ui.component.BannerKt - sf:DefaultSuccessBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V - sf:DefaultWarningBanner(androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:DefaultWarningBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:ErrorDefaultBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:InformationDefaultBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:SuccessDefaultBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:WarningDefaultBanner(java.lang.String,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V f:org.jetbrains.jewel.ui.component.ButtonKt - sf:DefaultButton(kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,Z,androidx.compose.foundation.interaction.MutableInteractionSource,org.jetbrains.jewel.ui.component.styling.ButtonStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:DefaultSlimButton(kotlin.jvm.functions.Function0,androidx.compose.ui.Modifier,Z,androidx.compose.foundation.interaction.MutableInteractionSource,org.jetbrains.jewel.ui.component.styling.ButtonStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V @@ -424,7 +410,6 @@ f:org.jetbrains.jewel.ui.component.IconKt - sf:Icon-ww6aTOc(androidx.compose.ui.graphics.ImageBitmap,java.lang.String,androidx.compose.ui.Modifier,J,androidx.compose.runtime.Composer,I,I):V - sf:Icon-ww6aTOc(androidx.compose.ui.graphics.painter.Painter,java.lang.String,androidx.compose.ui.Modifier,J,androidx.compose.runtime.Composer,I,I):V - sf:Icon-ww6aTOc(androidx.compose.ui.graphics.vector.ImageVector,java.lang.String,androidx.compose.ui.Modifier,J,androidx.compose.runtime.Composer,I,I):V -- sf:painterResource(java.lang.String,androidx.compose.runtime.Composer,I):androidx.compose.ui.graphics.painter.Painter f:org.jetbrains.jewel.ui.component.ImageKt - sf:Image(org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,androidx.compose.ui.Modifier,java.lang.Class,androidx.compose.ui.Alignment,androidx.compose.ui.layout.ContentScale,F,androidx.compose.ui.graphics.ColorFilter,androidx.compose.runtime.Composer,I,I):V - sf:Image(org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.painter.PainterHint[],androidx.compose.ui.Modifier,java.lang.Class,androidx.compose.ui.Alignment,androidx.compose.ui.layout.ContentScale,F,androidx.compose.ui.graphics.ColorFilter,androidx.compose.runtime.Composer,I,I):V @@ -432,10 +417,6 @@ f:org.jetbrains.jewel.ui.component.InfoTextKt - sf:InfoText-F-Jr8PA(androidx.compose.ui.text.AnnotatedString,androidx.compose.ui.Modifier,J,J,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontFamily,J,androidx.compose.ui.text.style.TextDecoration,I,J,I,Z,I,java.util.Map,kotlin.jvm.functions.Function1,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I,I):V - sf:InfoText-bAzTDeA(java.lang.String,androidx.compose.ui.Modifier,J,J,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontFamily,J,androidx.compose.ui.text.style.TextDecoration,I,J,I,Z,I,kotlin.jvm.functions.Function1,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I,I):V f:org.jetbrains.jewel.ui.component.InlineBannerKt -- sf:ErrorInlineBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- sf:ErrorInlineBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:InformationInlineBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- sf:InformationInlineBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V - sf:InlineErrorBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:InlineErrorBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V - sf:InlineInformationBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V @@ -444,10 +425,6 @@ f:org.jetbrains.jewel.ui.component.InlineBannerKt - sf:InlineSuccessBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V - sf:InlineWarningBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:InlineWarningBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:SuccessInlineBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- sf:SuccessInlineBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V -- sf:WarningInlineBanner(androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- sf:WarningInlineBanner(java.lang.String,androidx.compose.ui.Modifier,java.lang.String,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function3,org.jetbrains.jewel.ui.component.styling.InlineBannerStyle,androidx.compose.ui.text.TextStyle,androidx.compose.runtime.Composer,I,I):V f:org.jetbrains.jewel.ui.component.InputFieldState - org.jetbrains.jewel.foundation.state.FocusableComponentState - sf:Companion:org.jetbrains.jewel.ui.component.InputFieldState$Companion @@ -542,40 +519,7 @@ org.jetbrains.jewel.ui.component.MenuController - a:submenuController(kotlin.jvm.functions.Function1):org.jetbrains.jewel.ui.component.MenuController f:org.jetbrains.jewel.ui.component.MenuControllerKt - sf:getLocalMenuController():androidx.compose.runtime.ProvidableCompositionLocal -f:org.jetbrains.jewel.ui.component.MenuItemState -- org.jetbrains.jewel.foundation.state.FocusableComponentState -- org.jetbrains.jewel.foundation.state.SelectableComponentState -- sf:Companion:org.jetbrains.jewel.ui.component.MenuItemState$Companion -- bsf:box-impl(J):org.jetbrains.jewel.ui.component.MenuItemState -- s:constructor-impl(J):J -- sf:copy-moUeATs(J,Z,Z,Z,Z,Z,Z):J -- bs:copy-moUeATs$default(J,Z,Z,Z,Z,Z,Z,I,java.lang.Object):J -- equals(java.lang.Object):Z -- s:equals-impl(J,java.lang.Object):Z -- sf:equals-impl0(J,J):Z -- f:getState-s-VKNKU():J -- hashCode():I -- s:hashCode-impl(J):I -- isActive():Z -- s:isActive-impl(J):Z -- isEnabled():Z -- s:isEnabled-impl(J):Z -- isFocused():Z -- s:isFocused-impl(J):Z -- isHovered():Z -- s:isHovered-impl(J):Z -- isPressed():Z -- s:isPressed-impl(J):Z -- isSelected():Z -- s:isSelected-impl(J):Z -- s:toString-impl(J):java.lang.String -- bf:unbox-impl():J -f:org.jetbrains.jewel.ui.component.MenuItemState$Companion -- f:of-moUeATs(Z,Z,Z,Z,Z,Z):J -- bs:of-moUeATs$default(org.jetbrains.jewel.ui.component.MenuItemState$Companion,Z,Z,Z,Z,Z,Z,I,java.lang.Object):J f:org.jetbrains.jewel.ui.component.MenuKt -- sf:MenuSeparator(androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.MenuItemMetrics,org.jetbrains.jewel.ui.component.styling.MenuItemColors,androidx.compose.runtime.Composer,I,I):V -- sf:MenuSubmenuItem(androidx.compose.ui.Modifier,Z,Z,org.jetbrains.jewel.ui.icon.IconKey,androidx.compose.foundation.interaction.MutableInteractionSource,org.jetbrains.jewel.ui.component.styling.MenuStyle,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - bsf:PopupMenu(kotlin.jvm.functions.Function1,androidx.compose.ui.Alignment$Horizontal,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.MenuStyle,androidx.compose.ui.window.PopupProperties,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I):V - sf:PopupMenu(kotlin.jvm.functions.Function1,androidx.compose.ui.Alignment$Horizontal,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.MenuStyle,androidx.compose.ui.window.PopupProperties,kotlin.jvm.functions.Function2,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I):V - bsf:PopupMenu(kotlin.jvm.functions.Function1,androidx.compose.ui.window.PopupPositionProvider,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.MenuStyle,androidx.compose.ui.window.PopupProperties,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I):V @@ -583,18 +527,6 @@ f:org.jetbrains.jewel.ui.component.MenuKt - sf:items(org.jetbrains.jewel.ui.component.MenuScope,I,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function3):V - sf:items(org.jetbrains.jewel.ui.component.MenuScope,java.util.List,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function3):V - sf:separator(org.jetbrains.jewel.ui.component.MenuScope):V -f:org.jetbrains.jewel.ui.component.MenuManager -- sf:$stable:I -- (kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.MenuManager):V -- b:(kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.component.MenuManager,I,kotlin.jvm.internal.DefaultConstructorMarker):V -- f:close-iuPiT84(I):Z -- f:closeAll-HMVJIwE(I,Z):V -- f:getOnDismissRequest():kotlin.jvm.functions.Function1 -- f:isRootMenu():Z -- f:isSubmenu():Z -- f:submenuManager(kotlin.jvm.functions.Function1):org.jetbrains.jewel.ui.component.MenuManager -f:org.jetbrains.jewel.ui.component.MenuManagerKt -- sf:getLocalMenuManager():androidx.compose.runtime.ProvidableCompositionLocal org.jetbrains.jewel.ui.component.MenuScope - a:passiveItem(kotlin.jvm.functions.Function2):V - a:selectableItem(Z,org.jetbrains.jewel.ui.icon.IconKey,java.util.Set,kotlin.jvm.functions.Function0,Z,kotlin.jvm.functions.Function2):V @@ -795,14 +727,10 @@ f:org.jetbrains.jewel.ui.component.SelectableIconButtonState$Companion - f:of-z9lnavA(Z,Z,Z,Z,Z,Z):J - bs:of-z9lnavA$default(org.jetbrains.jewel.ui.component.SelectableIconButtonState$Companion,Z,Z,Z,Z,Z,Z,I,java.lang.Object):J f:org.jetbrains.jewel.ui.component.SimpleListItemKt -- sf:SimpleListItem-0vH8DBg(org.jetbrains.jewel.ui.component.ListItemState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:SimpleListItem-J1qPv4o(Z,Z,androidx.compose.ui.graphics.ColorFilter,java.util.List,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I,I):V - sf:SimpleListItem-ULtc_mU(androidx.compose.ui.text.AnnotatedString,Z,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,Z,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.ui.graphics.ColorFilter,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.painter.PainterHint[],androidx.compose.runtime.Composer,I,I,I):V - sf:SimpleListItem-Wu8B24Y(java.lang.String,org.jetbrains.jewel.ui.component.ListItemState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.ui.graphics.ColorFilter,org.jetbrains.jewel.ui.painter.PainterHint[],androidx.compose.runtime.Composer,I,I,I):V - sf:SimpleListItem-XFD2ZOI(java.lang.String,Z,Z,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.ui.graphics.ColorFilter,org.jetbrains.jewel.ui.painter.PainterHint[],androidx.compose.runtime.Composer,I,I,I):V -- sf:SimpleListItem-aqv2aB4(java.lang.String,Z,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,Z,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.runtime.Composer,I,I):V -- sf:SimpleListItem-eKw1uXw(java.lang.String,org.jetbrains.jewel.ui.component.ListItemState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.runtime.Composer,I,I):V -- sf:SimpleListItem-gMrHQkA(Z,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,Z,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:SimpleListItem-tJlDC5Y(org.jetbrains.jewel.ui.component.ListItemState,androidx.compose.ui.graphics.ColorFilter,java.util.List,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V - sf:SimpleListItem-wn8IZOc(androidx.compose.ui.text.AnnotatedString,org.jetbrains.jewel.ui.component.ListItemState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.icon.IconKey,java.lang.String,org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle,F,androidx.compose.ui.graphics.ColorFilter,kotlin.jvm.functions.Function1,org.jetbrains.jewel.ui.painter.PainterHint[],androidx.compose.runtime.Composer,I,I,I):V f:org.jetbrains.jewel.ui.component.SliderKt @@ -992,26 +920,7 @@ f:org.jetbrains.jewel.ui.component.ToggleableIconButtonState$Companion - bs:of-CAf7mdk$default(org.jetbrains.jewel.ui.component.ToggleableIconButtonState$Companion,Z,androidx.compose.ui.state.ToggleableState,Z,Z,Z,Z,I,java.lang.Object):J f:org.jetbrains.jewel.ui.component.TooltipKt - sf:Tooltip(kotlin.jvm.functions.Function2,androidx.compose.ui.Modifier,Z,org.jetbrains.jewel.ui.component.styling.TooltipStyle,androidx.compose.foundation.TooltipPlacement,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -- sf:Tooltip(kotlin.jvm.functions.Function2,androidx.compose.ui.Modifier,Z,org.jetbrains.jewel.ui.component.styling.TooltipStyle,androidx.compose.foundation.TooltipPlacement,org.jetbrains.jewel.ui.component.AutoHideBehavior,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V -f:org.jetbrains.jewel.ui.component.Typography -- sf:$stable:I -- sf:DefaultLineHeightMultiplier:F -- sf:EditorLineHeightMultiplier:F -- sf:INSTANCE:org.jetbrains.jewel.ui.component.Typography -- f:consoleTextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:editorTextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:h0TextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:h1TextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:h2TextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:h3TextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:h4TextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle -- f:labelTextSize-5XXgJZs(androidx.compose.runtime.Composer,I):J -- f:labelTextStyle(androidx.compose.runtime.Composer,I):androidx.compose.ui.text.TextStyle f:org.jetbrains.jewel.ui.component.TypographyKt -- sf:copyWithSize-Ce1Lr_4(androidx.compose.ui.text.TextStyle,J,J,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontSynthesis,androidx.compose.ui.text.font.FontFamily,java.lang.String,J,androidx.compose.ui.text.style.BaselineShift,androidx.compose.ui.text.style.TextGeometricTransform,androidx.compose.ui.text.intl.LocaleList,J,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.graphics.drawscope.DrawStyle,I,I,androidx.compose.ui.text.style.TextIndent,androidx.compose.ui.text.PlatformTextStyle,androidx.compose.ui.text.style.LineHeightStyle,I,I,androidx.compose.ui.text.style.TextMotion):androidx.compose.ui.text.TextStyle -- bs:copyWithSize-Ce1Lr_4$default(androidx.compose.ui.text.TextStyle,J,J,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontSynthesis,androidx.compose.ui.text.font.FontFamily,java.lang.String,J,androidx.compose.ui.text.style.BaselineShift,androidx.compose.ui.text.style.TextGeometricTransform,androidx.compose.ui.text.intl.LocaleList,J,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.graphics.drawscope.DrawStyle,I,I,androidx.compose.ui.text.style.TextIndent,androidx.compose.ui.text.PlatformTextStyle,androidx.compose.ui.text.style.LineHeightStyle,I,I,androidx.compose.ui.text.style.TextMotion,I,java.lang.Object):androidx.compose.ui.text.TextStyle -- sf:copyWithSize-nfnV_I0(androidx.compose.ui.text.TextStyle,J,androidx.compose.ui.graphics.Brush,F,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontSynthesis,androidx.compose.ui.text.font.FontFamily,java.lang.String,J,androidx.compose.ui.text.style.BaselineShift,androidx.compose.ui.text.style.TextGeometricTransform,androidx.compose.ui.text.intl.LocaleList,J,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.graphics.drawscope.DrawStyle,I,I,androidx.compose.ui.text.style.TextIndent,androidx.compose.ui.text.PlatformTextStyle,androidx.compose.ui.text.style.LineHeightStyle,I,I,androidx.compose.ui.text.style.TextMotion):androidx.compose.ui.text.TextStyle -- bs:copyWithSize-nfnV_I0$default(androidx.compose.ui.text.TextStyle,J,androidx.compose.ui.graphics.Brush,F,androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle,androidx.compose.ui.text.font.FontSynthesis,androidx.compose.ui.text.font.FontFamily,java.lang.String,J,androidx.compose.ui.text.style.BaselineShift,androidx.compose.ui.text.style.TextGeometricTransform,androidx.compose.ui.text.intl.LocaleList,J,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.graphics.drawscope.DrawStyle,I,I,androidx.compose.ui.text.style.TextIndent,androidx.compose.ui.text.PlatformTextStyle,androidx.compose.ui.text.style.LineHeightStyle,I,I,androidx.compose.ui.text.style.TextMotion,I,java.lang.Object):androidx.compose.ui.text.TextStyle - sf:minus-NB67dxo(J,J):J - sf:plus-NB67dxo(J,J):J org.jetbrains.jewel.ui.component.banner.BannerIconActionScope @@ -1691,8 +1600,6 @@ f:org.jetbrains.jewel.ui.component.styling.MenuIcons$Companion f:org.jetbrains.jewel.ui.component.styling.MenuItemColors - sf:$stable:I - sf:Companion:org.jetbrains.jewel.ui.component.styling.MenuItemColors$Companion -- f:backgroundFor-VIR8D2g(J,androidx.compose.runtime.Composer,I):androidx.compose.runtime.State -- f:contentFor-VIR8D2g(J,androidx.compose.runtime.Composer,I):androidx.compose.runtime.State - equals(java.lang.Object):Z - f:getBackground-0d7_KjU():J - f:getBackgroundDisabled-0d7_KjU():J @@ -1716,8 +1623,6 @@ f:org.jetbrains.jewel.ui.component.styling.MenuItemColors - f:getKeybindingTintPressed-0d7_KjU():J - f:getSeparator-0d7_KjU():J - hashCode():I -- f:iconTintFor-VIR8D2g(J,androidx.compose.runtime.Composer,I):androidx.compose.runtime.State -- f:keybindingTintFor-VIR8D2g(J,androidx.compose.runtime.Composer,I):androidx.compose.runtime.State f:org.jetbrains.jewel.ui.component.styling.MenuItemColors$Companion f:org.jetbrains.jewel.ui.component.styling.MenuItemMetrics - sf:$stable:I @@ -2433,8 +2338,6 @@ f:org.jetbrains.jewel.ui.component.styling.TooltipMetrics - f:getShowDelay-UwyO8pc():J - hashCode():I f:org.jetbrains.jewel.ui.component.styling.TooltipMetrics$Companion -- f:defaults-8qf-r9M(androidx.compose.foundation.layout.PaddingValues,J,androidx.compose.foundation.shape.CornerSize,F,F,androidx.compose.foundation.TooltipPlacement):org.jetbrains.jewel.ui.component.styling.TooltipMetrics -- bs:defaults-8qf-r9M$default(org.jetbrains.jewel.ui.component.styling.TooltipMetrics$Companion,androidx.compose.foundation.layout.PaddingValues,J,androidx.compose.foundation.shape.CornerSize,F,F,androidx.compose.foundation.TooltipPlacement,I,java.lang.Object):org.jetbrains.jewel.ui.component.styling.TooltipMetrics - f:defaults-L5TaK9c(androidx.compose.foundation.layout.PaddingValues,J,J,J,androidx.compose.foundation.shape.CornerSize,F,F,androidx.compose.foundation.TooltipPlacement):org.jetbrains.jewel.ui.component.styling.TooltipMetrics - bs:defaults-L5TaK9c$default(org.jetbrains.jewel.ui.component.styling.TooltipMetrics$Companion,androidx.compose.foundation.layout.PaddingValues,J,J,J,androidx.compose.foundation.shape.CornerSize,F,F,androidx.compose.foundation.TooltipPlacement,I,java.lang.Object):org.jetbrains.jewel.ui.component.styling.TooltipMetrics f:org.jetbrains.jewel.ui.component.styling.TooltipStyle @@ -4157,16 +4060,13 @@ f:org.jetbrains.jewel.ui.theme.JewelThemeKt - sf:getTreeStyle(org.jetbrains.jewel.foundation.theme.JewelTheme$Companion,androidx.compose.runtime.Composer,I):org.jetbrains.jewel.ui.component.styling.LazyTreeStyle f:org.jetbrains.jewel.ui.util.ColorExtensionsKt - sf:fromArgbHexStringOrNull(androidx.compose.ui.graphics.Color$Companion,java.lang.String):androidx.compose.ui.graphics.Color -- sf:fromRGBAHexStringOrNull(androidx.compose.ui.graphics.Color$Companion,java.lang.String):androidx.compose.ui.graphics.Color - sf:fromRgbaHexStringOrNull(androidx.compose.ui.graphics.Color$Companion,java.lang.String):androidx.compose.ui.graphics.Color - sf:isDark-8_81llA(J):Z - sf:toArgbHexString(java.awt.Color,Z,Z):java.lang.String - bs:toArgbHexString$default(java.awt.Color,Z,Z,I,java.lang.Object):java.lang.String - sf:toArgbHexString-ek8zF_U(J,Z,Z):java.lang.String - bs:toArgbHexString-ek8zF_U$default(J,Z,Z,I,java.lang.Object):java.lang.String -- sf:toRgbaHexString(java.awt.Color):java.lang.String - sf:toRgbaHexString(java.awt.Color,Z,Z):java.lang.String - bs:toRgbaHexString$default(java.awt.Color,Z,Z,I,java.lang.Object):java.lang.String -- sf:toRgbaHexString-8_81llA(J):java.lang.String - sf:toRgbaHexString-ek8zF_U(J,Z,Z):java.lang.String - bs:toRgbaHexString-ek8zF_U$default(J,Z,Z,I,java.lang.Object):java.lang.String diff --git a/platform/jewel/ui/metalava/ui-api-0.39.0.txt b/platform/jewel/ui/metalava/ui-api-0.39.0.txt index a048f20a6930..0977f2559edc 100644 --- a/platform/jewel/ui/metalava/ui-api-0.39.0.txt +++ b/platform/jewel/ui/metalava/ui-api-0.39.0.txt @@ -101,10 +101,6 @@ package org.jetbrains.jewel.ui { method @androidx.compose.runtime.Composable public static androidx.compose.ui.Modifier disabledAppearance(androidx.compose.ui.Modifier, optional int brightness, optional int contrast, optional int alpha); } - public final class DisabledColorFilterKt { - method @Deprecated public static androidx.compose.ui.graphics.ColorFilter disabled(androidx.compose.ui.graphics.ColorFilter.Companion); - } - public interface MenuItemShortcutHintProvider { method public String getShortcutHint(org.jetbrains.jewel.ui.component.ContextMenuItemOptionAction actionType); } @@ -188,12 +184,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void ActionButton(kotlin.jvm.functions.Function0 onClick, kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean focusable, optional org.jetbrains.jewel.ui.component.styling.IconButtonStyle style, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle tooltipStyle, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0 content); } - @Deprecated public enum AutoHideBehavior { - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Long; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Never; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Normal; - } - public final class BadgeKt { method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onClick, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.BadgeStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function1 content); } @@ -223,10 +213,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void DefaultSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } public final class ButtonKt { @@ -464,7 +450,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... hints); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint hint); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint... hints); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(String resourcePath); } public final class ImageKt { @@ -478,10 +463,6 @@ package org.jetbrains.jewel.ui.component { } public final class InlineBannerKt { - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineInformationBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); @@ -490,10 +471,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void InlineSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class InputFieldState implements org.jetbrains.jewel.foundation.state.FocusableComponentState { @@ -584,26 +561,7 @@ package org.jetbrains.jewel.ui.component { property public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuController; } - @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class MenuItemState implements org.jetbrains.jewel.foundation.state.FocusableComponentState org.jetbrains.jewel.foundation.state.SelectableComponentState { - ctor @KotlinOnly @Deprecated public MenuItemState(kotlin.ULong state); - method @Deprecated public long copy(optional boolean selected, optional boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - property @Deprecated public boolean isActive; - property @Deprecated public boolean isEnabled; - property @Deprecated public boolean isFocused; - property @Deprecated public boolean isHovered; - property @Deprecated public boolean isPressed; - property @Deprecated public boolean isSelected; - property @Deprecated public kotlin.ULong state; - field @Deprecated public static final org.jetbrains.jewel.ui.component.MenuItemState.Companion Companion; - } - - @Deprecated public static final class MenuItemState.Companion { - method @Deprecated public long of(boolean selected, boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - } - public final class MenuKt { - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSeparator(optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuItemMetrics metrics, optional org.jetbrains.jewel.ui.component.styling.MenuItemColors colors); - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSubmenuItem(optional androidx.compose.ui.Modifier modifier, optional boolean enabled, boolean canShowIcon, org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, kotlin.jvm.functions.Function1 submenu, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); method @Deprecated @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, kotlin.jvm.functions.Function1 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); @@ -613,22 +571,6 @@ package org.jetbrains.jewel.ui.component { method public static void separator(org.jetbrains.jewel.ui.component.MenuScope); } - @Deprecated public final class MenuManager { - ctor @Deprecated public MenuManager(kotlin.jvm.functions.Function1 onDismissRequest, optional org.jetbrains.jewel.ui.component.MenuManager? parentMenuManager); - method @Deprecated public boolean close(int mode); - method @Deprecated public void closeAll(int mode, boolean force); - method @Deprecated public kotlin.jvm.functions.Function1 getOnDismissRequest(); - method @Deprecated public boolean isRootMenu(); - method @Deprecated public boolean isSubmenu(); - method @Deprecated public org.jetbrains.jewel.ui.component.MenuManager submenuManager(kotlin.jvm.functions.Function1 onDismissRequest); - property @Deprecated public kotlin.jvm.functions.Function1 onDismissRequest; - } - - public final class MenuManagerKt { - method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal getLocalMenuManager(); - property @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuManager; - } - public interface MenuScope { method public void passiveItem(kotlin.jvm.functions.Function0 content); method public void selectableItem(boolean selected, optional org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional java.util.Set? keybinding, kotlin.jvm.functions.Function0 onClick, optional boolean enabled, kotlin.jvm.functions.Function0 content); @@ -808,14 +750,10 @@ package org.jetbrains.jewel.ui.component { public final class SimpleListItemKt { method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, boolean selected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean active, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void SimpleListItem(boolean selected, optional boolean active, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean selected, optional boolean active, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); } public final class SliderKt { @@ -1029,31 +967,11 @@ package org.jetbrains.jewel.ui.component { public final class TooltipKt { method @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional org.jetbrains.jewel.ui.component.AutoHideBehavior autoHideBehavior, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.ui.window.PopupPositionProvider rememberPopupPositionProviderAtFixedPosition(long positionPx, optional long offset, optional androidx.compose.ui.Alignment alignment, optional float windowMargin); } - @Deprecated public final class Typography { - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle consoleTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle editorTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h0TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h1TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h2TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h3TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h4TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public long labelTextSize(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle labelTextStyle(); - property @Deprecated public static float DefaultLineHeightMultiplier; - property @Deprecated public static float EditorLineHeightMultiplier; - field @Deprecated public static final float DefaultLineHeightMultiplier = 1.3f; - field @Deprecated public static final float EditorLineHeightMultiplier = 1.5f; - field @Deprecated public static final org.jetbrains.jewel.ui.component.Typography INSTANCE; - } - public final class TypographyKt { method @SuppressCompatibility @Px @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static int computeLineHeightPx(java.awt.Font); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, optional long color, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); method public static operator long minus(long, long other); method public static operator long plus(long, long other); } @@ -1401,7 +1319,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ChipMetrics { - ctor @KotlinOnly @Deprecated public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected); ctor @KotlinOnly public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected, androidx.compose.ui.unit.DpSize minSize); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); method public androidx.compose.foundation.layout.PaddingValues getPadding(); @@ -2015,10 +1932,6 @@ package org.jetbrains.jewel.ui.component.styling { @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class MenuItemColors { ctor @KotlinOnly public MenuItemColors(androidx.compose.ui.graphics.Color background, androidx.compose.ui.graphics.Color backgroundDisabled, androidx.compose.ui.graphics.Color backgroundFocused, androidx.compose.ui.graphics.Color backgroundPressed, androidx.compose.ui.graphics.Color backgroundHovered, androidx.compose.ui.graphics.Color content, androidx.compose.ui.graphics.Color contentDisabled, androidx.compose.ui.graphics.Color contentFocused, androidx.compose.ui.graphics.Color contentPressed, androidx.compose.ui.graphics.Color contentHovered, androidx.compose.ui.graphics.Color iconTint, androidx.compose.ui.graphics.Color iconTintDisabled, androidx.compose.ui.graphics.Color iconTintFocused, androidx.compose.ui.graphics.Color iconTintPressed, androidx.compose.ui.graphics.Color iconTintHovered, androidx.compose.ui.graphics.Color keybindingTint, androidx.compose.ui.graphics.Color keybindingTintDisabled, androidx.compose.ui.graphics.Color keybindingTintFocused, androidx.compose.ui.graphics.Color keybindingTintPressed, androidx.compose.ui.graphics.Color keybindingTintHovered, androidx.compose.ui.graphics.Color separator); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State backgroundFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State contentFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State iconTintFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State keybindingTintFor(long state); property public androidx.compose.ui.graphics.Color background; property public androidx.compose.ui.graphics.Color backgroundDisabled; property public androidx.compose.ui.graphics.Color backgroundFocused; @@ -2988,7 +2901,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TooltipMetrics { - ctor @KotlinOnly @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public TooltipMetrics(androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.time.Duration showDelay, androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp shadowSize, androidx.compose.foundation.TooltipPlacement placement); ctor @KotlinOnly public TooltipMetrics(androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.time.Duration showDelay, androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp shadowSize, androidx.compose.foundation.TooltipPlacement placement, kotlin.time.Duration regularDisappearDelay, kotlin.time.Duration fullDisappearDelay); method public androidx.compose.foundation.layout.PaddingValues getContentPadding(); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); @@ -3005,7 +2917,6 @@ package org.jetbrains.jewel.ui.component.styling { } public static final class TooltipMetrics.Companion { - method @Deprecated public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); method public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional long regularDisappearDelay, optional long fullDisappearDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); } @@ -5034,14 +4945,11 @@ package org.jetbrains.jewel.ui.util { public final class ColorExtensionsKt { method public static androidx.compose.ui.graphics.Color? fromArgbHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String argb); - method @Deprecated public static androidx.compose.ui.graphics.Color? fromRGBAHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static androidx.compose.ui.graphics.Color? fromRgbaHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static boolean isDark(long); method public static String toArgbHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); method public static String toArgbHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(java.awt.Color); method public static String toRgbaHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(long); method public static String toRgbaHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); } diff --git a/platform/jewel/ui/metalava/ui-api-0.40.0.txt b/platform/jewel/ui/metalava/ui-api-0.40.0.txt index 63663f77b7a5..360b9b7da2e8 100644 --- a/platform/jewel/ui/metalava/ui-api-0.40.0.txt +++ b/platform/jewel/ui/metalava/ui-api-0.40.0.txt @@ -101,10 +101,6 @@ package org.jetbrains.jewel.ui { method @androidx.compose.runtime.Composable public static androidx.compose.ui.Modifier disabledAppearance(androidx.compose.ui.Modifier, optional int brightness, optional int contrast, optional int alpha); } - public final class DisabledColorFilterKt { - method @Deprecated public static androidx.compose.ui.graphics.ColorFilter disabled(androidx.compose.ui.graphics.ColorFilter.Companion); - } - public interface MenuItemShortcutHintProvider { method public String getShortcutHint(org.jetbrains.jewel.ui.component.ContextMenuItemOptionAction actionType); } @@ -188,12 +184,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void ActionButton(kotlin.jvm.functions.Function0 onClick, kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean focusable, optional org.jetbrains.jewel.ui.component.styling.IconButtonStyle style, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle tooltipStyle, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0 content); } - @Deprecated public enum AutoHideBehavior { - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Long; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Never; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Normal; - } - public final class BadgeKt { method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onClick, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.BadgeStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function1 content); } @@ -223,10 +213,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void DefaultSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } public final class ButtonKt { @@ -464,7 +450,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... hints); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint hint); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint... hints); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(String resourcePath); } public final class ImageKt { @@ -478,10 +463,6 @@ package org.jetbrains.jewel.ui.component { } public final class InlineBannerKt { - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineInformationBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); @@ -490,10 +471,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void InlineSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class InputFieldState implements org.jetbrains.jewel.foundation.state.FocusableComponentState { @@ -584,26 +561,7 @@ package org.jetbrains.jewel.ui.component { property public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuController; } - @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class MenuItemState implements org.jetbrains.jewel.foundation.state.FocusableComponentState org.jetbrains.jewel.foundation.state.SelectableComponentState { - ctor @KotlinOnly @Deprecated public MenuItemState(kotlin.ULong state); - method @Deprecated public long copy(optional boolean selected, optional boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - property @Deprecated public boolean isActive; - property @Deprecated public boolean isEnabled; - property @Deprecated public boolean isFocused; - property @Deprecated public boolean isHovered; - property @Deprecated public boolean isPressed; - property @Deprecated public boolean isSelected; - property @Deprecated public kotlin.ULong state; - field @Deprecated public static final org.jetbrains.jewel.ui.component.MenuItemState.Companion Companion; - } - - @Deprecated public static final class MenuItemState.Companion { - method @Deprecated public long of(boolean selected, boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - } - public final class MenuKt { - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSeparator(optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuItemMetrics metrics, optional org.jetbrains.jewel.ui.component.styling.MenuItemColors colors); - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSubmenuItem(optional androidx.compose.ui.Modifier modifier, optional boolean enabled, boolean canShowIcon, org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, kotlin.jvm.functions.Function1 submenu, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); method @Deprecated @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, kotlin.jvm.functions.Function1 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); @@ -613,22 +571,6 @@ package org.jetbrains.jewel.ui.component { method public static void separator(org.jetbrains.jewel.ui.component.MenuScope); } - @Deprecated public final class MenuManager { - ctor @Deprecated public MenuManager(kotlin.jvm.functions.Function1 onDismissRequest, optional org.jetbrains.jewel.ui.component.MenuManager? parentMenuManager); - method @Deprecated public boolean close(int mode); - method @Deprecated public void closeAll(int mode, boolean force); - method @Deprecated public kotlin.jvm.functions.Function1 getOnDismissRequest(); - method @Deprecated public boolean isRootMenu(); - method @Deprecated public boolean isSubmenu(); - method @Deprecated public org.jetbrains.jewel.ui.component.MenuManager submenuManager(kotlin.jvm.functions.Function1 onDismissRequest); - property @Deprecated public kotlin.jvm.functions.Function1 onDismissRequest; - } - - public final class MenuManagerKt { - method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal getLocalMenuManager(); - property @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuManager; - } - public interface MenuScope { method public void passiveItem(kotlin.jvm.functions.Function0 content); method public void selectableItem(boolean selected, optional org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional java.util.Set? keybinding, kotlin.jvm.functions.Function0 onClick, optional boolean enabled, kotlin.jvm.functions.Function0 content); @@ -808,14 +750,10 @@ package org.jetbrains.jewel.ui.component { public final class SimpleListItemKt { method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, boolean selected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean active, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void SimpleListItem(boolean selected, optional boolean active, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean selected, optional boolean active, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); } public final class SliderKt { @@ -1029,31 +967,11 @@ package org.jetbrains.jewel.ui.component { public final class TooltipKt { method @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional org.jetbrains.jewel.ui.component.AutoHideBehavior autoHideBehavior, kotlin.jvm.functions.Function0 content); method @SuppressCompatibility @androidx.compose.runtime.Composable @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static androidx.compose.ui.window.PopupPositionProvider rememberPopupPositionProviderAtFixedPosition(long positionPx, optional long offset, optional androidx.compose.ui.Alignment alignment, optional float windowMargin); } - @Deprecated public final class Typography { - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle consoleTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle editorTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h0TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h1TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h2TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h3TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h4TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public long labelTextSize(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle labelTextStyle(); - property @Deprecated public static float DefaultLineHeightMultiplier; - property @Deprecated public static float EditorLineHeightMultiplier; - field @Deprecated public static final float DefaultLineHeightMultiplier = 1.3f; - field @Deprecated public static final float EditorLineHeightMultiplier = 1.5f; - field @Deprecated public static final org.jetbrains.jewel.ui.component.Typography INSTANCE; - } - public final class TypographyKt { method @SuppressCompatibility @Px @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public static int computeLineHeightPx(java.awt.Font); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, optional long color, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); method public static operator long minus(long, long other); method public static operator long plus(long, long other); } @@ -1401,7 +1319,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ChipMetrics { - ctor @KotlinOnly @Deprecated public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected); ctor @KotlinOnly public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected, androidx.compose.ui.unit.DpSize minSize); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); method public androidx.compose.foundation.layout.PaddingValues getPadding(); @@ -2015,10 +1932,6 @@ package org.jetbrains.jewel.ui.component.styling { @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class MenuItemColors { ctor @KotlinOnly public MenuItemColors(androidx.compose.ui.graphics.Color background, androidx.compose.ui.graphics.Color backgroundDisabled, androidx.compose.ui.graphics.Color backgroundFocused, androidx.compose.ui.graphics.Color backgroundPressed, androidx.compose.ui.graphics.Color backgroundHovered, androidx.compose.ui.graphics.Color content, androidx.compose.ui.graphics.Color contentDisabled, androidx.compose.ui.graphics.Color contentFocused, androidx.compose.ui.graphics.Color contentPressed, androidx.compose.ui.graphics.Color contentHovered, androidx.compose.ui.graphics.Color iconTint, androidx.compose.ui.graphics.Color iconTintDisabled, androidx.compose.ui.graphics.Color iconTintFocused, androidx.compose.ui.graphics.Color iconTintPressed, androidx.compose.ui.graphics.Color iconTintHovered, androidx.compose.ui.graphics.Color keybindingTint, androidx.compose.ui.graphics.Color keybindingTintDisabled, androidx.compose.ui.graphics.Color keybindingTintFocused, androidx.compose.ui.graphics.Color keybindingTintPressed, androidx.compose.ui.graphics.Color keybindingTintHovered, androidx.compose.ui.graphics.Color separator); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State backgroundFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State contentFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State iconTintFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State keybindingTintFor(long state); property public androidx.compose.ui.graphics.Color background; property public androidx.compose.ui.graphics.Color backgroundDisabled; property public androidx.compose.ui.graphics.Color backgroundFocused; @@ -2988,7 +2901,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class TooltipMetrics { - ctor @KotlinOnly @Deprecated @SuppressCompatibility @org.jetbrains.annotations.ApiStatus.Experimental @org.jetbrains.jewel.foundation.ExperimentalJewelApi public TooltipMetrics(androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.time.Duration showDelay, androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp shadowSize, androidx.compose.foundation.TooltipPlacement placement); ctor @KotlinOnly public TooltipMetrics(androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.time.Duration showDelay, androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp shadowSize, androidx.compose.foundation.TooltipPlacement placement, kotlin.time.Duration regularDisappearDelay, kotlin.time.Duration fullDisappearDelay); method public androidx.compose.foundation.layout.PaddingValues getContentPadding(); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); @@ -3005,7 +2917,6 @@ package org.jetbrains.jewel.ui.component.styling { } public static final class TooltipMetrics.Companion { - method @Deprecated public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); method public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional long regularDisappearDelay, optional long fullDisappearDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); } @@ -5107,14 +5018,11 @@ package org.jetbrains.jewel.ui.util { public final class ColorExtensionsKt { method public static androidx.compose.ui.graphics.Color? fromArgbHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String argb); - method @Deprecated public static androidx.compose.ui.graphics.Color? fromRGBAHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static androidx.compose.ui.graphics.Color? fromRgbaHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static boolean isDark(long); method public static String toArgbHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); method public static String toArgbHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(java.awt.Color); method public static String toRgbaHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(long); method public static String toRgbaHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); } diff --git a/platform/jewel/ui/metalava/ui-api-stable-0.39.0.txt b/platform/jewel/ui/metalava/ui-api-stable-0.39.0.txt index fee034330a61..a62194a44fb6 100644 --- a/platform/jewel/ui/metalava/ui-api-stable-0.39.0.txt +++ b/platform/jewel/ui/metalava/ui-api-stable-0.39.0.txt @@ -101,10 +101,6 @@ package org.jetbrains.jewel.ui { method @androidx.compose.runtime.Composable public static androidx.compose.ui.Modifier disabledAppearance(androidx.compose.ui.Modifier, optional int brightness, optional int contrast, optional int alpha); } - public final class DisabledColorFilterKt { - method @Deprecated public static androidx.compose.ui.graphics.ColorFilter disabled(androidx.compose.ui.graphics.ColorFilter.Companion); - } - public interface MenuItemShortcutHintProvider { method public String getShortcutHint(org.jetbrains.jewel.ui.component.ContextMenuItemOptionAction actionType); } @@ -188,12 +184,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void ActionButton(kotlin.jvm.functions.Function0 onClick, kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean focusable, optional org.jetbrains.jewel.ui.component.styling.IconButtonStyle style, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle tooltipStyle, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0 content); } - @Deprecated public enum AutoHideBehavior { - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Long; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Never; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Normal; - } - public final class BadgeKt { method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onClick, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.BadgeStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function1 content); } @@ -223,10 +213,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void DefaultSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } public final class ButtonKt { @@ -436,7 +422,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... hints); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint hint); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint... hints); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(String resourcePath); } public final class ImageKt { @@ -450,10 +435,6 @@ package org.jetbrains.jewel.ui.component { } public final class InlineBannerKt { - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineInformationBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); @@ -462,10 +443,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void InlineSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class InputFieldState implements org.jetbrains.jewel.foundation.state.FocusableComponentState { @@ -549,26 +526,7 @@ package org.jetbrains.jewel.ui.component { property public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuController; } - @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class MenuItemState implements org.jetbrains.jewel.foundation.state.FocusableComponentState org.jetbrains.jewel.foundation.state.SelectableComponentState { - ctor @KotlinOnly @Deprecated public MenuItemState(kotlin.ULong state); - method @Deprecated public long copy(optional boolean selected, optional boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - property @Deprecated public boolean isActive; - property @Deprecated public boolean isEnabled; - property @Deprecated public boolean isFocused; - property @Deprecated public boolean isHovered; - property @Deprecated public boolean isPressed; - property @Deprecated public boolean isSelected; - property @Deprecated public kotlin.ULong state; - field @Deprecated public static final org.jetbrains.jewel.ui.component.MenuItemState.Companion Companion; - } - - @Deprecated public static final class MenuItemState.Companion { - method @Deprecated public long of(boolean selected, boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - } - public final class MenuKt { - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSeparator(optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuItemMetrics metrics, optional org.jetbrains.jewel.ui.component.styling.MenuItemColors colors); - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSubmenuItem(optional androidx.compose.ui.Modifier modifier, optional boolean enabled, boolean canShowIcon, org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, kotlin.jvm.functions.Function1 submenu, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); method @Deprecated @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, kotlin.jvm.functions.Function1 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); @@ -578,22 +536,6 @@ package org.jetbrains.jewel.ui.component { method public static void separator(org.jetbrains.jewel.ui.component.MenuScope); } - @Deprecated public final class MenuManager { - ctor @Deprecated public MenuManager(kotlin.jvm.functions.Function1 onDismissRequest, optional org.jetbrains.jewel.ui.component.MenuManager? parentMenuManager); - method @Deprecated public boolean close(int mode); - method @Deprecated public void closeAll(int mode, boolean force); - method @Deprecated public kotlin.jvm.functions.Function1 getOnDismissRequest(); - method @Deprecated public boolean isRootMenu(); - method @Deprecated public boolean isSubmenu(); - method @Deprecated public org.jetbrains.jewel.ui.component.MenuManager submenuManager(kotlin.jvm.functions.Function1 onDismissRequest); - property @Deprecated public kotlin.jvm.functions.Function1 onDismissRequest; - } - - public final class MenuManagerKt { - method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal getLocalMenuManager(); - property @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuManager; - } - public interface MenuScope { method public void passiveItem(kotlin.jvm.functions.Function0 content); method public void selectableItem(boolean selected, optional org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional java.util.Set? keybinding, kotlin.jvm.functions.Function0 onClick, optional boolean enabled, kotlin.jvm.functions.Function0 content); @@ -766,14 +708,10 @@ package org.jetbrains.jewel.ui.component { public final class SimpleListItemKt { method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, boolean selected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean active, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void SimpleListItem(boolean selected, optional boolean active, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean selected, optional boolean active, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); } public final class SliderKt { @@ -943,29 +881,9 @@ package org.jetbrains.jewel.ui.component { public final class TooltipKt { method @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional org.jetbrains.jewel.ui.component.AutoHideBehavior autoHideBehavior, kotlin.jvm.functions.Function0 content); - } - - @Deprecated public final class Typography { - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle consoleTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle editorTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h0TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h1TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h2TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h3TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h4TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public long labelTextSize(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle labelTextStyle(); - property @Deprecated public static float DefaultLineHeightMultiplier; - property @Deprecated public static float EditorLineHeightMultiplier; - field @Deprecated public static final float DefaultLineHeightMultiplier = 1.3f; - field @Deprecated public static final float EditorLineHeightMultiplier = 1.5f; - field @Deprecated public static final org.jetbrains.jewel.ui.component.Typography INSTANCE; } public final class TypographyKt { - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, optional long color, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); method public static operator long minus(long, long other); method public static operator long plus(long, long other); } @@ -1285,7 +1203,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ChipMetrics { - ctor @KotlinOnly @Deprecated public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected); ctor @KotlinOnly public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected, androidx.compose.ui.unit.DpSize minSize); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); method public androidx.compose.foundation.layout.PaddingValues getPadding(); @@ -1897,10 +1814,6 @@ package org.jetbrains.jewel.ui.component.styling { @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class MenuItemColors { ctor @KotlinOnly public MenuItemColors(androidx.compose.ui.graphics.Color background, androidx.compose.ui.graphics.Color backgroundDisabled, androidx.compose.ui.graphics.Color backgroundFocused, androidx.compose.ui.graphics.Color backgroundPressed, androidx.compose.ui.graphics.Color backgroundHovered, androidx.compose.ui.graphics.Color content, androidx.compose.ui.graphics.Color contentDisabled, androidx.compose.ui.graphics.Color contentFocused, androidx.compose.ui.graphics.Color contentPressed, androidx.compose.ui.graphics.Color contentHovered, androidx.compose.ui.graphics.Color iconTint, androidx.compose.ui.graphics.Color iconTintDisabled, androidx.compose.ui.graphics.Color iconTintFocused, androidx.compose.ui.graphics.Color iconTintPressed, androidx.compose.ui.graphics.Color iconTintHovered, androidx.compose.ui.graphics.Color keybindingTint, androidx.compose.ui.graphics.Color keybindingTintDisabled, androidx.compose.ui.graphics.Color keybindingTintFocused, androidx.compose.ui.graphics.Color keybindingTintPressed, androidx.compose.ui.graphics.Color keybindingTintHovered, androidx.compose.ui.graphics.Color separator); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State backgroundFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State contentFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State iconTintFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State keybindingTintFor(long state); property public androidx.compose.ui.graphics.Color background; property public androidx.compose.ui.graphics.Color backgroundDisabled; property public androidx.compose.ui.graphics.Color backgroundFocused; @@ -2886,7 +2799,6 @@ package org.jetbrains.jewel.ui.component.styling { } public static final class TooltipMetrics.Companion { - method @Deprecated public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); method public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional long regularDisappearDelay, optional long fullDisappearDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); } @@ -4892,14 +4804,11 @@ package org.jetbrains.jewel.ui.util { public final class ColorExtensionsKt { method public static androidx.compose.ui.graphics.Color? fromArgbHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String argb); - method @Deprecated public static androidx.compose.ui.graphics.Color? fromRGBAHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static androidx.compose.ui.graphics.Color? fromRgbaHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static boolean isDark(long); method public static String toArgbHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); method public static String toArgbHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(java.awt.Color); method public static String toRgbaHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(long); method public static String toRgbaHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); } diff --git a/platform/jewel/ui/metalava/ui-api-stable-0.40.0.txt b/platform/jewel/ui/metalava/ui-api-stable-0.40.0.txt index 315239bd4159..fb5e84c4a95d 100644 --- a/platform/jewel/ui/metalava/ui-api-stable-0.40.0.txt +++ b/platform/jewel/ui/metalava/ui-api-stable-0.40.0.txt @@ -101,10 +101,6 @@ package org.jetbrains.jewel.ui { method @androidx.compose.runtime.Composable public static androidx.compose.ui.Modifier disabledAppearance(androidx.compose.ui.Modifier, optional int brightness, optional int contrast, optional int alpha); } - public final class DisabledColorFilterKt { - method @Deprecated public static androidx.compose.ui.graphics.ColorFilter disabled(androidx.compose.ui.graphics.ColorFilter.Companion); - } - public interface MenuItemShortcutHintProvider { method public String getShortcutHint(org.jetbrains.jewel.ui.component.ContextMenuItemOptionAction actionType); } @@ -188,12 +184,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void ActionButton(kotlin.jvm.functions.Function0 onClick, kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean focusable, optional org.jetbrains.jewel.ui.component.styling.IconButtonStyle style, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle tooltipStyle, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0 content); } - @Deprecated public enum AutoHideBehavior { - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Long; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Never; - enum_constant @Deprecated public static final org.jetbrains.jewel.ui.component.AutoHideBehavior Normal; - } - public final class BadgeKt { method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? onClick, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.BadgeStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function1 content); } @@ -223,10 +213,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void DefaultSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void DefaultWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningDefaultBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } public final class ButtonKt { @@ -436,7 +422,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... hints); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint hint); method @androidx.compose.runtime.Composable public static void Icon(org.jetbrains.jewel.ui.icon.IconKey key, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional Class iconClass, optional long tint, org.jetbrains.jewel.ui.painter.PainterHint... hints); - method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(String resourcePath); } public final class ImageKt { @@ -450,10 +435,6 @@ package org.jetbrains.jewel.ui.component { } public final class InlineBannerKt { - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void ErrorInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void InformationInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineErrorBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineInformationBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); @@ -462,10 +443,6 @@ package org.jetbrains.jewel.ui.component { method @androidx.compose.runtime.Composable public static void InlineSuccessBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void InlineWarningBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? linkActions, optional kotlin.jvm.functions.Function1? iconActions, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SuccessInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void WarningInlineBanner(@org.jetbrains.annotations.Nls String text, optional androidx.compose.ui.Modifier modifier, optional @org.jetbrains.annotations.Nls String? title, optional kotlin.jvm.functions.Function0? icon, optional kotlin.jvm.functions.Function1? actions, optional kotlin.jvm.functions.Function1? actionIcons, optional org.jetbrains.jewel.ui.component.styling.InlineBannerStyle style, optional androidx.compose.ui.text.TextStyle textStyle); } @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class InputFieldState implements org.jetbrains.jewel.foundation.state.FocusableComponentState { @@ -549,26 +526,7 @@ package org.jetbrains.jewel.ui.component { property public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuController; } - @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class MenuItemState implements org.jetbrains.jewel.foundation.state.FocusableComponentState org.jetbrains.jewel.foundation.state.SelectableComponentState { - ctor @KotlinOnly @Deprecated public MenuItemState(kotlin.ULong state); - method @Deprecated public long copy(optional boolean selected, optional boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - property @Deprecated public boolean isActive; - property @Deprecated public boolean isEnabled; - property @Deprecated public boolean isFocused; - property @Deprecated public boolean isHovered; - property @Deprecated public boolean isPressed; - property @Deprecated public boolean isSelected; - property @Deprecated public kotlin.ULong state; - field @Deprecated public static final org.jetbrains.jewel.ui.component.MenuItemState.Companion Companion; - } - - @Deprecated public static final class MenuItemState.Companion { - method @Deprecated public long of(boolean selected, boolean enabled, optional boolean focused, optional boolean hovered, optional boolean pressed, optional boolean active); - } - public final class MenuKt { - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSeparator(optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuItemMetrics metrics, optional org.jetbrains.jewel.ui.component.styling.MenuItemColors colors); - method @Deprecated @androidx.compose.runtime.Composable public static void MenuSubmenuItem(optional androidx.compose.ui.Modifier modifier, optional boolean enabled, boolean canShowIcon, org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, kotlin.jvm.functions.Function1 submenu, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); method @Deprecated @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, kotlin.jvm.functions.Function1 content); method @androidx.compose.runtime.Composable public static void PopupMenu(kotlin.jvm.functions.Function1 onDismissRequest, androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional androidx.compose.ui.Modifier modifier, optional org.jetbrains.jewel.ui.component.styling.MenuStyle style, optional androidx.compose.ui.window.PopupProperties popupProperties, optional kotlin.jvm.functions.Function0? adContent, kotlin.jvm.functions.Function1 content); @@ -578,22 +536,6 @@ package org.jetbrains.jewel.ui.component { method public static void separator(org.jetbrains.jewel.ui.component.MenuScope); } - @Deprecated public final class MenuManager { - ctor @Deprecated public MenuManager(kotlin.jvm.functions.Function1 onDismissRequest, optional org.jetbrains.jewel.ui.component.MenuManager? parentMenuManager); - method @Deprecated public boolean close(int mode); - method @Deprecated public void closeAll(int mode, boolean force); - method @Deprecated public kotlin.jvm.functions.Function1 getOnDismissRequest(); - method @Deprecated public boolean isRootMenu(); - method @Deprecated public boolean isSubmenu(); - method @Deprecated public org.jetbrains.jewel.ui.component.MenuManager submenuManager(kotlin.jvm.functions.Function1 onDismissRequest); - property @Deprecated public kotlin.jvm.functions.Function1 onDismissRequest; - } - - public final class MenuManagerKt { - method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal getLocalMenuManager(); - property @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal LocalMenuManager; - } - public interface MenuScope { method public void passiveItem(kotlin.jvm.functions.Function0 content); method public void selectableItem(boolean selected, optional org.jetbrains.jewel.ui.icon.IconKey? iconKey, optional java.util.Set? keybinding, kotlin.jvm.functions.Function0 onClick, optional boolean enabled, kotlin.jvm.functions.Function0 content); @@ -766,14 +708,10 @@ package org.jetbrains.jewel.ui.component { public final class SimpleListItemKt { method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, boolean selected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean active, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls androidx.compose.ui.text.AnnotatedString text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional kotlin.jvm.functions.Function1 onTextLayout, optional org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); method @androidx.compose.runtime.Composable public static void SimpleListItem(boolean selected, optional boolean active, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean isSelected, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional boolean isActive, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, boolean selected, optional boolean active, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height); method @androidx.compose.runtime.Composable public static void SimpleListItem(@org.jetbrains.annotations.Nls String text, org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier textModifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, org.jetbrains.jewel.ui.painter.PainterHint... painterHints); method @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional java.util.List painterHints, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void SimpleListItem(org.jetbrains.jewel.ui.component.ListItemState state, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier iconModifier, optional org.jetbrains.jewel.ui.icon.IconKey? icon, optional String? iconContentDescription, optional org.jetbrains.jewel.ui.component.styling.SimpleListItemStyle style, optional float height, kotlin.jvm.functions.Function0 content); } public final class SliderKt { @@ -943,29 +881,9 @@ package org.jetbrains.jewel.ui.component { public final class TooltipKt { method @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, kotlin.jvm.functions.Function0 content); - method @Deprecated @androidx.compose.runtime.Composable public static void Tooltip(kotlin.jvm.functions.Function0 tooltip, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional org.jetbrains.jewel.ui.component.styling.TooltipStyle style, optional androidx.compose.foundation.TooltipPlacement tooltipPlacement, optional org.jetbrains.jewel.ui.component.AutoHideBehavior autoHideBehavior, kotlin.jvm.functions.Function0 content); - } - - @Deprecated public final class Typography { - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle consoleTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle editorTextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h0TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h1TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h2TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h3TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle h4TextStyle(); - method @Deprecated @androidx.compose.runtime.Composable public long labelTextSize(); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle labelTextStyle(); - property @Deprecated public static float DefaultLineHeightMultiplier; - property @Deprecated public static float EditorLineHeightMultiplier; - field @Deprecated public static final float DefaultLineHeightMultiplier = 1.3f; - field @Deprecated public static final float EditorLineHeightMultiplier = 1.5f; - field @Deprecated public static final org.jetbrains.jewel.ui.component.Typography INSTANCE; } public final class TypographyKt { - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); - method @Deprecated public static androidx.compose.ui.text.TextStyle copyWithSize(androidx.compose.ui.text.TextStyle, long fontSize, optional long color, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int textAlign, optional int textDirection, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional int lineBreak, optional int hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion); method public static operator long minus(long, long other); method public static operator long plus(long, long other); } @@ -1285,7 +1203,6 @@ package org.jetbrains.jewel.ui.component.styling { } @androidx.compose.runtime.Stable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class ChipMetrics { - ctor @KotlinOnly @Deprecated public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected); ctor @KotlinOnly public ChipMetrics(androidx.compose.foundation.shape.CornerSize cornerSize, androidx.compose.foundation.layout.PaddingValues padding, androidx.compose.ui.unit.Dp borderWidth, androidx.compose.ui.unit.Dp borderWidthSelected, androidx.compose.ui.unit.DpSize minSize); method public androidx.compose.foundation.shape.CornerSize getCornerSize(); method public androidx.compose.foundation.layout.PaddingValues getPadding(); @@ -1897,10 +1814,6 @@ package org.jetbrains.jewel.ui.component.styling { @androidx.compose.runtime.Immutable @org.jetbrains.jewel.foundation.GenerateDataFunctions public final class MenuItemColors { ctor @KotlinOnly public MenuItemColors(androidx.compose.ui.graphics.Color background, androidx.compose.ui.graphics.Color backgroundDisabled, androidx.compose.ui.graphics.Color backgroundFocused, androidx.compose.ui.graphics.Color backgroundPressed, androidx.compose.ui.graphics.Color backgroundHovered, androidx.compose.ui.graphics.Color content, androidx.compose.ui.graphics.Color contentDisabled, androidx.compose.ui.graphics.Color contentFocused, androidx.compose.ui.graphics.Color contentPressed, androidx.compose.ui.graphics.Color contentHovered, androidx.compose.ui.graphics.Color iconTint, androidx.compose.ui.graphics.Color iconTintDisabled, androidx.compose.ui.graphics.Color iconTintFocused, androidx.compose.ui.graphics.Color iconTintPressed, androidx.compose.ui.graphics.Color iconTintHovered, androidx.compose.ui.graphics.Color keybindingTint, androidx.compose.ui.graphics.Color keybindingTintDisabled, androidx.compose.ui.graphics.Color keybindingTintFocused, androidx.compose.ui.graphics.Color keybindingTintPressed, androidx.compose.ui.graphics.Color keybindingTintHovered, androidx.compose.ui.graphics.Color separator); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State backgroundFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State contentFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State iconTintFor(long state); - method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.runtime.State keybindingTintFor(long state); property public androidx.compose.ui.graphics.Color background; property public androidx.compose.ui.graphics.Color backgroundDisabled; property public androidx.compose.ui.graphics.Color backgroundFocused; @@ -2886,7 +2799,6 @@ package org.jetbrains.jewel.ui.component.styling { } public static final class TooltipMetrics.Companion { - method @Deprecated public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); method public org.jetbrains.jewel.ui.component.styling.TooltipMetrics defaults(optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional long showDelay, optional long regularDisappearDelay, optional long fullDisappearDelay, optional androidx.compose.foundation.shape.CornerSize cornerSize, optional float borderWidth, optional float shadowSize, optional androidx.compose.foundation.TooltipPlacement placement); } @@ -4965,14 +4877,11 @@ package org.jetbrains.jewel.ui.util { public final class ColorExtensionsKt { method public static androidx.compose.ui.graphics.Color? fromArgbHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String argb); - method @Deprecated public static androidx.compose.ui.graphics.Color? fromRGBAHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static androidx.compose.ui.graphics.Color? fromRgbaHexStringOrNull(androidx.compose.ui.graphics.Color.Companion, String rgba); method public static boolean isDark(long); method public static String toArgbHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); method public static String toArgbHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(java.awt.Color); method public static String toRgbaHexString(java.awt.Color, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); - method @Deprecated public static String toRgbaHexString(long); method public static String toRgbaHexString(long, optional boolean includeHashSymbol, optional boolean omitAlphaWhenFullyOpaque); } diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt deleted file mode 100644 index ce94c1afc8a1..000000000000 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt +++ /dev/null @@ -1,30 +0,0 @@ -package org.jetbrains.jewel.ui - -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.ColorMatrix - -// Implements javax.swing.GrayFilter's behaviour with percent = 50, brighter = true -// to match the GrayFilter#createDisabledImage behavior, used by Swing. -private val disabledColorMatrixGammaEncoded = - ColorMatrix().apply { - val saturation = .5f - - // We use NTSC luminance weights like Swing does as it's gamma-encoded RGB, - // and add some brightness to emulate Swing's "brighter" approach, which is - // not representable with a ColorMatrix alone as it's a non-linear op. - val redFactor = .299f * saturation + .25f - val greenFactor = .587f * saturation + .25f - val blueFactor = .114f * saturation + .25f - this[0, 0] = redFactor - this[0, 1] = greenFactor - this[0, 2] = blueFactor - this[1, 0] = redFactor - this[1, 1] = greenFactor - this[1, 2] = blueFactor - this[2, 0] = redFactor - this[2, 1] = greenFactor - this[2, 2] = blueFactor - } - -@Deprecated("Use Modifier.disabledAppearance() instead to get correct disabled colors.") -public fun ColorFilter.Companion.disabled(): ColorFilter = colorMatrix(disabledColorMatrixGammaEncoded) diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/DefaultBanner.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/DefaultBanner.kt index 81717a27b92f..f80604e9e4bc 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/DefaultBanner.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/DefaultBanner.kt @@ -31,78 +31,6 @@ import org.jetbrains.jewel.ui.component.styling.DefaultBannerStyle import org.jetbrains.jewel.ui.icons.AllIconsKeys import org.jetbrains.jewel.ui.theme.defaultBannerStyle -/** - * Displays an informational editor banner providing a context-aware message to the user, styled with the default - * "information" theme. - * - * The banner includes an optional icon, customizable actions, and a text message. Its primary purpose is to provide - * non-intrusive, informative feedback in the editor area. - * - * @param text the main text content of the banner, succinctly describing the message or context. - * @param modifier a [Modifier] for customizing the layout and appearance of the banner. - * @param icon a composable representing an optional icon displayed on the left side of the banner, by default it shows - * the general "information" icon, in a 16x16 dp [Box]. Pass `null` to hide the icon. - * @param actions an optional row of clickable components (e.g., links or buttons) placed at the end of the banner. - * Useful for actions such as "learn more," "retry," or "dismiss." - * @param style defines the visual styling of the banner, adapting to the default "information" theme of the IJ UI. You - * can override it if needed by providing a custom [DefaultBannerStyle]. - * @param textStyle the styling applied to the banner's text content, using the default text style from the Jewel theme. - * This can be customized for specific typography needs. - * - * This banner is primarily used to display persistent messages without interrupting the workflow. - * - * **Guidelines:** [on IJP SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) - * - * **Swing equivalent:** - * [`EditorNotificationProvider `](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/EditorNotificationProvider.java) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * Example usage: - * ``` - * InformationDefaultBanner( - * text = "The file has been indexed successfully.", - * actions = { - * Link("Dismiss", onClick = { /* Handle dismiss action */ }) - * } - * ) - * ``` - */ -@Composable -@Deprecated( - "Replace with DefaultInformationBanner", - replaceWith = - ReplaceWith( - "DefaultInformationBanner(" + - "text = text, " + - "modifier = modifier, " + - "icon = icon, " + - "linkActions = actions, " + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.DefaultInformationBanner", - ), -) -public fun InformationDefaultBanner( - @Nls text: String, - modifier: Modifier = Modifier, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonInformation, null) }, - actions: (@Composable RowScope.() -> Unit)? = null, - style: DefaultBannerStyle = JewelTheme.defaultBannerStyle.information, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - DefaultBannerImpl( - text = text, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - ) -} - /** * Displays an informational editor banner providing a context-aware message to the user, styled with the default * "information" theme. @@ -230,76 +158,6 @@ public fun DefaultInformationBanner( ) } -/** - * Displays a success editor banner signaling a successful action, state, or process completion. - * - * The banner includes an optional icon, customizable actions, and a text message styled with the default "success" - * theme. - * - * @param text the main text content of the banner, briefly describing the successful state or process. - * @param modifier a [Modifier] for customizing the layout and appearance of the banner. - * @param icon a composable representing an optional icon displayed on the left of the banner, by default it shows the - * "success" icon, in a 16x16 dp [Box]. Pass `null` to hide the icon. - * @param actions an optional row of clickable components that can act as additional user actions, such as "view - * details" or "close." - * @param style defines the banner's appearance following the "success" theme of the Jewel UI, but can be overridden - * with custom styling. - * @param textStyle determines the typography of the banner's text, defaulting to the application's text style. - * - * Use this banner to provide clear, visual feedback of a completed or successful action. - * - * **Guidelines:** [on IJP SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) - * - * **Swing equivalent:** - * [`EditorNotificationProvider `](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/EditorNotificationProvider.java) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * Example usage: - * ``` - * SuccessDefaultBanner( - * text = "Backup completed successfully.", - * actions = { - * Link("View Logs", onClick = { /* Show logs */ }) - * } - * ) - * ``` - */ -@Composable -@Deprecated( - "Replace with DefaultSuccessBanner", - replaceWith = - ReplaceWith( - "DefaultSuccessBanner(" + - "text = text, " + - "modifier = modifier, " + - "icon = icon, " + - "linkActions = actions, " + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.DefaultSuccessBanner", - ), -) -public fun SuccessDefaultBanner( - @Nls text: String, - modifier: Modifier = Modifier, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.Debugger.ThreadStates.Idle, null) }, - actions: (@Composable RowScope.() -> Unit)? = null, - style: DefaultBannerStyle = JewelTheme.defaultBannerStyle.success, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - DefaultBannerImpl( - text = text, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - ) -} - /** * Displays a success editor banner signaling a successful action, state, or process completion. * @@ -424,75 +282,6 @@ public fun DefaultSuccessBanner( ) } -/** - * Displays a warning editor banner highlighting potential issues or a need for user attention. - * - * This banner visually distinguishes itself using the default "warning" theme, including optional icons and user - * actions. - * - * @param text the main text content of the banner, detailing the warning message or potential problem. - * @param modifier a [Modifier] for customizing the layout and appearance of the banner. - * @param icon a composable representing an icon displayed on the left of the banner, by default it shows a "warning" - * icon. Pass `null` to omit the icon. - * @param actions an optional row of clickable components allowing the user to resolve the warning or access more - * details. - * @param style defines the banner's appearance under the "warning" theme, or a custom [DefaultBannerStyle]. - * @param textStyle controls the typography of the warning message's text, based on the Jewel theme. - * - * Use this banner to make users aware of potential issues without stopping their flow. - * - * **Guidelines:** [on IJP SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) - * - * **Swing equivalent:** - * [`EditorNotificationProvider `](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/EditorNotificationProvider.java) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * Example usage: - * ``` - * WarningDefaultBanner( - * text = "Your license is expiring soon. Please renew to avoid service interruptions.", - * actions = { - * Link("Renew Now", onClick = { /* Trigger renewal flow */ }) - * } - * ) - * ``` - */ -@Composable -@Deprecated( - "Replace with DefaultWarningBanner", - replaceWith = - ReplaceWith( - "DefaultWarningBanner(" + - "text = text, " + - "modifier = modifier, " + - "icon = icon, " + - "linkActions = actions, " + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.DefaultWarningBanner", - ), -) -public fun WarningDefaultBanner( - @Nls text: String, - modifier: Modifier = Modifier, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonWarning, null) }, - actions: (@Composable RowScope.() -> Unit)? = null, - style: DefaultBannerStyle = JewelTheme.defaultBannerStyle.warning, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - DefaultBannerImpl( - text = text, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - ) -} - /** * Displays a warning editor banner highlighting potential issues or a need for user attention. * @@ -615,74 +404,6 @@ public fun DefaultWarningBanner( ) } -/** - * Displays an error editor banner indicating critical issues or failures that require user awareness. - * - * This banner draws attention using the default "error" theme and can optionally include user actions or icons. - * - * @param text the main text content of the banner, focusing on the error context or failure details. - * @param modifier a [Modifier] for customizing the layout and appearance of the banner. - * @param icon a composable representing an error icon to display on the left of the banner, by default it shows the - * "error" icon. Pass `null` to omit the icon. - * @param actions an optional row of interactive components for responding to the error, such as retrying or navigating - * to relevant settings. - * @param style the default "error" theme styling for the banner, or a custom one via [DefaultBannerStyle]. - * @param textStyle typography settings for the text content, defaulting to Jewel's text style. - * - * Use this banner to provide high-visibility error messages requiring immediate user attention. - * - * **Guidelines:** [on IJP SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) - * - * **Swing equivalent:** - * [`EditorNotificationProvider `](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/EditorNotificationProvider.java) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * Example usage: - * ``` - * ErrorDefaultBanner( - * text = "Failed to sync project files with the server.", - * actions = { - * Link("Retry", onClick = { /* Retry the action */ }) - * } - * ) - * ``` - */ -@Composable -@Deprecated( - "Replace with DefaultErrorBanner", - replaceWith = - ReplaceWith( - "DefaultErrorBanner(" + - "text = text, " + - "modifier = modifier, " + - "icon = icon, " + - "linkActions = actions, " + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.DefaultErrorBanner", - ), -) -public fun ErrorDefaultBanner( - @Nls text: String, - modifier: Modifier = Modifier, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonError, null) }, - actions: (@Composable RowScope.() -> Unit)? = null, - style: DefaultBannerStyle = JewelTheme.defaultBannerStyle.error, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - DefaultBannerImpl( - text = text, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - ) -} - /** * Displays an error editor banner indicating critical issues or failures that require user awareness. * diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt index e62b0b14d3c1..9035c9475f60 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt @@ -35,10 +35,6 @@ import com.intellij.platform.icons.impl.rendering.DefaultImageModifiers import com.intellij.platform.icons.rendering.IconRendererManager import com.intellij.platform.icons.rendering.createRenderer import com.intellij.platform.icons.scale.IconScale -import org.jetbrains.compose.resources.ExperimentalResourceApi -import org.jetbrains.compose.resources.decodeToImageBitmap -import org.jetbrains.compose.resources.decodeToImageVector -import org.jetbrains.compose.resources.decodeToSvgPainter import org.jetbrains.jewel.foundation.modifier.thenIf import org.jetbrains.jewel.foundation.theme.JewelTheme import org.jetbrains.jewel.ui.icon.IconKey @@ -324,46 +320,6 @@ public fun Icon( ) } -@Deprecated( - "Please use iconKeys with the Icon or Image components instead. " + - "This will prevent issues when running in the IntelliJ Platform." -) -@Composable -public fun painterResource(resourcePath: String): Painter = - when (resourcePath.substringAfterLast(".").lowercase()) { - "svg" -> rememberSvgResource(resourcePath) - "xml" -> rememberVectorXmlResource(resourcePath) - else -> rememberBitmapResource(resourcePath) - } - -@OptIn(ExperimentalResourceApi::class) -@Composable -private fun rememberSvgResource(path: String): Painter { - val density = LocalDensity.current - return remember(density, path) { readResourceBytes(path).decodeToSvgPainter(density) } -} - -@OptIn(ExperimentalResourceApi::class) -@Composable -private fun rememberVectorXmlResource(path: String): Painter { - val density = LocalDensity.current - val imageVector = remember(density, path) { readResourceBytes(path).decodeToImageVector(density) } - return rememberVectorPainter(imageVector) -} - -@OptIn(ExperimentalResourceApi::class) -@Composable -private fun rememberBitmapResource(path: String): Painter = - remember(path) { BitmapPainter(readResourceBytes(path).decodeToImageBitmap()) } - -private object ResourceLoader - -private fun readResourceBytes(resourcePath: String) = - checkNotNull(ResourceLoader.javaClass.classLoader.getResourceAsStream(resourcePath)) { - "Could not load resource $resourcePath: it does not exist or can't be read." - } - .readAllBytes() - private fun Modifier.defaultSizeFor(painter: Painter) = thenIf(painter.intrinsicSize == Size.Unspecified || painter.intrinsicSize.isInfinite()) { DefaultIconSizeModifier } diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InlineBanner.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InlineBanner.kt index ecaf58cdd35b..9076d0eeabcd 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InlineBanner.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InlineBanner.kt @@ -49,85 +49,6 @@ import org.jetbrains.jewel.ui.theme.inlineBannerStyle private const val BANNER_ICON_SIZE = 16 private const val BANNER_CONTENT_SPACING = 8 -/** - * Displays an informational inline banner providing subtle, non-intrusive context or feedback. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * InformationInlineBanner( - * text = "Project index up to date.", - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) - * ``` - * - * @param text The primary content of the banner, briefly describing the information it conveys. - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [text]. - * @param icon Slot for an optional icon displayed on the left of the [text] or [title]. If null, there is no icon. By - * default, it is the [AllIconsKeys.General.BalloonInformation] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [text]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [text] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.information`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.information]. - * @param textStyle The base [TextStyle] used by the [text] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineInformationBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineInformationBanner", - ), -) -public fun InformationInlineBanner( - @Nls text: String, - modifier: Modifier = Modifier, - title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonInformation, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.information, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - @Suppress("DEPRECATION") - InformationInlineBanner( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - ) { - Text(text = text, style = textStyle) - } -} - /** * Displays an informational inline banner providing subtle, non-intrusive context or feedback. * @@ -191,84 +112,6 @@ public fun InlineInformationBanner( } } -/** - * Displays an informational inline banner providing subtle, non-intrusive context or feedback. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * InformationInlineBanner( - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) { - * Markdown("Project index **up to date**.") - * } - * ``` - * - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [content]. - * @param icon Slot for an optional icon displayed on the left of the [content] or [title]. If null, there is no icon. - * By default, it is the [AllIconsKeys.General.BalloonInformation] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [content]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [content] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.information`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.information]. - * @param textStyle The base [TextStyle] used by the [content] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - * @param content The primary content of the banner, briefly describing the information it conveys. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineInformationBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineInformationBanner", - ), -) -public fun InformationInlineBanner( - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonInformation, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.information, - textStyle: TextStyle = JewelTheme.defaultTextStyle, - content: @Composable () -> Unit, -) { - InlineBannerImpl( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - content = content, - ) -} - /** * Displays an informational inline banner providing subtle, non-intrusive context or feedback. * @@ -332,83 +175,6 @@ public fun InlineInformationBanner( ) } -/** - * Displays a success inline banner providing information about the successful completion of an operation. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * SuccessInlineBanner( - * text = "Project indexed successfully.", - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) - * ``` - * - * @param text The primary content of the banner, briefly describing the information it conveys. - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [text]. - * @param icon Slot for an optional icon displayed on the left of the [text] or [title]. If null, there is no icon. By - * default, it is the [AllIconsKeys.Status.Success] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [text]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [text] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.success`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.success]. - * @param textStyle The base [TextStyle] used by the [text] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineSuccessBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineSuccessBanner", - ), -) -public fun SuccessInlineBanner( - @Nls text: String, - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.Status.Success, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.success, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - @Suppress("DEPRECATION") - SuccessInlineBanner( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - ) { - Text(text = text, style = textStyle) - } -} - /** * Displays a success inline banner providing information about the successful completion of an operation. * @@ -470,84 +236,6 @@ public fun InlineSuccessBanner( } } -/** - * Displays a success inline banner providing information about the successful completion of an operation. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * SuccessInlineBanner( - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) { - * Markdown("Project indexed **successfully**.") - * } - * ``` - * - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [content]. - * @param icon Slot for an optional icon displayed on the left of the [content] or [title]. If null, there is no icon. - * By default, it is the [AllIconsKeys.Status.Success] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [content]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [content] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.success`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.success]. - * @param textStyle The base [TextStyle] used by the [content] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - * @param content The primary content of the banner, briefly describing the information it conveys. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineSuccessBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineSuccessBanner", - ), -) -public fun SuccessInlineBanner( - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.Status.Success, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.success, - textStyle: TextStyle = JewelTheme.defaultTextStyle, - content: @Composable () -> Unit, -) { - InlineBannerImpl( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - content = content, - ) -} - /** * Displays a success inline banner providing information about the successful completion of an operation. * @@ -613,85 +301,6 @@ public fun InlineSuccessBanner( ) } -/** - * Shows a warning inline banner to draw attention to non-critical issues that require user awareness or resolution. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * WarningInlineBanner( - * text = "Project indexed with warnings.", - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) - * ``` - * - * @param text The primary content of the banner, briefly describing the information it conveys. - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [text]. - * @param icon Slot for an optional icon displayed on the left of the [text] or [title]. If null, there is no icon. By - * default, it is the [AllIconsKeys.General.BalloonWarning] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [text]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [text] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.warning`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.warning]. - * @param textStyle The base [TextStyle] used by the [text] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineWarningBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineWarningBanner", - ), -) -public fun WarningInlineBanner( - @Nls text: String, - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonWarning, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.warning, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - @Suppress("DEPRECATION") - WarningInlineBanner( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - ) { - Text(text = text, style = textStyle) - } -} - /** * Shows a warning inline banner to draw attention to non-critical issues that require user awareness or resolution. * @@ -755,84 +364,6 @@ public fun InlineWarningBanner( } } -/** - * Shows a warning inline banner to draw attention to non-critical issues that require user awareness or resolution. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * WarningInlineBanner( - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) { - * Markdown("Project indexed **with warnings**.") - * } - * ``` - * - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [content]. - * @param icon Slot for an optional icon displayed on the left of the [content] or [title]. If null, there is no icon. - * By default, it is the [AllIconsKeys.General.BalloonWarning] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [content]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [content] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.warning`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.warning]. - * @param textStyle The base [TextStyle] used by the [content] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - * @param content The primary content of the banner, briefly describing the information it conveys. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineWarningBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineWarningBanner", - ), -) -public fun WarningInlineBanner( - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonWarning, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.warning, - textStyle: TextStyle = JewelTheme.defaultTextStyle, - content: @Composable () -> Unit, -) { - InlineBannerImpl( - title = title, - style = style, - textStyle = textStyle, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - content = content, - ) -} - /** * Shows a warning inline banner to draw attention to non-critical issues that require user awareness or resolution. * @@ -896,85 +427,6 @@ public fun InlineWarningBanner( ) } -/** - * Shows an error inline banner to draw attention to non-critical issues that require user awareness or resolution. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * ErrorInlineBanner( - * text = "Project indexed failed.", - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) - * ``` - * - * @param text The primary content of the banner, briefly describing the information it conveys. - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [text]. - * @param icon Slot for an optional icon displayed on the left of the [text] or [title]. If null, there is no icon. By - * default, it is the [AllIconsKeys.General.BalloonError] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [text]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [text] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.error`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.error]. - * @param textStyle The base [TextStyle] used by the [text] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineErrorBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineErrorBanner", - ), -) -public fun ErrorInlineBanner( - @Nls text: String, - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonError, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.error, - textStyle: TextStyle = JewelTheme.defaultTextStyle, -) { - @Suppress("DEPRECATION") - ErrorInlineBanner( - style = style, - textStyle = textStyle, - title = title, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - ) { - Text(text = text, style = textStyle) - } -} - /** * Shows an error inline banner to draw attention to non-critical issues that require user awareness or resolution. * @@ -1038,84 +490,6 @@ public fun InlineErrorBanner( } } -/** - * Shows an error inline banner to draw attention to non-critical issues that require user awareness or resolution. - * - * Use this banner to provide relevant, non-critical information in a compact layout. - * - * **Guidelines:** [on IntelliJ Platform SDK webhelp](https://plugins.jetbrains.com/docs/intellij/banner.html) (note: - * there are no guidelines for inline banners) - * - * **Swing equivalent:** - * [`InlineBanner`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ui/InlineBanner.kt) - * - * **Usage example:** - * [`Banners.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Banners.kt) - * - * ```kotlin - * ErrorInlineBanner( - * actions = { - * Link("View Logs", onClick = { /* handle click */ }) - * } - * ) { - * Markdown("Project indexed **successfully**.") - * } - * ``` - * - * @param modifier [Modifier] to apply to the banner. - * @param title An optional title, rendered in bold, that appears above the [content]. - * @param icon Slot for an optional icon displayed on the left of the [content] or [title]. If null, there is no icon. - * By default, it is the [AllIconsKeys.General.BalloonError] icon. - * @param actions Slot for optional primary actions (usually links) to show at the bottom of the banner, below the - * [content]. - * @param actionIcons Slot for secondary actions (usually icon buttons), such as closing the banner to show at the top - * right of the banner, to the right of the [content] or [title]. - * @param style An [InlineBannerStyle] used to style the banner. The default is the theme's - * [`JewelTheme.inlineBannerStyle.error`][org.jetbrains.jewel.ui.component.styling.InlineBannerStyles.error]. - * @param textStyle The base [TextStyle] used by the [content] and [title]. Note that the [title] always has a - * [`Bold` weight][androidx.compose.ui.text.font.FontWeight.Bold]. - * @param content The primary content of the banner, briefly describing the information it conveys. - */ -@Composable -@Deprecated( - "Use the overload with 'linkActions' and 'iconActions' parameters instead", - replaceWith = - ReplaceWith( - "InlineErrorBanner(" + - "text = text, " + - "modifier = modifier, " + - "title = title, " + - "icon = icon, " + - "linkActions = actions, " + - "iconActions = actionIcons," + - "style = style, " + - "textStyle = textStyle" + - ")", - "org.jetbrains.jewel.ui.component.InlineErrorBanner", - ), -) -public fun ErrorInlineBanner( - modifier: Modifier = Modifier, - @Nls title: String? = null, - icon: (@Composable () -> Unit)? = { Icon(AllIconsKeys.General.BalloonError, null) }, - actions: (@Composable FlowRowScope.() -> Unit)? = null, - actionIcons: (@Composable RowScope.() -> Unit)? = null, - style: InlineBannerStyle = JewelTheme.inlineBannerStyle.error, - textStyle: TextStyle = JewelTheme.defaultTextStyle, - content: @Composable () -> Unit, -) { - InlineBannerImpl( - style = style, - textStyle = textStyle, - title = title, - icon = icon, - actions = actions, - modifier = modifier, - actionIcons = actionIcons, - content = content, - ) -} - /** * Shows an error inline banner to draw attention to non-critical issues that require user awareness or resolution. * diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt index 4e452bf06891..d700ae0403c4 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt @@ -721,16 +721,6 @@ private data class SubmenuItem( override val content: @Composable () -> Unit, ) : MenuItem -@Deprecated("This is being made private") -@Composable -public fun MenuSeparator( - modifier: Modifier = Modifier, - metrics: MenuItemMetrics = JewelTheme.menuStyle.metrics.itemMetrics, - colors: MenuItemColors = JewelTheme.menuStyle.colors.itemColors, -) { - MenuSeparator(colors, metrics, modifier) -} - @Composable private fun MenuSeparator(colors: MenuItemColors, metrics: MenuItemMetrics, modifier: Modifier = Modifier) { Box(modifier.height(metrics.separatorHeight)) { @@ -755,7 +745,7 @@ private fun MenuItem( enabled: Boolean = true, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, style: MenuStyle = JewelTheme.menuStyle, - @Suppress("DEPRECATION") content: @Composable (itemState: MenuItemState) -> Unit, + content: @Composable (itemState: MenuItemState) -> Unit, ) { val shortcutHintProvider = LocalMenuItemShortcutHintProvider.current @@ -786,7 +776,7 @@ private fun MenuItem( enabled: Boolean = true, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, style: MenuStyle = JewelTheme.menuStyle, - @Suppress("DEPRECATION") content: @Composable (itemState: MenuItemState) -> Unit, + content: @Composable (itemState: MenuItemState) -> Unit, ) { MenuItemBase( selected = selected, @@ -820,7 +810,7 @@ internal fun MenuItemBase( enabled: Boolean = true, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, style: MenuStyle = JewelTheme.menuStyle, - @Suppress("DEPRECATION") content: @Composable (itemState: MenuItemState) -> Unit, + content: @Composable (itemState: MenuItemState) -> Unit, ) { val itemState by rememberMenuItemState(selected, enabled, interactionSource) @@ -864,7 +854,6 @@ internal fun MenuItemBase( trailingContent = if (canShowKeybinding) { { - @Suppress("DEPRECATION") // Not really deprecated, MenuItemColors will be made internal Text( modifier = Modifier.padding(style.metrics.itemMetrics.keybindingsPadding), text = keybindingHint, @@ -877,24 +866,6 @@ internal fun MenuItemBase( } } -@Suppress("ComposableParamOrder") -@Deprecated("This is being made private") -@Composable -public fun MenuSubmenuItem( - modifier: Modifier = Modifier, - enabled: Boolean = true, - canShowIcon: Boolean, - iconKey: IconKey?, - interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, - style: MenuStyle = JewelTheme.menuStyle, - submenu: MenuScope.() -> Unit, - content: @Composable () -> Unit, -) { - MenuSubmenuItem(canShowIcon, selected = false, submenu, modifier, enabled, iconKey, interactionSource, style) { - content() - } -} - @VisibleForTesting @ApiStatus.Internal @InternalJewelApi @@ -908,7 +879,7 @@ public fun MenuSubmenuItem( iconKey: IconKey? = null, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, style: MenuStyle = JewelTheme.menuStyle, - @Suppress("DEPRECATION") content: @Composable (itemState: MenuItemState) -> Unit, + content: @Composable (itemState: MenuItemState) -> Unit, ) { var itemState by rememberMenuItemState(selected, enabled, interactionSource) // When the item becomes disabled, close any open submenu @@ -943,7 +914,6 @@ public fun MenuSubmenuItem( iconKey = iconKey, canShowIcon = showIcon, trailingContent = { - @Suppress("DEPRECATION") // Not really deprecated, MenuItemColors will be made internal Icon( key = style.icons.submenuChevron, contentDescription = null, @@ -972,7 +942,6 @@ public fun MenuSubmenuItem( } } -@Suppress("DEPRECATION") // Not really deprecated, MenuItemColors be made internal @Composable internal fun MenuItemLayout( itemState: MenuItemState, @@ -1113,7 +1082,8 @@ internal fun Submenu( * @see SelectableComponentState * @see FocusableComponentState */ -@Deprecated("This is being made private") +@ApiStatus.Internal +@InternalJewelApi @Immutable @JvmInline public value class MenuItemState(public val state: ULong) : SelectableComponentState, FocusableComponentState { @@ -1135,7 +1105,6 @@ public value class MenuItemState(public val state: ULong) : SelectableComponentS override val isPressed: Boolean get() = state and Pressed != 0UL - @Suppress("DEPRECATION") public fun copy( selected: Boolean = isSelected, enabled: Boolean = isEnabled, @@ -1157,10 +1126,8 @@ public value class MenuItemState(public val state: ULong) : SelectableComponentS "MenuItemState(state=$state, isSelected=$isSelected, isEnabled=$isEnabled, isFocused=$isFocused, " + "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)" - public companion object { - @Suppress("DEPRECATION") - @Deprecated("This is being made private") - public fun of( + internal companion object { + internal fun of( selected: Boolean, enabled: Boolean, focused: Boolean = false, @@ -1180,7 +1147,6 @@ public value class MenuItemState(public val state: ULong) : SelectableComponentS } } -@Suppress("DEPRECATION") // Not really deprecated, MenuItemState will be made internal @Composable internal fun rememberMenuItemState( selected: Boolean, diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt deleted file mode 100644 index b7318fad3382..000000000000 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt +++ /dev/null @@ -1,66 +0,0 @@ -package org.jetbrains.jewel.ui.component - -import androidx.compose.runtime.ProvidableCompositionLocal -import androidx.compose.runtime.staticCompositionLocalOf -import androidx.compose.ui.input.InputMode - -@Suppress("DEPRECATION") -@Deprecated( - message = - "The MenuManager class has been superseded by the MenuController interface, " + - "which offers improved abstraction and new functionalities like shortcut management. " + - "Depend on the MenuController class for all menu operations.", - replaceWith = ReplaceWith("LocalMenuController.current"), -) -public class MenuManager( - public val onDismissRequest: (InputMode) -> Boolean, - private val parentMenuManager: MenuManager? = null, -) { - private var isHovered: Boolean = false - - /** - * Called when the hovered state of the menu changes. This is used to abort parent menu closing in unforced mode - * when submenu closed by click parent menu's item. - * - * @param hovered true if the menu is hovered, false otherwise. - */ - internal fun onHoveredChange(hovered: Boolean) { - isHovered = hovered - } - - /** - * Close all menus in the hierarchy. - * - * @param mode the input mode, menus close by pointer or keyboard event. - * @param force true to force close all menus ignore parent hover state, false otherwise. - */ - public fun closeAll(mode: InputMode, force: Boolean) { - // We ignore the pointer event if the menu is hovered in unforced mode. - if (!force && mode == InputMode.Touch && isHovered) return - - if (onDismissRequest(mode)) { - parentMenuManager?.closeAll(mode, force) - } - } - - public fun close(mode: InputMode): Boolean = onDismissRequest(mode) - - public fun isRootMenu(): Boolean = parentMenuManager == null - - public fun isSubmenu(): Boolean = parentMenuManager != null - - public fun submenuManager(onDismissRequest: (InputMode) -> Boolean): MenuManager = - MenuManager(onDismissRequest = onDismissRequest, parentMenuManager = this) -} - -@Suppress("DEPRECATION") -@Deprecated( - message = - "The MenuManager class has been superseded by the MenuController interface, " + - "which offers improved abstraction and new functionalities like shortcut management. " + - "You can use the LocalMenuController composition local to access the MenuController instance.", - replaceWith = ReplaceWith("LocalMenuController.current"), -) -public val LocalMenuManager: ProvidableCompositionLocal = staticCompositionLocalOf { - error("No MenuManager provided. Have you forgotten the theme?") -} diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SimpleListItem.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SimpleListItem.kt index d41c0c1d1af3..e23beae25f2f 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SimpleListItem.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SimpleListItem.kt @@ -350,130 +350,6 @@ public fun SimpleListItem( } } -/** - * A simple list item layout consisting of a content slot and an optional icon to its start side. - * - * The text will only take up one line and is ellipsized if too long to fit. The item will draw a background based on - * the [isSelected] and [isActive] values. - */ -@Deprecated("Use the overload with selected, active, colorFilter and hints") -@Composable -public fun SimpleListItem( - isSelected: Boolean, - modifier: Modifier = Modifier, - iconModifier: Modifier = Modifier, - isActive: Boolean = true, - icon: IconKey? = null, - iconContentDescription: String? = null, - style: SimpleListItemStyle = JewelTheme.simpleListItemStyle, - height: Dp = JewelTheme.globalMetrics.rowHeight, - content: @Composable () -> Unit, -) { - val state = remember(isSelected, isActive) { ListItemState(isSelected, isActive) } - @Suppress("DEPRECATION") - SimpleListItem(state, modifier, iconModifier, icon, iconContentDescription, style, height, content) -} - -/** - * A simple list item layout consisting of a text and an optional icon to its start side. - * - * The text will only take up one line and is ellipsized if too long to fit. The item will draw a background based on - * the [isSelected] and [isActive] values. - */ -@Deprecated("Use the overload with selected, active, colorFilter and hints") -@Composable -public fun SimpleListItem( - @Nls text: String, - isSelected: Boolean, - modifier: Modifier = Modifier, - textModifier: Modifier = Modifier, - iconModifier: Modifier = Modifier, - isActive: Boolean = true, - icon: IconKey? = null, - iconContentDescription: String? = null, - style: SimpleListItemStyle = JewelTheme.simpleListItemStyle, - height: Dp = JewelTheme.globalMetrics.rowHeight, -) { - val state = remember(isSelected, isActive) { ListItemState(isSelected, isActive) } - @Suppress("DEPRECATION") - SimpleListItem(text, state, modifier, textModifier, iconModifier, icon, iconContentDescription, style, height) -} - -/** - * A simple list item layout consisting of a text and an optional icon to its start side. - * - * The text will only take up one line and is ellipsized if too long to fit. The item will draw a background based on - * the [state]. - */ -@Deprecated("Use the overload with selected, active, colorFilter and hints") -@Composable -public fun SimpleListItem( - @Nls text: String, - state: ListItemState, - modifier: Modifier = Modifier, - textModifier: Modifier = Modifier, - iconModifier: Modifier = Modifier, - icon: IconKey? = null, - iconContentDescription: String? = null, - style: SimpleListItemStyle = JewelTheme.simpleListItemStyle, - height: Dp = JewelTheme.globalMetrics.rowHeight, -) { - @Suppress("DEPRECATION") - SimpleListItem(state, modifier, iconModifier, icon, iconContentDescription, style, height) { - Text( - text = text, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - style = JewelTheme.defaultTextStyle, - color = style.colors.contentFor(state).value, - modifier = textModifier, - ) - } -} - -/** - * A simple list item layout consisting of a content slot and an optional icon to its start side. - * - * The text will only take up one line and is ellipsized if too long to fit. The item will draw a background based on - * the [state]. - */ -@Deprecated("Use the overload with selected, active, colorFilter and hints") -@Composable -public fun SimpleListItem( - state: ListItemState, - modifier: Modifier = Modifier, - iconModifier: Modifier = Modifier, - icon: IconKey? = null, - iconContentDescription: String? = null, - style: SimpleListItemStyle = JewelTheme.simpleListItemStyle, - height: Dp = JewelTheme.globalMetrics.rowHeight, - content: @Composable () -> Unit, -) { - Row( - modifier = - modifier - .semantics(mergeDescendants = true) { - selected = state.isSelected - isTraversalGroup = false - } - .fillMaxWidth() - .height(height) - .padding(style.metrics.outerPadding) - .background( - color = style.colors.backgroundFor(state).value, - shape = RoundedCornerShape(style.metrics.selectionBackgroundCornerSize), - ) - .padding(style.metrics.innerPadding), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(style.metrics.iconTextGap), - ) { - if (icon != null) { - Icon(modifier = iconModifier.size(16.dp), key = icon, contentDescription = iconContentDescription) - } - content() - } -} - @GenerateDataFunctions public class ListItemState(public val isSelected: Boolean, public val isActive: Boolean = true) { override fun equals(other: Any?): Boolean { diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt index 53ed01ec9d7f..ad5d3584cb82 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt @@ -34,68 +34,6 @@ import org.jetbrains.jewel.ui.popupShadowAndBorder import org.jetbrains.jewel.ui.theme.tooltipStyle import org.jetbrains.jewel.ui.util.isDark -/** - * A tooltip component that follows the standard visual styling. - * - * Provides a floating tooltip that appears when hovering over or focusing the target content. The tooltip follows - * platform conventions for timing, positioning, and appearance, supporting both mouse and keyboard navigation. - * - * **Guidelines:** [on IJP SDK webhelp](https://plugins.jetbrains.com/docs/intellij/tooltip.html) - * - * **Usage example:** - * [`Tooltips.kt`](https://github.com/JetBrains/intellij-community/blob/master/platform/jewel/samples/showcase/src/main/kotlin/org/jetbrains/jewel/samples/showcase/components/Tooltips.kt) - * - * **Swing equivalent:** - * [`HelpTooltip`](https://github.com/JetBrains/intellij-community/blob/master/platform/platform-api/src/com/intellij/ide/HelpTooltip.java) - * and [How to Use Tool Tips](https://docs.oracle.com/javase/tutorial/uiswing/components/tooltip.html) - * - * @param tooltip The content to be displayed in the tooltip - * @param modifier Modifier to apply to the content's wrapper - * @param enabled Controls whether the tooltip can be shown. When false, it will never show - * @param style The visual styling configuration for the tooltip - * @param tooltipPlacement The placement strategy for positioning the tooltip relative to the content - * @param autoHideBehavior The delay before the tooltip is automatically hidden. Jewel offers three options, matching - * Swing behavior. [AutoHideBehavior.Normal] is a shorter delay (10 seconds) to be used when the tooltip text is a - * single line. [AutoHideBehavior.Long] is a longer delay (30 seconds) to be used when the tooltip text is multi-line. - * [AutoHideBehavior.Never] to never hide the tooltip. [AutoHideBehavior.Normal] and [AutoHideBehavior.Long] durations - * can be altered using [org.jetbrains.jewel.ui.component.styling.TooltipMetrics]. - * @param content The component for which to show the tooltip on hover - * @see com.intellij.ide.HelpTooltip - */ -@Suppress("DEPRECATION") -@Deprecated("Please, use the overload without the [AutoHideBehavior].") -@Composable -public fun Tooltip( - tooltip: @Composable () -> Unit, - modifier: Modifier = Modifier, - enabled: Boolean = true, - style: TooltipStyle = JewelTheme.tooltipStyle, - tooltipPlacement: TooltipPlacement = style.metrics.placement, - autoHideBehavior: AutoHideBehavior = AutoHideBehavior.Normal, - content: @Composable () -> Unit, -) { - JewelTooltipArea( - tooltip = { - TooltipImpl( - enabled = enabled, - style = style, - autoHideBehavior = - when (autoHideBehavior) { - AutoHideBehavior.Normal -> TooltipAutoHideBehavior.Normal - AutoHideBehavior.Long -> TooltipAutoHideBehavior.Long - AutoHideBehavior.Never -> TooltipAutoHideBehavior.Never - }, - tooltip = tooltip, - ) - }, - modifier = modifier, - delayMillis = style.metrics.showDelay.inWholeMilliseconds.toInt(), - tooltipPlacement = tooltipPlacement, - cornerSize = style.metrics.cornerSize, - content = content, - ) -} - /** * A tooltip component that follows the standard visual styling. * @@ -253,16 +191,3 @@ public fun rememberPopupPositionProviderAtFixedPosition( ) } } - -// TODO: When removing it, please replace usages with [TooltipAutoHideBehavior] -@Deprecated( - "Replace with TooltipAutoHideBehavior", - replaceWith = - ReplaceWith("TooltipAutoHideBehavior", "org.jetbrains.jewel.ui.component.styling.TooltipAutoHideBehavior"), - level = DeprecationLevel.WARNING, -) -public enum class AutoHideBehavior { - Never, - Normal, - Long, -} diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Typography.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Typography.kt index 4d76f65a475a..ffc90a774377 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Typography.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Typography.kt @@ -3,32 +3,10 @@ package org.jetbrains.jewel.ui.component import androidx.annotation.Px -import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.Shadow -import androidx.compose.ui.graphics.drawscope.DrawStyle -import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontStyle -import androidx.compose.ui.text.font.FontSynthesis -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.intl.LocaleList -import androidx.compose.ui.text.style.BaselineShift -import androidx.compose.ui.text.style.Hyphens -import androidx.compose.ui.text.style.LineBreak -import androidx.compose.ui.text.style.LineHeightStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextDecoration -import androidx.compose.ui.text.style.TextDirection -import androidx.compose.ui.text.style.TextGeometricTransform -import androidx.compose.ui.text.style.TextIndent -import androidx.compose.ui.text.style.TextMotion import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType import androidx.compose.ui.unit.isUnspecified -import androidx.compose.ui.unit.sp import java.awt.Font import java.awt.GraphicsEnvironment import java.awt.RenderingHints @@ -38,210 +16,6 @@ import java.awt.image.BufferedImage import java.awt.image.BufferedImage.TYPE_INT_ARGB import org.jetbrains.annotations.ApiStatus import org.jetbrains.jewel.foundation.ExperimentalJewelApi -import org.jetbrains.jewel.foundation.theme.JewelTheme -import org.jetbrains.jewel.ui.component.Typography.DefaultLineHeightMultiplier -import org.jetbrains.jewel.ui.component.Typography.editorTextStyle - -/** - * A quick way to obtain text styles derived from [the default `TextStyle`][JewelTheme.defaultTextStyle]. These match - * the functionality provided by `JBFont` in the IntelliJ Platform. - */ -@Deprecated( - "Use JewelTheme.typography instead", - ReplaceWith( - "JewelTheme.typography", - "org.jetbrains.jewel.foundation.theme.JewelTheme", - "org.jetbrains.jewel.ui.typography", - ), -) -public object Typography { - /** The text style to use for labels. Identical to [JewelTheme.defaultTextStyle]. */ - @Composable public fun labelTextStyle(): TextStyle = JewelTheme.defaultTextStyle - - /** The text size to use for labels. Identical to the size set in [JewelTheme.defaultTextStyle]. */ - @Composable public fun labelTextSize(): TextUnit = JewelTheme.defaultTextStyle.fontSize - - @Suppress("ktlint:standard:property-naming", "ConstPropertyName") - /** - * The factor to use when creating a [TextStyle] with a changed font size: - * ```kotlin - * myTextStyle.copy( - * fontSize = newFontSize, - * lineHeight = newFontSize * Typography.DefaultLineHeightMultiplier, - * ) - * ``` - * - * You should use [TextStyle.copyWithSize] to create copies of a [TextStyle] with a changed font size, as that - * function will automatically apply the correct line height, too. - * - * @see TextStyle.copyWithSize - */ - @Deprecated("No longer used") - public const val DefaultLineHeightMultiplier: Float = 1.3f - - @Suppress("ktlint:standard:property-naming", "ConstPropertyName") - /** - * The factor to use when creating an editor [TextStyle] with a changed font size: - * ```kotlin - * myTextStyle.copy( - * fontSize = newFontSize, - * lineHeight = newFontSize * Typography.DefaultLineHeightMultiplier, - * ) - * ``` - * - * You should use [TextStyle.copyWithSize] to create copies of a [TextStyle] with a changed font size, as that - * function will automatically apply the correct line height, too. - */ - @Deprecated("No longer used") - public const val EditorLineHeightMultiplier: Float = 1.5f - - /** The text style to use for h0 titles. Derived from [JewelTheme.defaultTextStyle]. */ - @Composable - public fun h0TextStyle(): TextStyle = - JewelTheme.defaultTextStyle.copy(fontSize = labelTextSize() + 12.sp, fontWeight = FontWeight.Bold) - - /** The text style to use for h1 titles. Derived from [JewelTheme.defaultTextStyle]. */ - @Composable - public fun h1TextStyle(): TextStyle = - JewelTheme.defaultTextStyle.copy(fontSize = labelTextSize() + 9.sp, fontWeight = FontWeight.Bold) - - /** The text style to use for h2 titles. Derived from [JewelTheme.defaultTextStyle]. */ - @Composable - public fun h2TextStyle(): TextStyle = JewelTheme.defaultTextStyle.copy(fontSize = labelTextSize() + 5.sp) - - /** The text style to use for h3 titles. Derived from [JewelTheme.defaultTextStyle]. */ - @Composable - public fun h3TextStyle(): TextStyle = JewelTheme.defaultTextStyle.copy(fontSize = labelTextSize() + 3.sp) - - /** The text style to use for h4 titles. Derived from [JewelTheme.defaultTextStyle]. */ - @Composable - public fun h4TextStyle(): TextStyle = - JewelTheme.defaultTextStyle.copy(fontSize = labelTextSize() + 1.sp, fontWeight = FontWeight.Bold) - - /** The text style used for code editors. Usually is a monospaced font. */ - @Composable public fun editorTextStyle(): TextStyle = JewelTheme.editorTextStyle - - /** The text style used for code consoles. Usually is a monospaced font. Can be the same as [editorTextStyle]. */ - @Composable public fun consoleTextStyle(): TextStyle = JewelTheme.consoleTextStyle -} - -/** - * Creates a copy of this [TextStyle] with a new [fontSize] and an appropriately set line height. - * - * @see Typography.DefaultLineHeightMultiplier - */ -@Deprecated("Use computeLineHeightPx() to set the line height appropriately instead.") -public fun TextStyle.copyWithSize( - fontSize: TextUnit, - color: Color = this.color, - fontWeight: FontWeight? = this.fontWeight, - fontStyle: FontStyle? = this.fontStyle, - fontSynthesis: FontSynthesis? = this.fontSynthesis, - fontFamily: FontFamily? = this.fontFamily, - fontFeatureSettings: String? = this.fontFeatureSettings, - letterSpacing: TextUnit = this.letterSpacing, - baselineShift: BaselineShift? = this.baselineShift, - textGeometricTransform: TextGeometricTransform? = this.textGeometricTransform, - localeList: LocaleList? = this.localeList, - background: Color = this.background, - textDecoration: TextDecoration? = this.textDecoration, - shadow: Shadow? = this.shadow, - drawStyle: DrawStyle? = this.drawStyle, - textAlign: TextAlign = this.textAlign, - textDirection: TextDirection = this.textDirection, - textIndent: TextIndent? = this.textIndent, - platformStyle: PlatformTextStyle? = this.platformStyle, - lineHeightStyle: LineHeightStyle? = this.lineHeightStyle, - lineBreak: LineBreak = this.lineBreak, - hyphens: Hyphens = this.hyphens, - textMotion: TextMotion? = this.textMotion, -): TextStyle = - copy( - color, - fontSize, - fontWeight, - fontStyle, - fontSynthesis, - fontFamily, - fontFeatureSettings, - letterSpacing, - baselineShift, - textGeometricTransform, - localeList, - background, - textDecoration, - shadow, - drawStyle, - textAlign, - textDirection, - lineHeight = fontSize * DefaultLineHeightMultiplier, - textIndent, - platformStyle, - lineHeightStyle, - lineBreak, - hyphens, - textMotion, - ) - -/** - * Creates a copy of this [TextStyle] with a new [fontSize] and an appropriately set line height. - * - * @see Typography.DefaultLineHeightMultiplier - */ -@Deprecated("Use computeLineHeightPx() to set the line height appropriately instead.") -public fun TextStyle.copyWithSize( - fontSize: TextUnit, - brush: Brush?, - alpha: Float = this.alpha, - fontWeight: FontWeight? = this.fontWeight, - fontStyle: FontStyle? = this.fontStyle, - fontSynthesis: FontSynthesis? = this.fontSynthesis, - fontFamily: FontFamily? = this.fontFamily, - fontFeatureSettings: String? = this.fontFeatureSettings, - letterSpacing: TextUnit = this.letterSpacing, - baselineShift: BaselineShift? = this.baselineShift, - textGeometricTransform: TextGeometricTransform? = this.textGeometricTransform, - localeList: LocaleList? = this.localeList, - background: Color = this.background, - textDecoration: TextDecoration? = this.textDecoration, - shadow: Shadow? = this.shadow, - drawStyle: DrawStyle? = this.drawStyle, - textAlign: TextAlign = this.textAlign, - textDirection: TextDirection = this.textDirection, - textIndent: TextIndent? = this.textIndent, - platformStyle: PlatformTextStyle? = this.platformStyle, - lineHeightStyle: LineHeightStyle? = this.lineHeightStyle, - lineBreak: LineBreak = this.lineBreak, - hyphens: Hyphens = this.hyphens, - textMotion: TextMotion? = this.textMotion, -): TextStyle = - copy( - brush, - alpha, - fontSize, - fontWeight, - fontStyle, - fontSynthesis, - fontFamily, - fontFeatureSettings, - letterSpacing, - baselineShift, - textGeometricTransform, - localeList, - background, - textDecoration, - shadow, - drawStyle, - textAlign, - textDirection, - lineHeight = fontSize * DefaultLineHeightMultiplier, - textIndent, - platformStyle, - lineHeightStyle, - lineBreak, - hyphens, - textMotion, - ) public operator fun TextUnit.plus(other: TextUnit): TextUnit = when { diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt index 357fcaa1f229..53e8c6cffe0b 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt @@ -264,14 +264,6 @@ public class ChipMetrics( public val borderWidthSelected: Dp, public val minSize: DpSize, ) { - @Deprecated("Use the version with 'minSize' instead") - public constructor( - cornerSize: CornerSize, - padding: PaddingValues, - borderWidth: Dp, - borderWidthSelected: Dp, - ) : this(cornerSize, padding, borderWidth, borderWidthSelected, DpSize.Zero) - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt index 116fc7077604..92aa57a7c7ba 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt @@ -120,9 +120,8 @@ public class MenuItemColors( public val keybindingTintHovered: Color, public val separator: Color, ) { - @Deprecated("This is being made private") @Composable - public fun backgroundFor(state: MenuItemState): State = + internal fun backgroundFor(state: MenuItemState): State = rememberUpdatedState( state.chooseValue( normal = background, @@ -134,9 +133,8 @@ public class MenuItemColors( ) ) - @Deprecated("This is being made private") @Composable - public fun contentFor(state: MenuItemState): State = + internal fun contentFor(state: MenuItemState): State = rememberUpdatedState( state.chooseValue( normal = content, @@ -148,9 +146,8 @@ public class MenuItemColors( ) ) - @Deprecated("This is being made private") @Composable - public fun iconTintFor(state: MenuItemState): State = + internal fun iconTintFor(state: MenuItemState): State = rememberUpdatedState( state.chooseValue( normal = iconTint, @@ -162,9 +159,8 @@ public class MenuItemColors( ) ) - @Deprecated("This is being made private") @Composable - public fun keybindingTintFor(state: MenuItemState): State = + internal fun keybindingTintFor(state: MenuItemState): State = rememberUpdatedState( state.chooseValue( normal = keybindingTint, diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt index 2cd9bbad1a78..54289725f70a 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt @@ -12,8 +12,6 @@ import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds -import org.jetbrains.annotations.ApiStatus -import org.jetbrains.jewel.foundation.ExperimentalJewelApi import org.jetbrains.jewel.foundation.GenerateDataFunctions import org.jetbrains.jewel.ui.component.FixedCursorPoint @@ -109,27 +107,6 @@ public class TooltipMetrics( public val regularDisappearDelay: Duration, public val fullDisappearDelay: Duration, ) { - @Deprecated("Use the constructor with regularDisappearDelay and fullDisappearDelay parameters.") - @ApiStatus.Experimental - @ExperimentalJewelApi - public constructor( - contentPadding: PaddingValues, - showDelay: Duration, - cornerSize: CornerSize, - borderWidth: Dp, - shadowSize: Dp, - placement: TooltipPlacement, - ) : this( - contentPadding, - showDelay, - cornerSize, - borderWidth, - shadowSize, - placement, - 10000.milliseconds, - 30000.milliseconds, - ) - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -174,26 +151,6 @@ public class TooltipMetrics( } public companion object { - @Deprecated("Use the version with `regularDisappearDelay` and `fullDisappearDelay` parameters.") - public fun defaults( - contentPadding: PaddingValues = PaddingValues(vertical = 9.dp, horizontal = 12.dp), - showDelay: Duration = 500.milliseconds, // ide.tooltip.initialReshowDelay - cornerSize: CornerSize = CornerSize(4.dp), - borderWidth: Dp = 1.dp, - shadowSize: Dp = 12.dp, - placement: TooltipPlacement = FixedCursorPoint(DpOffset(4.dp, 24.dp)), - ): TooltipMetrics = - TooltipMetrics( - contentPadding, - showDelay, - cornerSize, - borderWidth, - shadowSize, - placement, - 10000.milliseconds, - 30000.milliseconds, - ) - public fun defaults( contentPadding: PaddingValues = PaddingValues(vertical = 9.dp, horizontal = 12.dp), showDelay: Duration = 500.milliseconds, // ide.tooltip.initialReshowDelay diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt index 8d467cacf0cf..aab194cf59d2 100644 --- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt +++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt @@ -5,18 +5,6 @@ import androidx.compose.ui.graphics.luminance import java.awt.Color as AwtColor import kotlin.math.roundToInt -/** - * Converts an AWT [`Color`][AwtColor] into a hex string with a `#RRGGBB(AA)` format. - * - * For example, a translucent white color will be converted to `#FFFFFF1A`. Note that the alpha component is only added - * if the color is not fully opaque. - */ -@Deprecated( - "Use the overload with default parameters instead.", - replaceWith = ReplaceWith("toRgbaHexString(omitAlphaWhenFullyOpaque = true)"), -) -public fun AwtColor.toRgbaHexString(): String = toRgbaHexString(omitAlphaWhenFullyOpaque = true) - /** * Converts an AWT [`Color`][AwtColor] to a hex string in an RGBA format like `#(RR)GGBBAA`. * @@ -42,18 +30,6 @@ public fun AwtColor.toRgbaHexString( return formatColorRgbaHexString(r, g, b, alpha, includeHashSymbol, omitAlphaWhenFullyOpaque) } -/** - * Converts a [Color] to a hex string with a `#RRGGBB(AA)` format. - * - * For example, a translucent white color will be converted to `#FFFFFF1A`. Note that the alpha component is only added - * if the color is not fully opaque. - */ -@Deprecated( - "Use the overload with default parameters instead.", - replaceWith = ReplaceWith("toRgbaHexString(omitAlphaWhenFullyOpaque = true)"), -) -public fun Color.toRgbaHexString(): String = toRgbaHexString(omitAlphaWhenFullyOpaque = true) - /** * Converts a [Color] to a hex string in an RGBA format like `#RRGGBB(AA)`. * @@ -165,21 +141,6 @@ private fun formatColorArgbHexString( append(bString.padStart(2, '0')) } -/** - * Converts a hex string in RGBA format to a [Color]. - * - * This function supports the following formats, with or without a leading `#`: - * - `RGB` (e.g., `F00` for opaque red) - * - `RGBA` (e.g., `F00A` for a red with ~66% alpha) - * - `RRGGBB` (e.g., `FF0000` for opaque red) - * - `RRGGBBAA` (e.g., `FF0000AA` for a red with ~66% alpha) - * - * Note that the alpha component is placed at the end of the string. Returns `null` if the hex string is not a valid - * color representation. - */ -@Deprecated("Use fromRgbaHexStringOrNull() instead.", replaceWith = ReplaceWith("fromRgbaHexStringOrNull(rgba)")) -public fun Color.Companion.fromRGBAHexStringOrNull(rgba: String): Color? = fromRgbaHexStringOrNull(rgba) - /** * Converts a hex string in RGBA format to a [Color]. * diff --git a/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/rightTab/WelcomeScreenRightTab.kt b/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/rightTab/WelcomeScreenRightTab.kt index 421f52198c59..b70b98f9ae39 100644 --- a/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/rightTab/WelcomeScreenRightTab.kt +++ b/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/rightTab/WelcomeScreenRightTab.kt @@ -469,8 +469,8 @@ class WelcomeScreenRightTab( ) { item, isSelected, isActive -> SimpleListItem( text = item, - isSelected = isSelected, - isActive = isActive, + selected = isSelected, + active = isActive, iconContentDescription = item, ) }