diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/ApiModule.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/ApiModule.kt index 71f8d6a2..da97f792 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/ApiModule.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/ApiModule.kt @@ -10,7 +10,7 @@ import dagger.hilt.components.SingletonComponent import dev.msfjarvis.claw.api.LobstersApi import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json -import okhttp3.MediaType.Companion.toMediaType +import okhttp3.MediaType import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.create @@ -25,7 +25,7 @@ object ApiModule { return OkHttpClient.Builder() .addNetworkInterceptor { chain -> val request = chain.request() - Log.d("LobstersApi", "${request.method}: ${request.url}") + Log.d("LobstersApi", "${request.method()}: ${request.url()}") chain.proceed(request) } .build() @@ -40,7 +40,7 @@ object ApiModule { client: Lazy, json: Lazy, ): Retrofit { - val contentType = "application/json".toMediaType() + val contentType = MediaType.get("application/json") return Retrofit.Builder() .client(client.get()) .baseUrl(LobstersApi.BASE_URL) diff --git a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt index 304bf39c..ce34872b 100644 --- a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt +++ b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt @@ -3,10 +3,8 @@ package dev.msfjarvis.claw.common.ui import androidx.compose.foundation.Image import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import coil.annotation.ExperimentalCoilApi -import coil.compose.rememberAsyncImagePainter -import coil.request.ImageRequest +import coil.compose.rememberImagePainter import coil.transform.CircleCropTransformation @Composable @@ -18,12 +16,12 @@ actual fun NetworkImage( ) { Image( painter = - rememberAsyncImagePainter( - ImageRequest.Builder(LocalContext.current) - .data(data = url) - .transformations(CircleCropTransformation()) - .crossfade(true) - .build() + rememberImagePainter( + data = url, + builder = { + transformations(CircleCropTransformation()) + crossfade(true) + }, ), contentDescription = contentDescription, modifier = modifier, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6a593986..64e1341a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ aurora-component = { module = "org.pushing-pixels:aurora-component", version.ref aurora-theming = { module = "org.pushing-pixels:aurora-theming", version.ref = "aurora" } aurora-window = { module = "org.pushing-pixels:aurora-window", version.ref = "aurora" } -coil-compose = "io.coil-kt:coil-compose:2.0.0-alpha07" +coil-compose = "io.coil-kt:coil-compose:1.4.0" kamel-image = "com.alialbaali.kamel:kamel-image:0.3.0" compose-richtext-ui = { module = "com.halilibo.compose-richtext:richtext-ui", version.ref = "richtext" }