msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 08:17:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 3

all: make Coil version match compose-richtext

Browse source
This commit is contained in:
Harsh Shandilya 2022-02-01 01:51:35 +05:30
parent 6eb815ec3b
commit 7db06f9b93
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
android/src/main/kotlin/dev/msfjarvis/claw/android/injection/ApiModule.kt
View file

@ -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<OkHttpClient>,
json: Lazy<Json>,
): Retrofit {
val contentType = "application/json".toMediaType()
val contentType = MediaType.get("application/json")
return Retrofit.Builder()
.client(client.get())
.baseUrl(LobstersApi.BASE_URL)

16
common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt
View file

@ -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,

2
gradle/libs.versions.toml
View file

@ -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" }