Switch to Coil for image loading

app/android/proguard-rules.pro

@@ -2,39 +2,53 @@
 -keepclassmembers class io.ktor.** { volatile <fields>; }
 -keep class io.ktor.client.engine.okhttp.OkHttpEngineContainer
 -keep class io.ktor.serialization.kotlinx.json.KotlinxSerializationJsonExtensionProvider
--keep class kotlinx.coroutines.** { *; }
+# even though we don't use log4j, proguard fails preverification if this class gets optimized
+-keep class io.netty.util.internal.logging.Log4J2LoggerFactory { *; }
+-dontwarn kotlinx.coroutines.swing.**
+
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembers class kotlinx.coroutines.** {
+    volatile <fields>;
+}
+-keepclasseswithmembers class io.netty.** {
+    *;
+}
+-keepnames class io.netty.** {
+    *;
+}
+# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater
+-keepclassmembers class kotlin.coroutines.SafeContinuation {
+    volatile <fields>;
+}
+
 -dontwarn kotlinx.atomicfu.**
 -dontwarn io.netty.**
 -dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
+-dontwarn ch.qos.logback.**
 -dontwarn okhttp3.**
 -dontwarn io.ktor.**
-
-# okhttp
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
-# A resource is loaded with a relative path so the package of this class must be preserved.
--adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz
-
-# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
-
-# OkHttp platform used only on JVM and when Conscrypt and other security providers are available.
--dontwarn okhttp3.internal.platform.**
--dontwarn org.conscrypt.**
--dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
+-dontwarn dev.schlaubi.tonbrett.app.desktop.uwp_helper.**
 
 # kmongo
 -keep class org.litote.kmongo.id.UUIDStringIdGeneratorProvider
 -keepclassmembers class org.litote.kmongo.id.StringId {
     public <init>(java.lang.String);
 }
 
+# logback
+-keep class ch.qos.logback.classic.spi.LogbackServiceProvider
+-keep class ch.qos.logback.core.rolling.RollingFileAppender
+-keep class ch.qos.logback.core.rolling.TimeBasedRollingPolicy
+-keep class ch.qos.logback.core.ConsoleAppender
+
 # serialization
 # For some reason if we don't do this, we get a VerifyError at runtime
--keep class kotlinx.serialization.* { *; }
-
 # Serializer for classes with named companion objects are retrieved using `getDeclaredClasses`.
 # If you have any, replace classes with those containing named companion objects.
 -keepattributes InnerClasses # Needed for `getDeclaredClasses`.
@@ -52,10 +66,3 @@
 -keepclassmembers class <1>.<2> {
   <1>.<2>$Companion Companion;
 }
-
-# compose
--keep class androidx.compose.ui.text.platform.Platform { *; }
--keep class androidx.compose.runtime.** { *; }
-
-# protobuf
--keep class dev.schlaubi.tonbrett.app.android.shared.* { *; }

app/android/src/main/java/AppActivity.kt

@@ -6,7 +6,6 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.browser.customtabs.CustomTabsIntent
 import dev.schlaubi.tonbrett.app.MobileTonbrettApp
-import dev.schlaubi.tonbrett.app.ProvideImageLoader
 import dev.schlaubi.tonbrett.app.api.AppContext
 import dev.schlaubi.tonbrett.app.api.ProvideContext
 
