Fix remembers painter twice and break the cache (#303)

* Fix remembers painter twice to break the cache * Make hints happy
JetBrains · Feb 17, 2024 · d587c1f · d587c1f
1 parent d8ddff1
commit d587c1f
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 17 deletions.
diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
@@ -843,3 +843,7 @@ public final class org/jetbrains/jewel/foundation/theme/ThemeIconData$Companion
 	public final fun getEmpty ()Lorg/jetbrains/jewel/foundation/theme/ThemeIconData;
 }
 
+public final class org/jetbrains/jewel/foundation/util/DebugKt {
+	public static final fun getInDebugMode ()Z
+}
+
diff --git a/...tlin/org/jetbrains/jewel/ui/util/Debug.kt → .../jetbrains/jewel/foundation/util/Debug.kt b/...tlin/org/jetbrains/jewel/ui/util/Debug.kt → .../jetbrains/jewel/foundation/util/Debug.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.ui.util
+package org.jetbrains.jewel.foundation.util
 
 import org.jetbrains.jewel.foundation.InternalJewelApi
 

diff --git a/...etbrains/jewel/foundation/utils/Logger.kt → ...jetbrains/jewel/foundation/util/Logger.kt b/...etbrains/jewel/foundation/utils/Logger.kt → ...jetbrains/jewel/foundation/util/Logger.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.utils
+package org.jetbrains.jewel.foundation.util
 
 internal enum class LogLevel(val color: String) {
     Trace("\u001b[38;5;33m"),

diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
@@ -8,13 +8,13 @@ import com.intellij.ui.NewUI
 import org.jetbrains.jewel.bridge.theme.isNewUiTheme
 import org.jetbrains.jewel.foundation.InternalJewelApi
 import org.jetbrains.jewel.foundation.theme.JewelTheme
+import org.jetbrains.jewel.foundation.util.inDebugMode
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider
 import org.jetbrains.jewel.ui.painter.hints.ColorBasedPaletteReplacement
 import org.jetbrains.jewel.ui.painter.hints.Dark
 import org.jetbrains.jewel.ui.painter.hints.HiDpi
 import org.jetbrains.jewel.ui.painter.hints.KeyBasedPaletteReplacement
-import org.jetbrains.jewel.ui.util.inDebugMode
 import org.jetbrains.jewel.ui.util.toRgbaHexString
 
 /**

diff --git a/...ne/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt b/...ne/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt
@@ -4,14 +4,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.foundation.theme.ThemeDefinition
+import org.jetbrains.jewel.foundation.util.inDebugMode
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PalettePainterHintsProvider
 import org.jetbrains.jewel.ui.painter.hints.ColorBasedPaletteReplacement
 import org.jetbrains.jewel.ui.painter.hints.Dark
 import org.jetbrains.jewel.ui.painter.hints.HiDpi
 import org.jetbrains.jewel.ui.painter.hints.KeyBasedPaletteReplacement
 import org.jetbrains.jewel.ui.painter.hints.PathOverride
-import org.jetbrains.jewel.ui.util.inDebugMode
 
 /** Provides the default [PainterHint]s to use to load images. */
 public class StandalonePainterHintsProvider(

diff --git a/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt b/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt
@@ -44,7 +44,7 @@ import org.jetbrains.jewel.ui.component.ToggleableChip
 import org.jetbrains.jewel.ui.theme.colorPalette
 
 @Composable
-@View(title = "ChipsAndTree", position = 11)
+@View(title = "ChipsAndTree", position = 11, icon = "icons/showAsTree.svg")
 fun ChipsAndTree() {
     Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(16.dp)) {
         Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(8.dp)) {

diff --git a/samples/standalone/src/main/resources/icons/showAsTree.svg b/samples/standalone/src/main/resources/icons/showAsTree.svg
diff --git a/samples/standalone/src/main/resources/icons/showAsTree_dark.svg b/samples/standalone/src/main/resources/icons/showAsTree_dark.svg
diff --git a/ui/api/ui.api b/ui/api/ui.api
@@ -2378,10 +2378,6 @@ public final class org/jetbrains/jewel/ui/util/ColorExtensionsKt {
 	public static final fun toRgbaHexString-8_81llA (J)Ljava/lang/String;
 }
 
-public final class org/jetbrains/jewel/ui/util/DebugKt {
-	public static final fun getInDebugMode ()Z
-}
-
 public final class org/jetbrains/jewel/ui/util/ModifierExtensionsKt {
 	public static final fun thenIf (Landroidx/compose/ui/Modifier;ZLkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
 }

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.res.loadImageBitmap
 import androidx.compose.ui.res.loadSvgPainter
 import androidx.compose.ui.res.loadXmlImageVector
 import androidx.compose.ui.unit.Density
-import org.jetbrains.jewel.ui.util.inDebugMode
+import org.jetbrains.jewel.foundation.util.inDebugMode
 import org.w3c.dom.Document
 import org.xml.sax.InputSource
 import java.io.IOException
@@ -126,7 +126,7 @@ public class ResourcePainterProvider(
             when (extension) {
                 "svg" -> createSvgPainter(chosenScope, url)
                 "xml" -> createVectorDrawablePainter(chosenScope, url)
-                else -> createBitmapPainter(chosenScope, url)
+                else -> createBitmapPainter(url)
             }
 
         for (hint in scope.acceptedHints) {
@@ -166,7 +166,7 @@ public class ResourcePainterProvider(
                     loadSvgPainter(inputStream, scope)
                 }
             },
-            rememberAction = { remember(url, scope.density) { it } },
+            paintAction = { it },
         )
 
     private fun patchSvg(
@@ -205,27 +205,26 @@ public class ResourcePainterProvider(
             loadingAction = { resourceUrl ->
                 resourceUrl.openStream().use { loadXmlImageVector(InputSource(it), scope) }
             },
-            rememberAction = { rememberVectorPainter(it) },
+            paintAction = { rememberVectorPainter(it) },
         )
 
     @Composable
     private fun createBitmapPainter(
-        scope: Scope,
         url: URL,
     ) = tryLoadingResource(
         url = url,
         loadingAction = { resourceUrl ->
             val bitmap = resourceUrl.openStream().use { loadImageBitmap(it) }
             BitmapPainter(bitmap)
         },
-        rememberAction = { remember(url, scope.density) { it } },
+        paintAction = { it },
     )
 
     @Composable
     private fun <T> tryLoadingResource(
         url: URL,
         loadingAction: (URL) -> T,
-        rememberAction: @Composable (T) -> Painter,
+        paintAction: @Composable (T) -> Painter,
     ): Painter {
         @Suppress("TooGenericExceptionCaught") // This is a last-resort fallback when icons fail to load
         val painter =
@@ -241,7 +240,7 @@ public class ResourcePainterProvider(
                 return errorPainter
             }
 
-        return rememberAction(painter)
+        return paintAction(painter)
     }
 
     private class Scope(

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkAndStroke.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkAndStroke.kt
@@ -60,6 +60,19 @@ private class StrokeImpl(private val color: Color) : PainterSuffixHint(), Painte
         Color(0xFFF28C35),
         Color(0xFF955AE0),
     )
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is StrokeImpl) return false
+
+        if (color != other.color) return false
+
+        return true
+    }
+
+    override fun toString(): String = "Stroke(color=$color)"
+
+    override fun hashCode(): Int = color.hashCode()
 }
 
 /**