From 1abfc82616d4993e9740a523e6086b726e2e3031 Mon Sep 17 00:00:00 2001 From: fscarponi Date: Fri, 29 Sep 2023 11:00:27 +0200 Subject: [PATCH] Remove unused spinner SVG files --- .../jewel/CircularProgressIndicator.kt | 106 +++++++----------- .../jewel/styling/CircularProgressStyle.kt | 3 + .../org/jetbrains/jewel/bridge/IntUiBridge.kt | 6 +- .../jewel/intui/standalone/IntUiTheme.kt | 4 +- .../styling/IntUiCircularProgressStyle.kt | 8 +- .../intui/animated/bigSpinner/spinner1.svg | 15 --- .../animated/bigSpinner/spinner1_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner2.svg | 15 --- .../animated/bigSpinner/spinner2_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner3.svg | 15 --- .../animated/bigSpinner/spinner3_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner4.svg | 15 --- .../animated/bigSpinner/spinner4_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner5.svg | 15 --- .../animated/bigSpinner/spinner5_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner6.svg | 15 --- .../animated/bigSpinner/spinner6_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner7.svg | 15 --- .../animated/bigSpinner/spinner7_dark.svg | 15 --- .../intui/animated/bigSpinner/spinner8.svg | 15 --- .../animated/bigSpinner/spinner8_dark.svg | 15 --- .../intui/animated/smallSpinner/spinner1.svg | 14 --- .../animated/smallSpinner/spinner1_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner2.svg | 14 --- .../animated/smallSpinner/spinner2_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner3.svg | 14 --- .../animated/smallSpinner/spinner3_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner4.svg | 14 --- .../animated/smallSpinner/spinner4_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner5.svg | 14 --- .../animated/smallSpinner/spinner5_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner6.svg | 14 --- .../animated/smallSpinner/spinner6_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner7.svg | 14 --- .../animated/smallSpinner/spinner7_dark.svg | 14 --- .../intui/animated/smallSpinner/spinner8.svg | 14 --- .../animated/smallSpinner/spinner8_dark.svg | 14 --- .../samples/ideplugin/JewelDemoToolWindow.kt | 4 +- 38 files changed, 58 insertions(+), 537 deletions(-) delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7_dark.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8.svg delete mode 100644 int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8_dark.svg diff --git a/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt b/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt index 2c68ba458b..c9b174305b 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/CircularProgressIndicator.kt @@ -20,12 +20,10 @@ import org.jetbrains.jewel.util.toHexString @Composable fun CircularProgressIndicator( modifier: Modifier = Modifier, - svgLoader: SvgLoader, style: CircularProgressStyle = IntelliJTheme.circularProgressStyle, ) { CircularProgressIndicatorImpl( modifier = modifier, - svgLoader = svgLoader, style = style, iconSize = DpSize(16.dp, 16.dp), frameRetriever = { color -> SpinnerProgressIconGenerator.Small.generateSvgFrames(color.toHexString()) } @@ -35,12 +33,10 @@ fun CircularProgressIndicator( @Composable fun CircularProgressIndicatorBig( modifier: Modifier = Modifier, - svgLoader: SvgLoader, style: CircularProgressStyle = IntelliJTheme.circularProgressStyle, ) { CircularProgressIndicatorImpl( modifier = modifier, - svgLoader = svgLoader, style = style, iconSize = DpSize(32.dp, 32.dp), frameRetriever = { color -> SpinnerProgressIconGenerator.Big.generateSvgFrames(color.toHexString()) } @@ -50,7 +46,6 @@ fun CircularProgressIndicatorBig( @Composable private fun CircularProgressIndicatorImpl( modifier: Modifier = Modifier, - svgLoader: SvgLoader, iconSize: DpSize, style: CircularProgressStyle, frameRetriever: (Color) -> List, @@ -64,7 +59,7 @@ private fun CircularProgressIndicatorImpl( } else { Icon( modifier = modifier.size(iconSize), - painter = svgLoader.loadRawSvg( + painter = style.svgLoader.loadRawSvg( currentFrame.first, "circularProgressIndicator_frame_${currentFrame.second}" ), @@ -88,82 +83,59 @@ object SpinnerProgressIconGenerator { private val opacityList = listOf(1.0f, 0.93f, 0.78f, 0.69f, 0.62f, 0.48f, 0.38f, 0.0f) - private val rotations = listOf(0, -45, 0, 45, 0, -45, 0, 45) - - // for a 16x16 icon - private val points = listOf( - 7f to 1f, - 2.34961f to 3.76416f, - 1f to 7f, - 5.17871f to 9.40991f, - 7f to 11f, - 9.41016f to 10.8242f, - 11f to 7f, - 12.2383f to 2.34961f, - ) - private fun StringBuilder.closeRoot() = append("") private fun StringBuilder.openRoot(sizePx: Int) = append( - "" + "" ) private fun generateSvgIcon( - step: Int, - pointList: List>, + size: Int, + opacityListShifted: List, colorHex: String, - thickness: Int, - length: Int, - cornerRadius: Int, ) = buildString { - openRoot(16) - for (index in 0..opacityList.lastIndex) { - val currentIndex = (index + step + 1) % opacityList.size - val currentOpacity = opacityList[currentIndex] - if (currentOpacity == 0.0f) continue - element( - colorHex = colorHex, - opacity = currentOpacity, - x = pointList[index].first, - y = pointList[index].second, - width = thickness, - height = length, - rx = cornerRadius, - rotation = rotations[index], - ) - } + openRoot(size) + elements( + colorHex = colorHex, + opacityList = opacityListShifted, + ) closeRoot() } - private fun StringBuilder.element( + private fun StringBuilder.elements( colorHex: String, - opacity: Float, - x: Float, - y: Float, - width: Int, - height: Int, - rx: Int, - rotation: Int, + opacityList: List, ) { - append("\n") + append( + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + ) } object Small { fun generateSvgFrames(colorHex: String) = buildList { - for (index in 0..opacityList.lastIndex) { + val opacityListShifted = opacityList.toMutableList() + repeat(opacityList.count()) { add( generateSvgIcon( - step = index, - pointList = points, + size = 16, colorHex = colorHex, - thickness = 2, - length = 4, - cornerRadius = 1 + opacityListShifted = opacityListShifted ) ) + opacityListShifted.shtr() } } } @@ -171,18 +143,22 @@ object SpinnerProgressIconGenerator { object Big { fun generateSvgFrames(colorHex: String) = buildList { - for (index in 0..opacityList.lastIndex) { + val opacityListShifted = opacityList.toMutableList() + repeat(opacityList.count()) { add( generateSvgIcon( - step = index, - pointList = points.map { it.first * 2f to it.second * 2f }, + size = 32, colorHex = colorHex, - thickness = 4, - length = 8, - cornerRadius = 2, + opacityListShifted = opacityListShifted ) ) + opacityListShifted.shtr() } } } + + private fun MutableList.shtr() { + add(first()) + removeFirst() + } } diff --git a/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt b/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt index 6c4c77b604..a7022ea385 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/styling/CircularProgressStyle.kt @@ -2,9 +2,12 @@ package org.jetbrains.jewel.styling import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color +import org.jetbrains.jewel.SvgLoader import kotlin.time.Duration interface CircularProgressStyle { + + val svgLoader: SvgLoader val frameTime: Duration val color: Color } diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt index 1a6bf9c970..18c12c71b2 100644 --- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt +++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt @@ -162,7 +162,7 @@ internal fun createSwingIntUiComponentStyling( radioButtonStyle = readRadioButtonStyle(theme.iconData, svgLoader), scrollbarStyle = readScrollbarStyle(theme.isDark), textAreaStyle = readTextAreaStyle(textAreaTextStyle, textFieldStyle.metrics), - circularProgressStyle = readCircularProgressStyle(theme.isDark), + circularProgressStyle = readCircularProgressStyle(svgLoader, theme.isDark), textFieldStyle = textFieldStyle, ) } @@ -886,11 +886,13 @@ private fun readEditorTabStyle(iconData: IntelliJThemeIconData, svgLoader: SvgLo } private fun readCircularProgressStyle( + svgLoader: SvgLoader, isDark: Boolean, ): IntUiCircularProgressStyle = IntUiCircularProgressStyle( + svgLoader = svgLoader, frameTime = 125.milliseconds, color = retrieveColorOrUnspecified("ProgressIcon.color") - .takeIf { it.isSpecified } + .takeIf { it.isSpecified && it.alpha > 0f } ?: if (isDark) Color(0xFF6F737A) else Color(0xFFA8ADBD), ) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt index 8fc6c3a8ce..0bbbc1bca4 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt @@ -130,7 +130,7 @@ object IntUiTheme : BaseIntUiTheme { lazyTreeStyle: LazyTreeStyle = IntUiLazyTreeStyle.dark(svgLoader), defaultTabStyle: TabStyle = IntUiTabStyle.Default.dark(svgLoader), editorTabStyle: TabStyle = IntUiTabStyle.Editor.dark(svgLoader), - circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.dark(), + circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.dark(svgLoader), ) = IntelliJComponentStyling( checkboxStyle = checkboxStyle, @@ -173,7 +173,7 @@ object IntUiTheme : BaseIntUiTheme { lazyTreeStyle: LazyTreeStyle = IntUiLazyTreeStyle.light(svgLoader), defaultTabStyle: TabStyle = IntUiTabStyle.Default.light(svgLoader), editorTabStyle: TabStyle = IntUiTabStyle.Editor.light(svgLoader), - circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.light(), + circularProgressStyle: CircularProgressStyle = IntUiCircularProgressStyle.light(svgLoader), ) = IntelliJComponentStyling( checkboxStyle = checkboxStyle, chipStyle = chipStyle, diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyle.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyle.kt index 20d99bb970..9aad1e4529 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyle.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyle.kt @@ -2,12 +2,14 @@ package org.jetbrains.jewel.intui.standalone.styling import androidx.compose.runtime.Stable import androidx.compose.ui.graphics.Color +import org.jetbrains.jewel.SvgLoader import org.jetbrains.jewel.styling.CircularProgressStyle import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @Stable data class IntUiCircularProgressStyle( + override val svgLoader: SvgLoader, override val frameTime: Duration, override val color: Color, ) : CircularProgressStyle { @@ -15,13 +17,15 @@ data class IntUiCircularProgressStyle( companion object { fun dark( + svgLoader: SvgLoader, frameTime: Duration = 125.milliseconds, color: Color = Color(0xFF6F737A), - ) = IntUiCircularProgressStyle(frameTime, color) + ) = IntUiCircularProgressStyle(svgLoader, frameTime, color) fun light( + svgLoader: SvgLoader, frameTime: Duration = 125.milliseconds, color: Color = Color(0xFFA8ADBD), - ) = IntUiCircularProgressStyle(frameTime, color) + ) = IntUiCircularProgressStyle(svgLoader, frameTime, color) } } diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1.svg deleted file mode 100644 index f6b21c518f..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1_dark.svg deleted file mode 100644 index cafe3975c4..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner1_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2.svg deleted file mode 100644 index aca2c137f9..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2_dark.svg deleted file mode 100644 index 85fc3d8b85..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner2_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3.svg deleted file mode 100644 index 1a1f452bc0..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3_dark.svg deleted file mode 100644 index c665f3d3c9..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner3_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4.svg deleted file mode 100644 index a6c00d1df6..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4_dark.svg deleted file mode 100644 index 5a033b71f8..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner4_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5.svg deleted file mode 100644 index e4c2b4501f..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5_dark.svg deleted file mode 100644 index e34213a105..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner5_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6.svg deleted file mode 100644 index da4d407cfb..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6_dark.svg deleted file mode 100644 index b9af56ba22..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner6_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7.svg deleted file mode 100644 index 108c97ac2c..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7_dark.svg deleted file mode 100644 index 0a18eb2d3d..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner7_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8.svg deleted file mode 100644 index 0c579f3776..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8_dark.svg deleted file mode 100644 index 3c1ec39ff9..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/bigSpinner/spinner8_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1.svg deleted file mode 100644 index 32255c07c5..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1_dark.svg deleted file mode 100644 index 57e05a6e53..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner1_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2.svg deleted file mode 100644 index 3cf6ac3a51..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2_dark.svg deleted file mode 100644 index 25b4b64fdb..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner2_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3.svg deleted file mode 100644 index 5cf09a8749..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3_dark.svg deleted file mode 100644 index 8686f242ab..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner3_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4.svg deleted file mode 100644 index c65ed47197..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4_dark.svg deleted file mode 100644 index 1f897c80b1..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner4_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5.svg deleted file mode 100644 index 20bb2ee8a9..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5_dark.svg deleted file mode 100644 index c829a98a05..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner5_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6.svg deleted file mode 100644 index 1e8b1bd4f3..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6_dark.svg deleted file mode 100644 index 5cf2f25721..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner6_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7.svg deleted file mode 100644 index a39a3c8bc5..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7_dark.svg deleted file mode 100644 index 07e85ef411..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner7_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8.svg deleted file mode 100644 index 3825ac8359..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8_dark.svg b/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8_dark.svg deleted file mode 100644 index d9af1f8edc..0000000000 --- a/int-ui/int-ui-standalone/src/main/resources/icons/intui/animated/smallSpinner/spinner8_dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt index 1ade106fdd..2022d77bed 100644 --- a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt +++ b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt @@ -143,11 +143,11 @@ internal class JewelDemoToolWindow : ToolWindowFactory, DumbAware { Row { Text("Circular progress small: ") - CircularProgressIndicator(svgLoader = svgLoader) + CircularProgressIndicator() } Row(verticalAlignment = Alignment.CenterVertically) { Text("Circular progress big: ") - CircularProgressIndicatorBig(svgLoader = svgLoader) + CircularProgressIndicatorBig() } } }