From 27cbc2aa23872362260d0fb7cacdd10b596da46b Mon Sep 17 00:00:00 2001
From: Kyant0 <kyant2021@outlook.com>
Date: Mon, 15 Sep 2025 00:43:52 +0800
Subject: [PATCH] Simplify code

---
 .../kyant/backdrop/BackdropShapeProvider.kt   |  2 +
 .../kyant/backdrop/DrawBackdropModifier.kt    | 41 ++++++-------------
 .../backdrop/highlight/HighlightModifier.kt   |  6 +--
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/backdrop/src/main/java/com/kyant/backdrop/BackdropShapeProvider.kt b/backdrop/src/main/java/com/kyant/backdrop/BackdropShapeProvider.kt
index b1e8677..0550b4d 100644
--- a/backdrop/src/main/java/com/kyant/backdrop/BackdropShapeProvider.kt
+++ b/backdrop/src/main/java/com/kyant/backdrop/BackdropShapeProvider.kt
@@ -1,5 +1,6 @@
 package com.kyant.backdrop
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Outline
 import androidx.compose.ui.graphics.Shape
@@ -13,6 +14,7 @@ internal interface BackdropShapeProvider {
     val shape: Shape
 }
 
+@Immutable
 internal class CachedBackdropShapeProvider(
     val shapeProvider: () -> Shape
 ) : BackdropShapeProvider {
diff --git a/backdrop/src/main/java/com/kyant/backdrop/DrawBackdropModifier.kt b/backdrop/src/main/java/com/kyant/backdrop/DrawBackdropModifier.kt
index 7f3df77..05a5a84 100644
--- a/backdrop/src/main/java/com/kyant/backdrop/DrawBackdropModifier.kt
+++ b/backdrop/src/main/java/com/kyant/backdrop/DrawBackdropModifier.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.graphics.GraphicsLayerScope
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.asComposeRenderEffect
 import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.layer.CompositingStrategy
 import androidx.compose.ui.graphics.layer.GraphicsLayer
 import androidx.compose.ui.graphics.layer.drawLayer
 import androidx.compose.ui.layout.LayoutCoordinates
@@ -153,7 +152,6 @@ private class DrawBackdropNode(
 
     private var graphicsLayer: GraphicsLayer? = null
     private var drawBackdropBlock: DrawScope.() -> Unit by mutableStateOf({})
-    private var shouldRecord = true
 
     private val effectScope =
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -178,30 +176,22 @@ private class DrawBackdropNode(
         }
 
     val drawNode = delegate(CacheDrawModifierNode {
-        val effect =
-            if (effectScope != null) {
-                effectScope.density = density
-                effectScope.fontScale = fontScale
-                effectScope.size = size
-                effectScope.layoutDirection = layoutDirection
-                effectScope.renderEffect = null
+        if (effectScope != null) {
+            effectScope.density = density
+            effectScope.fontScale = fontScale
+            effectScope.size = size
+            effectScope.layoutDirection = layoutDirection
+            effectScope.renderEffect = null
 
-                effects(effectScope)
+            effects(effectScope)
 
-                effectScope.renderEffect?.asComposeRenderEffect()
-            } else {
-                null
-            }
+            graphicsLayer?.renderEffect = effectScope.renderEffect?.asComposeRenderEffect()
+        }
 
         onDrawWithContent {
-            val graphicsLayer = graphicsLayer
-            if (graphicsLayer != null) {
-                graphicsLayer.renderEffect = effect
-                if (shouldRecord) {
-                    graphicsLayer.record { onDrawBackdrop(drawBackdropBlock) }
-                    shouldRecord = false
-                }
-                drawLayer(graphicsLayer)
+            graphicsLayer?.let { layer ->
+                layer.record { onDrawBackdrop(drawBackdropBlock) }
+                drawLayer(layer)
             }
             onDrawSurface?.invoke(this)
             drawContent()
@@ -227,17 +217,12 @@ private class DrawBackdropNode(
     override fun onGloballyPositioned(coordinates: LayoutCoordinates) {
         if (coordinates.isAttached) {
             drawBackdropBlock = { with(backdrop) { drawBackdrop(coordinates) } }
-            shouldRecord = true
         }
     }
 
     override fun onAttach() {
         val graphicsContext = requireGraphicsContext()
-        graphicsLayer =
-            graphicsContext.createGraphicsLayer().apply {
-                compositingStrategy = CompositingStrategy.Offscreen
-            }
-        shouldRecord = true
+        graphicsLayer = graphicsContext.createGraphicsLayer()
     }
 
     override fun onDetach() {
diff --git a/backdrop/src/main/java/com/kyant/backdrop/highlight/HighlightModifier.kt b/backdrop/src/main/java/com/kyant/backdrop/highlight/HighlightModifier.kt
index fc7f406..b551b8e 100644
--- a/backdrop/src/main/java/com/kyant/backdrop/highlight/HighlightModifier.kt
+++ b/backdrop/src/main/java/com/kyant/backdrop/highlight/HighlightModifier.kt
@@ -124,16 +124,14 @@ internal class HighlightNode(
 
     override fun onAttach() {
         val graphicsContext = requireGraphicsContext()
-        graphicsLayer =
-            graphicsContext.createGraphicsLayer().apply {
-            }
+        graphicsLayer = graphicsContext.createGraphicsLayer()
     }
 
     override fun onDetach() {
         val graphicsContext = requireGraphicsContext()
         graphicsLayer?.let { layer ->
             graphicsContext.releaseGraphicsLayer(layer)
-            this.graphicsLayer = null
+            graphicsLayer = null
         }
     }
 }