npm - @momo-kits/native-kits - Versions diffs - 0.162.1-beta.5-debug → 0.162.1-beta.6-debug - Mend

@momo-kits/native-kits 0.162.1-beta.5-debug → 0.162.1-beta.6-debug

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/compose/build.gradle.kts CHANGED Viewed

@@ -77,6 +77,10 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.sketch.compose)
+            implementation(libs.sketch.http)
+            implementation(libs.sketch.animated.core)
+            implementation(libs.sketch.animated.gif)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

package/compose/build.gradle.kts.backup CHANGED Viewed

@@ -77,6 +77,10 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
             implementation(libs.compottie)
+            implementation(libs.sketch.compose)
+            implementation(libs.sketch.http)
+            implementation(libs.sketch.animated.core)
+            implementation(libs.sketch.animated.gif)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)

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

@@ -3,10 +3,7 @@ package vn.momo.kits.components
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
@@ -17,7 +14,9 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
+import com.github.panpf.sketch.AsyncImage as SketchAsyncImage
+import com.github.panpf.sketch.PainterState
+import com.github.panpf.sketch.rememberAsyncImageState
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
@@ -30,10 +29,6 @@ data class Options(
     val alpha: Float = DefaultAlpha,
 )
-enum class ImageState {
-    Loading, Success, Error
-}
 // Cached domain set for better performance
 private val supportedDomains = setOf(
     "static.momocdn.net",
@@ -73,6 +68,11 @@ private fun getHostFromUrl(url: String): String? {
     }
 }
+private fun isGifUrl(url: String): Boolean {
+    val path = url.substringBefore('#').substringBefore('?')
+    return path.endsWith(".gif", ignoreCase = true)
+}
 // Optimized query parameter appending
 private fun appendSizeQueryParam(url: String, value: String): String {
     val fragmentIndex = url.indexOf('#')
@@ -100,7 +100,7 @@ fun Image(
         options ?: Options()
     }
-    var imageState by remember { mutableStateOf(ImageState.Loading) }
+    val asyncImageState = rememberAsyncImageState()
     val density = LocalDensity.current
     BoxWithConstraints(
@@ -121,26 +121,24 @@ fun Image(
                         processedUrl
                     }
                 }
-                else -> source
+                else -> source.toString()
             }
         }
