Bring CMP Android and Jetpack Compose code structure closer

Will make code copying easier

haze-jetpack-compose/api/api.txt

@@ -39,7 +39,7 @@ package dev.chrisbanes.haze {
     property public final java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> areas;
   }
 
-  public final class RoundRectExtKt {
+  public final class PlatformKt {
   }
 
 }

haze-jetpack-compose/src/main/kotlin/dev/chrisbanes/haze/Haze.kt

@@ -3,7 +3,6 @@
 
 package dev.chrisbanes.haze
 
-import android.os.Build
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
@@ -144,27 +143,13 @@ internal data class HazeNodeElement(
   val blurRadius: Dp,
   val noiseFactor: Float,
 ) : ModifierNodeElement<HazeNode>() {
-  override fun create(): HazeNode = when {
-    Build.VERSION.SDK_INT >= 31 -> {
-      HazeNode31(
-        state = state,
-        backgroundColor = backgroundColor,
-        tint = tint,
-        blurRadius = blurRadius,
-        noiseFactor = noiseFactor,
-      )
-    }
-
-    else -> {
-      HazeNodeBase(
-        state = state,
-        backgroundColor = backgroundColor,
-        tint = tint,
-        blurRadius = blurRadius,
-        noiseFactor = noiseFactor,
-      )
-    }
-  }
+  override fun create(): HazeNode = createHazeNode(
+    state = state,
+    backgroundColor = backgroundColor,
+    tint = tint,
+    blurRadius = blurRadius,
+    noiseFactor = noiseFactor,
+  )
 
   override fun update(node: HazeNode) {
     node.state = state

haze-jetpack-compose/src/main/kotlin/dev/chrisbanes/haze/Platform.kt

@@ -0,0 +1,36 @@
+// Copyright 2023, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze
+
+import android.os.Build
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+
+internal fun createHazeNode(
+  state: HazeState,
+  backgroundColor: Color,
+  tint: Color,
+  blurRadius: Dp,
+  noiseFactor: Float,
+): HazeNode = when {
+  Build.VERSION.SDK_INT >= 31 -> {
+    HazeNode31(
+      state = state,
+      backgroundColor = backgroundColor,
+      tint = tint,
+      blurRadius = blurRadius,
+      noiseFactor = noiseFactor,
+    )
+  }
+
+  else -> {
+    HazeNodeBase(
+      state = state,
+      backgroundColor = backgroundColor,
+      tint = tint,
+      blurRadius = blurRadius,
+      noiseFactor = noiseFactor,
+    )
+  }
+}

haze/api/api.txt

@@ -32,15 +32,15 @@ package dev.chrisbanes.haze {
   public final class HazeNodeKt {
   }
 
-  public final class HazeNodeKt {
-  }
-
   @androidx.compose.runtime.Stable public final class HazeState {
     ctor public HazeState();
     method public java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> getAreas();
     method public void updateArea(Object key, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Shape shape);
     property public final java.util.Map<java.lang.Object,dev.chrisbanes.haze.HazeArea> areas;
   }
 
+  public final class PlatformKt {
+  }
+
 }
 

haze/src/androidMain/kotlin/dev/chrisbanes/haze/HazeNode.kt → haze/src/androidMain/kotlin/dev/chrisbanes/haze/HazeNodeBase.kt

@@ -21,20 +21,10 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 
-internal actual fun createHazeNode(
-  state: HazeState,
-  backgroundColor: Color,
-  tint: Color,
-  blurRadius: Dp,
-  noiseFactor: Float,
-): HazeNode = AndroidHazeNode(state, backgroundColor, tint, blurRadius, noiseFactor)
-
 /**
- * With CMP + Android, we can't do much other than display a transparent scrim.
- * See `:haze-jetpack-compose` for a working blur on Android, but we need Compose 1.6.0 APIs,
- * which are not available in CMP (yet).
+ * On older platforms, we draw a translucent scrim over the content
  */
-private class AndroidHazeNode(
+internal class HazeNodeBase(
   state: HazeState,
   backgroundColor: Color,
   tint: Color,

haze/src/androidMain/kotlin/dev/chrisbanes/haze/Platform.kt

@@ -0,0 +1,15 @@
+// Copyright 2023, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+
+internal actual fun createHazeNode(
+  state: HazeState,
+  backgroundColor: Color,
+  tint: Color,
+  blurRadius: Dp,
+  noiseFactor: Float,
+): HazeNode = HazeNodeBase(state, backgroundColor, tint, blurRadius, noiseFactor)

haze/src/commonMain/kotlin/dev/chrisbanes/haze/Haze.kt

@@ -17,7 +17,6 @@ import androidx.compose.ui.graphics.Outline
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.addOutline
 import androidx.compose.ui.node.ModifierNodeElement
 import androidx.compose.ui.platform.InspectorInfo
 import androidx.compose.ui.unit.Density
@@ -57,7 +56,7 @@ internal fun HazeState.updatePath(
     }
 }
 
-private fun Path.addOutline(outline: Outline, offset: Offset) = when (outline) {
+internal fun Path.addOutline(outline: Outline, offset: Offset) = when (outline) {
   is Outline.Rectangle -> addRect(outline.rect.translate(offset))
   is Outline.Rounded -> addRoundRect(outline.roundRect.translate(offset))
   is Outline.Generic -> addPath(outline.path, offset)
@@ -170,14 +169,6 @@ internal data class HazeNodeElement(
   }
 }
 
-internal expect fun createHazeNode(
-  state: HazeState,
-  backgroundColor: Color,
-  tint: Color,
-  blurRadius: Dp,
-  noiseFactor: Float,
-): HazeNode
-
 internal abstract class HazeNode(
   var state: HazeState,
   var backgroundColor: Color,

haze/src/commonMain/kotlin/dev/chrisbanes/haze/Platform.kt

@@ -0,0 +1,15 @@
+// Copyright 2023, Christopher Banes and the Haze project contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package dev.chrisbanes.haze
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+
+internal expect fun createHazeNode(
+  state: HazeState,
+  backgroundColor: Color,
+  tint: Color,
+  blurRadius: Dp,
+  noiseFactor: Float,
+): HazeNode