Add multiplatform support to coil-svg

buildSrc/src/main/kotlin/coil3/skikoJvm.kt

@@ -0,0 +1,24 @@
+package coil3
+
+import org.gradle.api.Project
+
+fun Project.skikoAwtRuntimeDependency(version: String): String {
+    val osName = System.getProperty("os.name")
+    val targetOs = when {
+        osName == "Mac OS X" -> "macos"
+        osName.startsWith("Win") -> "windows"
+        osName.startsWith("Linux") -> "linux"
+        else -> error("Unsupported OS: $osName")
+    }
+
+    val osArch = System.getProperty("os.arch")
+    val targetArch = when (osArch) {
+        "x86_64", "amd64" -> "x64"
+        "aarch64" -> "arm64"
+        else -> error("Unsupported arch: $osArch")
+    }
+
+    val target = "${targetOs}-${targetArch}"
+
+    return "org.jetbrains.skiko:skiko-awt-runtime-$target:$version"
+}

coil-svg/api/android/coil-svg.api

@@ -0,0 +1,27 @@
+public final class coil3/decode/SvgDecodeUtilsKt {
+	public static final fun isSvg (Lcoil3/decode/DecodeUtils;Lokio/BufferedSource;)Z
+}
+
+public final class coil3/decode/SvgDecoder : coil3/decode/Decoder {
+	public fun <init> (Lcoil3/decode/ImageSource;Lcoil3/request/Options;)V
+	public fun <init> (Lcoil3/decode/ImageSource;Lcoil3/request/Options;Z)V
+	public synthetic fun <init> (Lcoil3/decode/ImageSource;Lcoil3/request/Options;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun decode (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getUseViewBoundsAsIntrinsicSize ()Z
+}
+
+public final class coil3/decode/SvgDecoder$Factory : coil3/decode/Decoder$Factory {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create (Lcoil3/fetch/SourceFetchResult;Lcoil3/request/Options;Lcoil3/ImageLoader;)Lcoil3/decode/Decoder;
+	public final fun getUseViewBoundsAsIntrinsicSize ()Z
+}
+
+public final class coil3/request/SvgsKt {
+	public static final fun css (Lcoil3/request/ImageRequest$Builder;Ljava/lang/String;)Lcoil3/request/ImageRequest$Builder;
+	public static final fun getCss (Lcoil3/Extras$Key$Companion;)Lcoil3/Extras$Key;
+	public static final fun getCss (Lcoil3/request/ImageRequest;)Ljava/lang/String;
+	public static final fun getCss (Lcoil3/request/Options;)Ljava/lang/String;
+}
+

coil-svg/api/jvm/coil-svg.api

@@ -0,0 +1,26 @@
+public final class coil3/decode/SvgDecodeUtilsKt {
+	public static final fun isSvg (Lcoil3/decode/DecodeUtils;Lokio/BufferedSource;)Z
+}
+
+public final class coil3/decode/SvgDecoder : coil3/decode/Decoder {
+	public fun <init> (Lcoil3/decode/ImageSource;Lcoil3/request/Options;Z)V
+	public synthetic fun <init> (Lcoil3/decode/ImageSource;Lcoil3/request/Options;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun decode (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getUseViewBoundsAsIntrinsicSize ()Z
+}
+
+public final class coil3/decode/SvgDecoder$Factory : coil3/decode/Decoder$Factory {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create (Lcoil3/fetch/SourceFetchResult;Lcoil3/request/Options;Lcoil3/ImageLoader;)Lcoil3/decode/Decoder;
+	public final fun getUseViewBoundsAsIntrinsicSize ()Z
+}
+
+public final class coil3/request/SvgsKt {
+	public static final fun css (Lcoil3/request/ImageRequest$Builder;Ljava/lang/String;)Lcoil3/request/ImageRequest$Builder;
+	public static final fun getCss (Lcoil3/Extras$Key$Companion;)Lcoil3/Extras$Key;
+	public static final fun getCss (Lcoil3/request/ImageRequest;)Ljava/lang/String;
+	public static final fun getCss (Lcoil3/request/Options;)Ljava/lang/String;
+}
+

coil-svg/build.gradle.kts

@@ -1,21 +1,60 @@
+import coil3.addAllMultiplatformTargets
+import coil3.androidInstrumentedTest
 import coil3.androidLibrary
+import coil3.androidUnitTest
+import coil3.skikoAwtRuntimeDependency
 
 plugins {
     id("com.android.library")
-    id("kotlin-android")
+    id("kotlin-multiplatform")
+    id("kotlinx-atomicfu")
 }
 
+addAllMultiplatformTargets()
 androidLibrary(name = "coil3.svg")
 
-dependencies {
-    api(projects.coilCore)
-
-    implementation(libs.androidx.core)
-    implementation(libs.svg)
-
-    testImplementation(projects.internal.testUtils)
-    testImplementation(libs.bundles.test.jvm)
-
-    androidTestImplementation(projects.internal.testUtils)
-    androidTestImplementation(libs.bundles.test.android)
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(projects.coilCore)
+                implementation(libs.coroutines.core)
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation(projects.internal.testUtils)
+                implementation(libs.bundles.test.common)
+            }
+        }
+        named("nonAndroidMain") {
+            dependencies {
+                api(libs.skiko)
+            }
+        }
+        androidMain {
+            dependencies {
+                implementation(libs.androidx.core)
+                implementation(libs.svg)
+            }
+        }
+        androidUnitTest {
+            dependencies {
+                implementation(projects.internal.testUtils)
+                implementation(libs.bundles.test.jvm)
+            }
+        }
+        androidInstrumentedTest {
+            dependencies {
+                implementation(projects.internal.testUtils)
+                implementation(libs.bundles.test.android)
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation(projects.internal.testUtils)
+                implementation(skikoAwtRuntimeDependency(libs.versions.skiko.get()))
+            }
+        }
+    }
 }

coil-svg/src/androidInstrumentedTest/kotlin/coil3/decode/SvgDecoderTest.android.kt

@@ -0,0 +1,5 @@
+package coil3.decode
+
+import coil3.test.utils.AbstractSvgDecoderTest
+
+class SvgDecoderTestAndroid : AbstractSvgDecoderTest(SvgDecoder.Factory())

coil-svg/src/main/java/coil3/decode/SvgDecoder.kt → coil-svg/src/androidMain/kotlin/coil3/decode/SvgDecoder.android.kt

@@ -26,10 +26,10 @@ import kotlinx.coroutines.runInterruptible
  * @param useViewBoundsAsIntrinsicSize If true, uses the SVG's view bounds as the intrinsic size for
  *  the SVG. If false, uses the SVG's width/height as the intrinsic size for the SVG.
  */
-class SvgDecoder @JvmOverloads constructor(
+actual class SvgDecoder @JvmOverloads actual constructor(
     private val source: ImageSource,
     private val options: Options,
-    val useViewBoundsAsIntrinsicSize: Boolean = true,
+    val useViewBoundsAsIntrinsicSize: Boolean,
 ) : Decoder {
 
     override suspend fun decode() = runInterruptible {
@@ -93,8 +93,8 @@ class SvgDecoder @JvmOverloads constructor(
         }
     }
 
-    class Factory @JvmOverloads constructor(
-        val useViewBoundsAsIntrinsicSize: Boolean = true,
+    actual class Factory @JvmOverloads actual constructor(
+        val useViewBoundsAsIntrinsicSize: Boolean,
     ) : Decoder.Factory {
 
         override fun create(
@@ -110,9 +110,4 @@ class SvgDecoder @JvmOverloads constructor(
             return result.mimeType == MIME_TYPE_SVG || DecodeUtils.isSvg(result.source.source())
         }
     }
-
-    companion object {
-        private const val MIME_TYPE_SVG = "image/svg+xml"
-        private const val DEFAULT_SIZE = 512f
-    }
 }

coil-svg/src/androidMain/kotlin/coil3/util/svgUtils.android.kt

@@ -0,0 +1,12 @@
+package coil3.util
+
+import android.graphics.Bitmap
+import android.os.Build.VERSION.SDK_INT
+
+internal val Bitmap.Config.isHardware: Boolean
+    get() = SDK_INT >= 26 && this == Bitmap.Config.HARDWARE
+
+/** Convert null and [Bitmap.Config.HARDWARE] configs to [Bitmap.Config.ARGB_8888]. */
+internal fun Bitmap.Config?.toSoftware(): Bitmap.Config {
+    return if (this == null || isHardware) Bitmap.Config.ARGB_8888 else this
+}

coil-svg/src/commonMain/kotlin/coil3/decode/SvgDecoder.kt

@@ -0,0 +1,25 @@
+package coil3.decode
+
+import coil3.request.Options
+
+/**
+ * A [Decoder] that uses [AndroidSVG](https://bigbadaboom.github.io/androidsvg/)
+ * and [SVGDOM](https://api.skia.org/classSkSVGDOM.html/) to decode SVG
+ * files.
+ *
+ * @param useViewBoundsAsIntrinsicSize If true, uses the SVG's view bounds as the intrinsic size for
+ *  the SVG. If false, uses the SVG's width/height as the intrinsic size for the SVG.
+ */
+expect class SvgDecoder(
+    source: ImageSource,
+    options: Options,
+    useViewBoundsAsIntrinsicSize: Boolean = true,
+) : Decoder {
+
+    class Factory(
+        useViewBoundsAsIntrinsicSize: Boolean = true
+    ) : Decoder.Factory
+}
+
+internal const val MIME_TYPE_SVG = "image/svg+xml"
+internal const val DEFAULT_SIZE = 512f

coil-svg/src/main/java/coil3/util/svgUtils.kt → coil-svg/src/commonMain/kotlin/coil3/util/svgUtils.kt

@@ -1,9 +1,9 @@
 package coil3.util
 
-import android.graphics.Bitmap
-import android.os.Build.VERSION.SDK_INT
 import coil3.size.Dimension
 import coil3.size.Scale
+import coil3.size.Size
+import coil3.size.isOriginal
 import okio.BufferedSource
 import okio.ByteString
 
@@ -23,14 +23,6 @@ internal fun BufferedSource.indexOf(bytes: ByteString, fromIndex: Long, toIndex:
     return -1
 }
 
-internal val Bitmap.Config.isHardware: Boolean
-    get() = SDK_INT >= 26 && this == Bitmap.Config.HARDWARE
-
-/** Convert null and [Bitmap.Config.HARDWARE] configs to [Bitmap.Config.ARGB_8888]. */
-internal fun Bitmap.Config?.toSoftware(): Bitmap.Config {
-    return if (this == null || isHardware) Bitmap.Config.ARGB_8888 else this
-}
-
 internal fun Dimension.toPx(scale: Scale): Float {
     if (this is Dimension.Pixels) {
         return px.toFloat()
@@ -41,3 +33,11 @@ internal fun Dimension.toPx(scale: Scale): Float {
         }
     }
 }
+
+internal inline fun Size.widthPx(scale: Scale, original: () -> Float): Float {
+    return if (isOriginal) original() else width.toPx(scale)
+}
+
+internal inline fun Size.heightPx(scale: Scale, original: () -> Float): Float {
+    return if (isOriginal) original() else height.toPx(scale)
+}

coil-svg/src/commonTest/kotlin/coil3/decode/SvgDecoderTest.kt

@@ -0,0 +1,23 @@
+package coil3.decode
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+import okio.Buffer
+
+class SvgDecoderTest {
+
+    /** Regression test: https://github.com/coil-kt/coil/issues/1154 */
+    @Test
+    fun isSvg_newLine() {
+        val text = "<svg\n" +
+            "   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" +
+            "   xmlns:cc=\"http://creativecommons.org/ns#\"\n" +
+            "   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n" +
+            "   xmlns:svg=\"http://www.w3.org/2000/svg\"\n" +
+            "   xmlns=\"http://www.w3.org/2000/svg\"\n" +
+            "   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"/>"
+        val buffer = Buffer().apply { writeUtf8(text) }
+
+        assertTrue(DecodeUtils.isSvg(buffer))
+    }
+}

coil-svg/src/jvmTest/kotlin/coil3/decode/SvgDecoderTest.jvm.kt

@@ -0,0 +1,5 @@
+package coil3.decode
+
+import coil3.test.utils.AbstractSvgDecoderTest
+
+class SvgDecoderTestJvm : AbstractSvgDecoderTest(SvgDecoder.Factory())