fix previews on android

closes #37
Kamel-Media · Jan 25, 2025 · 7663ae3 · 7663ae3
1 parent 24c91f5
commit 7663ae3
Show file tree

Hide file tree

Showing 7 changed files with 830 additions and 115 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,22 +14,23 @@ com-android-application = { id = "com.android.application", version.ref = "agp"
 kotlin = "2.1.0"
 agp = "8.7.3"
 
-okio = "3.9.1"
+okio = "3.10.2"
 startup-runtime = "1.2.0"
 vanniktech-publish = "0.30.0"
 compose = "1.7.3"
 coroutines = "1.10.1"
 ktor = "3.0.3"
-cache4k = "0.13.0"
+cache4k = "0.14.0"
 xmlutil = "0.90.3"
-activity-compose ="1.9.3"
+activity-compose = "1.10.0"
 appcompat = "1.7.0"
 material = "1.12.0"
 androidsvg = "1.4"
 batik = "1.18"
 slf4j = "2.0.16"
 annotation = "1.9.1"
 core-ctx = "1.15.0"
+ui-tooling = "1.7.6"
 
 [libraries]
 
@@ -61,3 +62,4 @@ com-caverok-androidsvg = { module = "com.caverock:androidsvg-aar", version.ref =
 apache-batik-transcoder = { module = "org.apache.xmlgraphics:batik-transcoder", version.ref = "batik" }
 apache-batik-codec = { module = "org.apache.xmlgraphics:batik-codec", version.ref = "batik" }
 slf4j = { module = "org.slf4j:slf4j-nop", version.ref = "slf4j" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "ui-tooling" }
diff --git a/kamel-core/src/androidMain/kotlin/io/kamel/core/ApplicationContextInitializer.kt b/kamel-core/src/androidMain/kotlin/io/kamel/core/ApplicationContextInitializer.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.startup.Initializer
 
 
-public lateinit var applicationContext: Context
+public var applicationContext: Context? = null
 
 internal class ApplicationContextInitializer : Initializer<Context> {
     override fun create(context: Context): Context = context.also {

diff --git a/kamel-core/src/androidMain/kotlin/io/kamel/core/cache/httpCache.android.kt b/kamel-core/src/androidMain/kotlin/io/kamel/core/cache/httpCache.android.kt
@@ -2,14 +2,22 @@ package io.kamel.core.cache
 
 import io.kamel.core.applicationContext
 import io.kamel.core.cache.disk.DiskCacheStorage
-import io.ktor.client.plugins.cache.storage.CacheStorage
+import io.ktor.client.plugins.cache.storage.*
 import okio.FileSystem
 import okio.Path.Companion.toOkioPath
 
-private val cacheDir = applicationContext.cacheDir.toOkioPath()
+private val cacheDir = applicationContext?.cacheDir?.toOkioPath()
 
-internal actual fun httpCacheStorage(maxSize: Long): CacheStorage = DiskCacheStorage(
-    fileSystem = FileSystem.SYSTEM,
-    directory = cacheDir,
-    maxSize = maxSize
-)
+internal actual fun httpCacheStorage(maxSize: Long): CacheStorage {
+    return if (cacheDir == null) {
+        println(
+            "Warning: applicationContext is null, DiskCacheStorage is disabled")
+        CacheStorage.Disabled
+    } else {
+        DiskCacheStorage(
+            fileSystem = FileSystem.SYSTEM,
+            directory = cacheDir,
+            maxSize = maxSize
+        )
+    }
+}
diff --git a/kamel-image-default/src/androidMain/kotlin/io/kamel/image/config/KamelConfig.android.kt b/kamel-image-default/src/androidMain/kotlin/io/kamel/image/config/KamelConfig.android.kt
@@ -4,6 +4,13 @@ import io.kamel.core.applicationContext
 import io.kamel.core.config.KamelConfigBuilder
 
 internal actual fun KamelConfigBuilder.platformSpecificConfig() {
-    resourcesIdMapper(applicationContext)
-    resourcesFetcher(applicationContext)
+    if (applicationContext == null) {
+        println("Warning: Android application context is not provided. Skipping adding Kamel Components requiring Android application context.")
+    }
+
+    applicationContext?.applicationContext?.let { context ->
+        resourcesIdMapper(context)
+        resourcesFetcher(context)
+    }
 }
+
diff --git a/kamel-samples/build.gradle.kts b/kamel-samples/build.gradle.kts
@@ -129,6 +129,11 @@ kotlin {
     }
 }
 
+dependencies {
+    // https://youtrack.jetbrains.com/issue/KTIJ-32720/Support-common-org.jetbrains.compose.ui.tooling.preview.Preview-in-IDEA-and-Android-Studio#focus=Comments-27-11400795.0-0
+    debugImplementation(libs.androidx.ui.tooling)
+}
+
 compose {
     desktop {
         application {

diff --git a/kamel-samples/src/commonMain/kotlin/io/kamel/samples/launcher.kt b/kamel-samples/src/commonMain/kotlin/io/kamel/samples/launcher.kt
@@ -7,8 +7,12 @@ import androidx.compose.material.Tab
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import io.kamel.core.config.Core
+import io.kamel.core.config.KamelConfig
+import io.kamel.core.config.takeFrom
 import io.kamel.image.KamelImage
 import io.kamel.image.asyncPainterResource
+import io.kamel.image.config.*
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
 @Composable