@momo-kits/native-kits 0.162.1-gif.16-debug → 0.162.1-gif.17-debug

package/compose/build.gradle.kts

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64(), iosX64())
+    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.1-gif.16-debug"
+        version = "0.162.1-gif.17-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -81,7 +81,7 @@ kotlin {
                 exclude(group = "io.github.panpf.sketch4", module = "sketch-compose-core")
             }
             implementation(project(":sketch-compose-core"))
-            implementation(libs.sketch.http.core)
+            implementation(libs.sketch.http.ktor3)
             implementation(libs.sketch.animated.gif)
         }
         androidMain.dependencies {

package/compose/build.gradle.kts.backup

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64(), iosX64())
+    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -81,7 +81,7 @@ kotlin {
                 exclude(group = "io.github.panpf.sketch4", module = "sketch-compose-core")
             }
             implementation(project(":sketch-compose-core"))
-            implementation(libs.sketch.http.core)
+            implementation(libs.sketch.http.ktor3)
             implementation(libs.sketch.animated.gif)
         }
         androidMain.dependencies {

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.1-gif.15'
+    spec.version                  = '0.162.1-gif.16'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Image.kt

@@ -1,7 +1,9 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
@@ -18,17 +20,13 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import com.github.panpf.sketch.AsyncImage as SketchAsyncImage
-import com.github.panpf.sketch.LocalPlatformContext
 import com.github.panpf.sketch.PainterState
-import com.github.panpf.sketch.fetch.HttpUriFetcher
-import com.github.panpf.sketch.request.ImageRequest as SketchImageRequest
 import com.github.panpf.sketch.rememberAsyncImageState
 import coil3.compose.AsyncImage as CoilAsyncImage
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.modifier.conditional
-import vn.momo.kits.utils.KitsSketchHttpStack
 
 data class Options(
     val alignment: Alignment = Alignment.TopStart,
@@ -123,7 +121,6 @@ fun Image(
             }
             .semantics { contentDescription = "img|$source" },
     ) {
-        val platformContext = LocalPlatformContext.current
         val urlToLoad = remember(source, maxWidth, maxHeight, density) {
             when (source) {
                 is String -> {
@@ -141,17 +138,10 @@ fun Image(
 
         if (isGifUrl(urlToLoad)) {
             val asyncImageState = rememberAsyncImageState()
-            val request = remember(platformContext, urlToLoad) {
-                SketchImageRequest(platformContext, urlToLoad) {
-                    components {
-                        add(HttpUriFetcher.Factory(KitsSketchHttpStack))
-                    }
-                }
-            }
 
             SketchAsyncImage(
                 modifier = Modifier.matchParentSize(),
-                request = request,
+                uri = urlToLoad,
                 state = asyncImageState,
                 contentDescription = null,
                 contentScale = imageOptions.contentScale,
@@ -211,7 +201,7 @@ private fun processImageUrl(url: String, maxWidth: androidx.compose.ui.unit.Dp,
 }
 
 @Composable
-private fun androidx.compose.foundation.layout.BoxScope.ImageStateContent(
+private fun ImageStateContent(
     imageState: ImageState,
     loading: Boolean,
     onLoadingChanged: (Boolean) -> Unit,
@@ -230,13 +220,17 @@ private fun androidx.compose.foundation.layout.BoxScope.ImageStateContent(
 }
 
 @Composable
-private fun androidx.compose.foundation.layout.BoxScope.ImageError() {
+private fun ImageError() {
     val theme = AppTheme.current
-    Icon(
-        source = "media_fail",
-        color = theme.colors.text.disable,
-        modifier = Modifier.align(Alignment.Center)
-    )
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Icon(
+            source = "media_fail",
+            color = theme.colors.text.disable,
+        )
+    }
 }
 
 @Composable

package/gradle/libs.versions.toml

@@ -56,7 +56,7 @@ material = { module = "com.google.android.material:material", version.ref = "mat
 
 sketch-compose = { module = "io.github.panpf.sketch4:sketch-compose", version.ref = "sketch" }
 sketch-core = { module = "io.github.panpf.sketch4:sketch-core", version.ref = "sketch" }
-sketch-http-core = { module = "io.github.panpf.sketch4:sketch-http-core", version.ref = "sketch" }
+sketch-http-ktor3 = { module = "io.github.panpf.sketch4:sketch-http-ktor3", version.ref = "sketch" }
 sketch-animated-gif = { module = "io.github.panpf.sketch4:sketch-animated-gif", version.ref = "sketch" }
 [plugins]
 jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.1-gif.16
+version=0.162.1-gif.17
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.1-gif.16-debug",
+  "version": "0.162.1-gif.17-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/KitsSketchHttpStack.kt

@@ -1,81 +0,0 @@
-package vn.momo.kits.utils
-
-import com.github.panpf.sketch.http.HttpHeaders
-import com.github.panpf.sketch.http.HttpStack
-import com.github.panpf.sketch.request.Extras
-import io.ktor.client.HttpClient
-import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.client.request.header
-import io.ktor.client.request.prepareRequest
-import io.ktor.client.request.url
-import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.cancel
-import io.ktor.utils.io.readAvailable
-
-internal object KitsSketchHttpStack : HttpStack {
-    private val client by lazy { HttpClient() }
-
-    override suspend fun <T> request(
-        url: String,
-        httpHeaders: HttpHeaders?,
-        extras: Extras?,
-        block: suspend (HttpStack.Response) -> T,
-    ): T {
-        val request = HttpRequestBuilder().apply {
-            url(url)
-            httpHeaders?.addList?.forEach {
-                header(it.first, it.second)
-            }
-            httpHeaders?.setList?.forEach {
-                header(it.first, it.second)
-            }
-        }
-        return client.prepareRequest(request).execute {
-            block(Response(it))
-        }
-    }
-
-    @Deprecated(
-        message = "HttpStack.getResponse is deprecated by Sketch. Use request instead.",
-        replaceWith = ReplaceWith("request(url, httpHeaders, extras) { it }")
-    )
-    override suspend fun getResponse(
-        url: String,
-        httpHeaders: HttpHeaders?,
-        extras: Extras?,
-    ): HttpStack.Response {
-        return request(url, httpHeaders, extras) { it }
-    }
-
-    override fun toString(): String = "KitsSketchHttpStack"
-
-    private class Response(
-        private val response: HttpResponse,
-    ) : HttpStack.Response {
-        override val code: Int = response.status.value
-        override val message: String = response.status.description
-        override val contentLength: Long =
-            getHeaderField(io.ktor.http.HttpHeaders.ContentLength)?.toLongOrNull() ?: -1L
-        override val contentType: String? = getHeaderField(io.ktor.http.HttpHeaders.ContentType)
-
-        override fun getHeaderField(name: String): String? = response.headers[name]
-
-        override suspend fun content(): HttpStack.Content {
-            return Content(response.bodyAsChannel())
-        }
-    }
-
-    private class Content(
-        private val channel: ByteReadChannel,
-    ) : HttpStack.Content {
-        override suspend fun read(buffer: ByteArray): Int {
-            return channel.readAvailable(buffer, 0, buffer.size)
-        }
-
-        override fun close() {
-            channel.cancel()
-        }
-    }
-}