@@ -25,12 +24,10 @@ class AppActivity : ComponentActivity() {
             WearOSTokenSharing(token = token ?: context.getTokenOrNull())
 
             ProvideContext(context) {
-                ProvideImageLoader {
-                    UpdateAwareAppScope(activity = this) {
-                        MobileTonbrettApp(token) { url ->
-                            val intent = CustomTabsIntent.Builder().build()
-                            intent.launchUrl(this@AppActivity, Uri.parse(url))
-                        }
+                UpdateAwareAppScope(activity = this) {
+                    MobileTonbrettApp(token) { url ->
+                        val intent = CustomTabsIntent.Builder().build()
+                        intent.launchUrl(this@AppActivity, Uri.parse(url))
                     }
                 }
             }

app/desktop/build.gradle.kts

@@ -91,7 +91,7 @@ compose.desktop {
         buildTypes {
             release {
                 proguard {
-                    version = "7.4.0"
+                    version = "7.4.1"
                     configurationFiles.from(files("rules.pro"))
                 }
             }

app/desktop/rules.pro

@@ -8,6 +8,7 @@
 # ServiceLoader support
 -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
 -keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keep class kotlinx.coroutines.swing.SwingDispatcherFactory {}
 
 # Most of volatile fields are updated with AFU and should not be mangled
 -keepclassmembers class kotlinx.coroutines.** {
@@ -65,14 +66,5 @@
   <1>.<2>$Companion Companion;
 }
 
-
--keep class dev.schlaubi.tonbrett.common.** {*;}
--keep class dev.schlaubi.tonbrett.app.desktop.** {*;}
--keep class kotlinx.serialization.* { *; }
-
-# compose
--keep class androidx.compose.ui.text.platform.Platform { *; }
--keep class androidx.compose.runtime.** { *; }
-
 # https://github.com/Guardsquare/proguard/issues/349
--optimizations !class/unboxing/enum
+-dontoptimize

app/desktop/src/commonMain/kotlin/Main.kt

@@ -87,9 +87,7 @@ private fun ApplicationScope.startActualApplication(
             } else {
                 context.resetApi()
                 ProvideContext(context) {
-                    ProvideImageLoader {
-                        TonbrettApp(sessionExpired)
-                    }
+                    TonbrettApp(sessionExpired)
                 }
             }
         }

app/desktop/src/windowsMain/kotlin/Platform.kt

@@ -2,6 +2,7 @@ package dev.schlaubi.tonbrett.app.desktop
 
 import dev.schlaubi.tonbrett.app.desktop.uwp_helper.StringResult
 import dev.schlaubi.tonbrett.app.desktop.uwp_helper.UwpHelper.*
+import dev.schlaubi.tonbrett.app.uwpTempFolder
 import dev.schlaubi.tonbrett.common.Route
 import io.ktor.http.*
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -23,6 +24,9 @@ actual fun prepareAuthentication(onAuth: () -> Unit): Unit = exitProcess(0)
 
 @OptIn(DelicateCoroutinesApi::class)
 actual fun start(args: Array<String>) {
+    val tempFolder = getTempFolder()
+    System.setProperty(uwpTempFolder, tempFolder)
+
     val argsString = args.joinToString(" ")
     if (argsString.startsWith("tonbrett://login")) {
         try {
@@ -53,6 +57,8 @@ actual fun setToken(token: String) = Arena.ofConfined().use { arena ->
 
 actual fun getToken(): String = invokeStringResultFunction(::get_token)
 
+private fun getTempFolder(): String = invokeStringResultFunction(::get_temp_folder)
+
 private fun invokeStringResultFunction(
     function: (SegmentAllocator) -> MemorySegment
 ) =

app/desktop/uwp_helper/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies.windows]
 version = "0.51.1"
-features = ["System", "Foundation", "Win32_Foundation", "Security_Credentials", "Services_Store", "Foundation_Collections"]
+features = ["System", "Foundation", "Win32_Foundation", "Security_Credentials", "Services_Store", "Foundation_Collections", "Storage"]
 
 [dependencies.tokio]
 version = "1.32.0"
@@ -18,5 +18,6 @@ features = ["macros", "rt-multi-thread"]
 [build-dependencies.cbindgen]
 version = "0.26.0"
 default-features = false
+
 [dependencies]
-log = "0.4.20"
+log = "0.4.20"

app/desktop/uwp_helper/build.gradle.kts

@@ -53,6 +53,7 @@ tasks {
             "--include-function", "launch_uri",
             "--include-function", "get_token",
             "--include-function", "store_token",
+            "--include-function", "get_temp_folder",
             "--include-function", "copy_string_from_get_string_result_into_buffer",
             "--include-function", "request_msstore_auto_update",
             "--include-struct", "StringResult",

app/desktop/uwp_helper/src/lib.rs

@@ -1,6 +1,7 @@
 use std::ffi::{c_char, CStr};
 
 use windows::Services::Store::StoreContext;
+use windows::Storage::ApplicationData;
 use windows::{
     core::h,
     core::Result,
@@ -27,20 +28,6 @@ pub async extern "C" fn request_msstore_auto_update() -> bool {
     };
 }
 
-async fn _request_msstore_auto_update() -> Result<()> {
-    let context = StoreContext::GetDefault()?;
-    let updates = context.GetAppAndOptionalStorePackageUpdatesAsync()?.await?;
-
-    if updates.Size()? > 0 {
-        context
-            .RequestDownloadAndInstallStorePackageUpdatesAsync(&updates)?
-            .await
-            .map(|_| ())
-    } else {
-        Ok(())
-    }
-}
-
 #[tokio::main]
 #[no_mangle]
 pub async unsafe extern "C" fn launch_uri(uri: *const c_char) {
@@ -63,17 +50,7 @@ pub unsafe extern "C" fn store_token(token: *const c_char) {
 
 #[no_mangle]
 pub extern "C" fn get_token() -> StringResult {
-    let result = _get_token();
-    let (string, is_error) = match result {
-        Ok(password) => (password, false),
-        Err(error) => (error.message(), true),
-    };
-
-    StringResult {
-        is_error,
-        length: string.len(),
-        string,
-    }
+    StringResult::from(_get_token())
 }
 
 #[no_mangle]
@@ -84,6 +61,11 @@ pub unsafe extern "C" fn copy_string_from_get_string_result_into_buffer(
     buffer.copy_from(result.string.as_ptr(), result.length)
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn get_temp_folder() -> StringResult {
+    StringResult::from(_get_temp_folder())
+}
+
 async fn _launch_uri(uri: &str) -> Result<()> {
     let actual_uri = Uri::CreateUri(&HSTRING::from(uri))?;
 
@@ -107,3 +89,36 @@ fn _get_token() -> Result<HSTRING> {
 
     Ok(password)
 }
+
+fn _get_temp_folder() -> Result<HSTRING> {
+    ApplicationData::Current()?.TemporaryFolder()?.Path()
+}
+
+async fn _request_msstore_auto_update() -> Result<()> {
+    let context = StoreContext::GetDefault()?;
+    let updates = context.GetAppAndOptionalStorePackageUpdatesAsync()?.await?;
+
+    if updates.Size()? > 0 {
+        context
+            .RequestDownloadAndInstallStorePackageUpdatesAsync(&updates)?
+            .await
+            .map(|_| ())
+    } else {
+        Ok(())
+    }
+}
+
+impl From<Result<HSTRING>> for StringResult {
+    fn from(value: Result<HSTRING>) -> Self {
+        let (string, is_error) = match value {
+            Ok(password) => (password, false),
+            Err(error) => (error.message(), true),
+        };
+
+        StringResult {
+            is_error,
+            length: string.len(),
+            string,
+        }
+    }
+}

app/shared/build.gradle.kts

@@ -59,19 +59,24 @@ kotlin {
                 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
                 implementation(compose.materialIconsExtended)
-                implementation(libs.imageloader)
+
+                implementation(libs.coil.compose)
+                implementation(libs.coil.gif)
+                implementation(libs.coil.svg)
+                implementation(libs.coil.network)
             }
         }
 
         jsMain {
             dependencies {
-                api("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.9.10")
+                api("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.9.21")
             }
         }
 
         jvmMain {
             dependencies {
                 implementation(libs.kmongo.id.serialization)
+                implementation(libs.kotlinx.coroutines.swing)
             }
         }
 
@@ -84,6 +89,7 @@ kotlin {
         androidMain {
             dependencies {
                 implementation(libs.androidx.browser)
+                implementation(libs.kotlinx.coroutines.android)
             }
         }
     }

app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt

@@ -2,16 +2,17 @@
 
 package dev.schlaubi.tonbrett.app
 
-import com.seiko.imageloader.component.ComponentRegistryBuilder
-import com.seiko.imageloader.component.decoder.BitmapFactoryDecoder
-import com.seiko.imageloader.component.decoder.GifDecoder
-import dev.schlaubi.tonbrett.app.api.AppContext
-import kotlinx.coroutines.CoroutineScope
+import android.os.Build
+import coil3.ComponentRegistry
+import coil3.decode.GifDecoder
+import coil3.decode.ImageDecoderDecoder
+import coil3.decode.SvgDecoder
 
-internal actual fun ComponentRegistryBuilder.registerComponents(
-    appContext: AppContext,
-    coroutineScope: CoroutineScope
-) {
-    add(GifDecoder.Factory())
-    add(BitmapFactoryDecoder.Factory(appContext.currentActivity, Int.MAX_VALUE))
+internal actual fun ComponentRegistry.Builder.addPlatformComponents() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        add(ImageDecoderDecoder.Factory())
+    } else {
+        add(GifDecoder.Factory())
+    }
+    add(SvgDecoder.Factory())
 }