-        AsyncImage(
+        SketchAsyncImage(
             modifier = Modifier.matchParentSize(),
-            model = urlToLoad,
+            uri = urlToLoad,
+            state = asyncImageState,
             contentDescription = null,
             contentScale = imageOptions.contentScale,
             alignment = imageOptions.alignment,
             colorFilter = imageOptions.colorFilter,
             alpha = imageOptions.alpha,
-            onLoading = { imageState = ImageState.Loading },
-            onSuccess = { imageState = ImageState.Success },
-            onError = { imageState = ImageState.Error },
         )
-        when (imageState) {
-            ImageState.Loading -> if (loading) Skeleton()
-            ImageState.Error -> {
+        when (asyncImageState.painterState) {
+            is PainterState.Success -> {}
+            is PainterState.Error -> {
                 val theme = AppTheme.current
                 Icon(
                     source = "media_fail",
@@ -148,7 +146,7 @@ fun Image(
                     modifier = Modifier.align(Alignment.Center)
                 )
             }
-            ImageState.Success -> {}
+            else -> if (loading) Skeleton()
         }
     }
 }
@@ -156,7 +154,7 @@ fun Image(
 // Extracted URL processing logic for better performance
 private fun processImageUrl(url: String, maxWidth: androidx.compose.ui.unit.Dp, density: androidx.compose.ui.unit.Density): String {
     val host = getHostFromUrl(url)
-    return if (host != null && supportedDomains.contains(host)) {
+    return if (!isGifUrl(url) && host != null && supportedDomains.contains(host)) {
         val widthPx = with(density) { maxWidth.roundToPx() }
         val pixelRatio = density.density
         val pixelFitForWidth = widthPx * pixelRatio
@@ -185,4 +183,4 @@ fun Image(
         colorFilter = colorFilter,
         alpha = alpha,
     )
-}
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt CHANGED Viewed

@@ -23,7 +23,7 @@ import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
-const val MAX_LENGTH = 300
+internal const val MAX_LENGTH = 300
 internal val DEFAULT_HEIGHT = 104.dp
 @Composable

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTab.kt CHANGED Viewed

@@ -23,7 +23,6 @@ import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.NavigationOptions
 import vn.momo.kits.navigation.StackScreen
 import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.platform.getScreenHeight
 private var bottomTabOptionItems : MutableList<NavigationOptions?> = mutableListOf()
 internal fun setBottomTabOption(index: Int, options: NavigationOptions){
@@ -45,6 +44,8 @@ fun BottomTab(
     val navigation = LocalNavigation.current
     val navigator = LocalNavigator.current
     val navController = rememberNavController()
+    val keyboardBottomPadding = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
+    val shouldShowBottomTab = keyboardBottomPadding == 0.dp
     bottomTabOptionItems = items.mapIndexed { index, item ->
         item.options ?: NavigationOptions()
@@ -57,10 +58,16 @@ fun BottomTab(
         )
     }
-    Box(modifier = Modifier.fillMaxWidth().height(getScreenHeight()), contentAlignment = Alignment.BottomCenter) {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
         Box(modifier = Modifier
             .fillMaxSize()
-            .padding(bottom = BOTTOM_TAB_BAR_HEIGHT.dp + AppNavigationBar.current)
+            .padding(
+                bottom = if (shouldShowBottomTab) {
+                    BOTTOM_TAB_BAR_HEIGHT.dp + AppNavigationBar.current
+                } else {
+                    0.dp
+                }
+            )
         ) {
             NavHost(
                 navController = navController,
@@ -119,20 +126,22 @@ fun BottomTab(
                 }
             }
         }
-        Column {
-            BottomTabBar(
-                items = items,
-                floatingButton = floatingButton,
-                navController = navController,
-                onTabSelected = {
-                    val currentRoute = navController.currentBackStackEntry?.destination?.route
-                    val targetRoute = "option$it"
-                    if (currentRoute != targetRoute){
-                        navController.navigate(targetRoute)
+        if (shouldShowBottomTab) {
+            Column {
+                BottomTabBar(
+                    items = items,
+                    floatingButton = floatingButton,
+                    navController = navController,
+                    onTabSelected = {
+                        val currentRoute = navController.currentBackStackEntry?.destination?.route
+                        val targetRoute = "option$it"
+                        if (currentRoute != targetRoute) {
+                            navController.navigate(targetRoute)
+                        }
                     }
-                }
-            )
-            Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
+                )
+                Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
+            }
         }
     }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTabBar.kt CHANGED Viewed

@@ -28,7 +28,7 @@ import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.platform.getScreenDimensions
 internal val floatingButtonWidth = 75.dp
-const val BOTTOM_TAB_BAR_HEIGHT = 64
+internal const val BOTTOM_TAB_BAR_HEIGHT = 64
 @Composable
 internal fun BottomTabBar(

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/Header.kt CHANGED Viewed

@@ -44,7 +44,7 @@ import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.LocalScrollState
 import vn.momo.kits.navigation.getInputSearchType
-const val HEADER_HEIGHT = 52
+internal const val HEADER_HEIGHT = 52
 internal enum class InputSearchType { None, Header, Animated }
 enum class TitlePosition { LEFT, CENTER }

package/gradle/libs.versions.toml CHANGED Viewed

@@ -21,6 +21,7 @@ maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
 kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
+sketch = "4.4.0"
 [libraries]
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor-version" }
@@ -53,6 +54,10 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
+sketch-compose = { module = "io.github.panpf.sketch4:sketch-compose", version.ref = "sketch" }
+sketch-http = { module = "io.github.panpf.sketch4:sketch-http", version.ref = "sketch" }
+sketch-animated-core = { module = "io.github.panpf.sketch4:sketch-animated-core", 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" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

package/gradle.properties CHANGED Viewed

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

package/package.json CHANGED Viewed

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