@momo-kits/native-kits 0.161.2-beta.9-debug → 0.161.2-nativeimage.1-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.2-beta.9-debug"
+        version = "0.161.2-nativeimage.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -55,6 +55,10 @@ kotlin {
             version = "4.4.3"
             extraOpts += listOf("-compiler-option", "-fmodules")
         }
+
+        pod("SDWebImage") {
+            version = "~> 5.14.3"
+        }
     }
 
     sourceSets {
@@ -73,19 +77,13 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
-            // AI-GENERATED START
-            // compottie-core depends on keight-core directly, and keight (also a dep of compottie)
-            // also depends on keight-core transitively. Kotlin Native links both static archives
-            // into the framework causing duplicate symbols. Exclude keight-core so it is
-            // pulled only once through keight. String notation required for exclude lambda in KMP sourceSets.
-            implementation("io.github.alexzhirkevich:compottie:${libs.versions.compottie.get()}") {
-                exclude(group = "io.github.alexzhirkevich", module = "keight-core")
-            }
-            // AI-GENERATED END
+            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
             implementation(libs.airbnb.lottie)
+            implementation(libs.coil.gif)
+            implementation(libs.coil.http)
         }
         iosMain.dependencies {
             implementation(libs.ktor.client.darwin)
@@ -120,7 +118,7 @@ repositories {
     maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
     maven {
         url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        credentials { username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
     }
     maven {
         url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")

package/compose/build.gradle.kts.backup

@@ -55,6 +55,10 @@ kotlin {
             version = "4.4.3"
             extraOpts += listOf("-compiler-option", "-fmodules")
         }
+
+        pod("SDWebImage") {
+            version = "~> 5.14.3"
+        }
     }
 
     sourceSets {
@@ -73,19 +77,13 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
-            // AI-GENERATED START
-            // compottie-core depends on keight-core directly, and keight (also a dep of compottie)
-            // also depends on keight-core transitively. Kotlin Native links both static archives
-            // into the framework causing duplicate symbols. Exclude keight-core so it is
-            // pulled only once through keight. String notation required for exclude lambda in KMP sourceSets.
-            implementation("io.github.alexzhirkevich:compottie:${libs.versions.compottie.get()}") {
-                exclude(group = "io.github.alexzhirkevich", module = "keight-core")
-            }
-            // AI-GENERATED END
+            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
             implementation(libs.airbnb.lottie)
+            implementation(libs.coil.gif)
+            implementation(libs.coil.http)
         }
         iosMain.dependencies {
             implementation(libs.ktor.client.darwin)
@@ -120,7 +118,7 @@ repositories {
     maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
     maven {
         url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        credentials { username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
     }
     maven {
         url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.161.2-beta.9'
+    spec.version                  = '0.161.2-beta.15'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
@@ -9,6 +9,7 @@ Pod::Spec.new do |spec|
     spec.vendored_frameworks      = 'build/cocoapods/framework/kits.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target    = '15.0'
+    spec.dependency 'SDWebImage', '~> 5.14.3'
     spec.dependency 'lottie-ios', '4.4.3'
     if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
         raise "

package/compose/src/androidMain/kotlin/vn/momo/kits/components/NativeImage.android.kt

@@ -0,0 +1,71 @@
+package vn.momo.kits.components
+
+import android.os.Build.VERSION.SDK_INT
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import coil3.SingletonImageLoader
+import coil3.compose.AsyncImage
+import coil3.gif.AnimatedImageDecoder
+import coil3.gif.GifDecoder
+import vn.momo.kits.const.AppTheme
+
+
+@Composable
+actual fun BoxScope.NativeImageWrapper(
+    urlToLoad: Any,
+    modifier: Modifier,
+    options: Options?,
+    loading: Boolean
+) {
+    val imageOptions = remember(options) {
+        options ?: Options()
+    }
+    var imageState by remember { mutableStateOf(ImageState.Loading) }
+    val context = LocalContext.current
+    val gifEnabledLoader = remember(context) {
+        if (isGifImage(urlToLoad)) {
+            SingletonImageLoader.get(context).newBuilder()
+                .components {
+                    if (SDK_INT >= 28) {
+                        add(AnimatedImageDecoder.Factory())
+                    } else {
+                        add(GifDecoder.Factory())
+                    }
+                }
+                .build()
+        } else {
+            SingletonImageLoader.get(context)
+        }
+    }
+    AsyncImage(
+        modifier = Modifier.matchParentSize(),
+        model = urlToLoad,
+        imageLoader = gifEnabledLoader,
+        contentDescription = null,
+        contentScale = imageOptions.contentScale,
+        alignment = imageOptions.alignment,
+        colorFilter = imageOptions.effectiveColorFilter,
+        alpha = imageOptions.alpha,
+        onLoading = { imageState = ImageState.Loading },
+        onSuccess = { imageState = ImageState.Success },
+        onError = { imageState = ImageState.Error },
+    )
+
+    when (imageState) {
+        ImageState.Loading -> if (loading) Skeleton(cornerRadius = options?.skeletonCornerRadius ?: 0.dp)
+        ImageState.Error -> {
+            val theme = AppTheme.current
+            Icon(
+                source = "media_fail",
+                color = theme.colors.text.disable,
+                modifier = Modifier.align(Alignment.Center)
+            )
+        }
+
+        ImageState.Success -> {}
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/application/LiteScreen.kt

@@ -38,6 +38,7 @@ import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
@@ -48,6 +49,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.Layout
@@ -60,19 +62,15 @@ import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.graphics.Color.Companion
-import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.unit.lerp
-import kotlinx.coroutines.flow.StateFlow
+import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.mapNotNull
 import vn.momo.kits.components.Icon
@@ -81,11 +79,11 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
-import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.kitsAutomationId
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.modifier.shadow
+import vn.momo.kits.navigation.component.HEADER_HEIGHT
 import vn.momo.kits.utils.getAppStatusBarHeight
 import kotlin.math.max
 import kotlin.math.roundToInt
@@ -441,6 +439,7 @@ private class LiteScreenLayoutPolicy(
         val spacing12 = Spacing.M.roundToPx()
         val spaceBetween = headerSpaceBetween?.roundToPx() ?: spacing12
         val statusBarPx = statusBarHeight.roundToPx()
+        val headerRowDefault = HEADER_HEIGHT.dp.roundToPx()
         val scrollPercent = scrollPercentage.value
 
         val contentMeasurable = measurables.find { it.layoutId == HeaderId.CONTENT_ID }
@@ -484,26 +483,20 @@ private class LiteScreenLayoutPolicy(
             )
         )
 
-        val firstRowMaxHeight = buildList {
-            add(backIconPlaceable.safeHeight)
-            add(headerRightPlaceable.safeHeight)
-            if (!isHeaderExtend) {
-                add(inputSearchPlaceable.safeHeight)
-            }
-            add(HEADER_HEIGHT.dp.roundToPx())
-            if (isHeaderExtend) {
-                add(titlePlaceable.safeHeight)
-            }
-        }.max()
-
-        var defaultHeight = statusBarPx + spacing12 + firstRowMaxHeight + spacing12
+        /**
+         * replicate logic from [vn.momo.kits.navigation.component.HeaderBackground]
+         * */
+        var defaultHeight = statusBarPx + headerRowDefault
         if (isHeaderExtend) {
-            defaultHeight += inputSearchPlaceable.safeHeight + spacing12
+            defaultHeight = 154.dp.roundToPx()
         }
         val headerHeight = when {
             isHeaderNone -> statusBarPx
             !useAnimationSearch && !isHeaderExtend -> defaultHeight
-            else -> (defaultHeight - scrollPercent * (defaultHeight - statusBarPx - HEADER_HEIGHT.dp.roundToPx())).toInt()
+            else -> {
+                val collapsableSpace = defaultHeight - statusBarPx - headerRowDefault
+                (defaultHeight - scrollPercent * collapsableSpace).toInt()
+            }
         }
 
         val layoutWidth = constraints.maxWidth
@@ -566,14 +559,14 @@ private class LiteScreenLayoutPolicy(
             if (backIconPlaceable != null) {
                 backIconPlaceable.place(
                     x = startX,
-                    y = startY + backIconPlaceable.verticalCenterOffset(firstRowMaxHeight),
+                    y = startY + backIconPlaceable.verticalCenterOffset(headerRowDefault),
                 )
                 curX += backIconPlaceable.safeWidth + spaceBetween
             }
 
             headerRightPlaceable?.place(
                 x = layoutWidth - spacing12 - headerRightPlaceable.safeWidth,
-                y = startY + headerRightPlaceable.verticalCenterOffset(firstRowMaxHeight),
+                y = startY + headerRightPlaceable.verticalCenterOffset(headerRowDefault),
             )
 
             val titleOffset = IntOffset(
@@ -582,19 +575,19 @@ private class LiteScreenLayoutPolicy(
                     space = layoutWidth,
                     layoutDirection = layoutDirection,
                 ),
-                y = startY + titlePlaceable.verticalCenterOffset(firstRowMaxHeight),
+                y = startY + titlePlaceable.verticalCenterOffset(headerRowDefault),
             )
 
             titlePlaceable?.place(titleOffset)
 
             if (backIconPlaceable != null || headerRightPlaceable != null || titlePlaceable != null) {
-                curY += firstRowMaxHeight
+                curY += headerRowDefault
             }
 
             val inputSearchOffset = if (isHeaderExtend) {
-                val baseY = curY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight)
+                val baseY = curY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault)
                 val y = (baseY * (1 - scrollPercent)).toInt().coerceAtLeast(
-                    startY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight)
+                    startY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault)
                 )
                 IntOffset(
                     x = startX + ((backIconPlaceable.safeWidth + spaceBetween) * (scrollPercent * 2f).coerceIn(
@@ -605,7 +598,7 @@ private class LiteScreenLayoutPolicy(
             } else {
                 IntOffset(
                     x = curX,
-                    y = startY + inputSearchPlaceable.verticalCenterOffset(firstRowMaxHeight),
+                    y = startY + inputSearchPlaceable.verticalCenterOffset(headerRowDefault),
                 )
             }
             val finalPosition = lerp(
@@ -823,7 +816,8 @@ private fun LiteInputSearch(
                         if (!placeHolder.isNullOrEmpty()) {
                             inputSearchProps.customPlaceHolder?.invoke() ?: Text(
                                 text = placeHolder ?: "",
-                                style = inputSearchProps.customTextStyle ?: Typography.bodyDefaultRegular,
+                                style = inputSearchProps.customTextStyle
+                                    ?: Typography.bodyDefaultRegular,
                                 maxLines = 1,
                                 color = theme.colors.text.hint,
                                 overflow = TextOverflow.Ellipsis

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

@@ -2,20 +2,18 @@ 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.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalDensity
 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 androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import vn.momo.kits.application.IsShowBaseLineDebug
@@ -28,7 +26,13 @@ data class Options(
     val contentScale: ContentScale = ContentScale.Crop,
     val colorFilter: ColorFilter? = null,
     val alpha: Float = DefaultAlpha,
-)
+    val skeletonCornerRadius: Dp = 0.dp,
+    val tint: Color? = null,
+) {
+
+    val effectiveColorFilter: ColorFilter?
+        get() = tint?.let { ColorFilter.tint(it) } ?: colorFilter
+}
 
 enum class ImageState {
     Loading, Success, Error
@@ -131,7 +135,7 @@ fun Image(
             contentDescription = null,
             contentScale = imageOptions.contentScale,
             alignment = imageOptions.alignment,
-            colorFilter = imageOptions.colorFilter,
+            colorFilter = imageOptions.effectiveColorFilter,
             alpha = imageOptions.alpha,
             onLoading = { imageState = ImageState.Loading },
             onSuccess = { imageState = ImageState.Success },
@@ -154,7 +158,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 {
+internal 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)) {
         val widthPx = with(density) { maxWidth.roundToPx() }

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

@@ -0,0 +1,74 @@
+package vn.momo.kits.components
+
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.const.Colors
+import vn.momo.kits.modifier.conditional
+
+
+fun isGifImage(source: Any): Boolean {
+    if (source is String) {
+        return source.contains(".gif") ||
+                source.contains(".webp") ||
+                source.contains(".apng") ||
+                source.contains(".avif")
+    }
+    return false
+}
+
+private val urlCache = mutableMapOf<String, String>()
+
+@Composable
+fun NativeImage(
+    source: Any,
+    modifier: Modifier = Modifier,
+    options: Options? = null,
+    loading: Boolean = true
+) {
+    BoxWithConstraints(
+        modifier = modifier
+            .conditional(IsShowBaseLineDebug) {
+                border(1.dp, Colors.blue_03)
+            }
+            .semantics { contentDescription = "img|$source" },
+    ) {
+        val density = LocalDensity.current
+        val urlToLoad = remember(source, maxWidth, maxHeight, density) {
+            when (source) {
+                is String -> {
+                    // Check cache first
+                    val cacheKey = "$source|${maxWidth}|${density.density}"
+                    urlCache[cacheKey] ?: run {
+                        val processedUrl = processImageUrl(source, maxWidth, density)
+                        urlCache[cacheKey] = processedUrl
+                        processedUrl
+                    }
+                }
+
+                else -> source
+            }
+        }
+
+        NativeImageWrapper(urlToLoad, modifier, options, loading)
+
+    }
+}
+
+
+@Composable
+expect fun BoxScope.NativeImageWrapper(
+    urlToLoad: Any,
+    modifier: Modifier = Modifier,
+    options: Options? = null,
+    loading: Boolean = true,
+)

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

@@ -11,12 +11,15 @@ 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.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
@@ -34,7 +37,7 @@ private const val SHADOW_BRUSH_PERCENTAGE = 0.6f
 private const val DEFAULT_DURATION_MILLIS = 1000
 
 @Composable
-fun Skeleton() {
+fun Skeleton(cornerRadius: Dp = 0.dp) {
     BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
         // Memoize width calculation
         val maxWidthValue = remember(maxWidth) { maxWidth.value.toInt() }
@@ -42,6 +45,7 @@ fun Skeleton() {
         Box(
             modifier = Modifier
                 .fillMaxSize()
+                .clip(RoundedCornerShape(cornerRadius))
                 .background(Colors.black_05)
                 .conditional(IsShowBaseLineDebug) {
                     border(1.dp, Colors.blue_03)

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt

@@ -13,7 +13,6 @@ import vn.momo.kits.navigation.component.HeaderBackProps
 import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderTitle
 import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.navigation.component.TitlePosition
 
 class Navigation(
     val id: Int = -1,
@@ -29,7 +28,6 @@ class Navigation(
         hiddenBack: Boolean? = null,
         headerBackProps: HeaderBackProps? = null,
         headerTitle: HeaderTitle? = null,
-        titlePosition: TitlePosition? = null,
         headerRight: HeaderRight? = null,
         headerType: HeaderType? = null,
         scrollData: ScrollData? = null,
@@ -45,7 +43,6 @@ class Navigation(
                 hiddenBack = hiddenBack ?: options.hiddenBack,
                 headerBackProps = headerBackProps ?: options.headerBackProps,
                 headerTitle = headerTitle ?: options.headerTitle,
-                titlePosition = titlePosition ?: options.titlePosition,
                 headerRight = headerRight ?: options.headerRight,
                 headerType = headerType ?: options.headerType,
                 scrollData = scrollData ?: options.scrollData,
@@ -80,7 +77,6 @@ data class NavigationOptions(
     val hiddenBack: Boolean = false,
     val headerBackProps: HeaderBackProps = HeaderBackProps(),
     val headerTitle: HeaderTitle = HeaderTitle.Default("Stack"),
-    val titlePosition: TitlePosition = TitlePosition.LEFT,
     val headerRight: HeaderRight = HeaderRight.Toolkit(),
     val headerType: HeaderType = HeaderType.Default(),
     val scrollData: ScrollData = ScrollData(),

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

@@ -6,6 +6,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -22,7 +23,6 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Icon
@@ -44,7 +44,6 @@ import vn.momo.kits.navigation.getInputSearchType
 
 const val HEADER_HEIGHT = 52
 enum class InputSearchType { None, Header, Animated }
-enum class TitlePosition { LEFT, CENTER }
 
 @Composable
 fun Header(onBackHandler: (() -> Unit)? = null) {
@@ -77,13 +76,6 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
         AppTheme.current.colors.background.surface
 
     if (options.headerType == HeaderType.None) return
-
-    val titlePosition = options.titlePosition
-    val titleColor = headerColor.tintIconColor
-        .copy(alpha = if (inputSearchType == InputSearchType.Animated) 1f - animatedAlpha else 1f)
-    // Centered title needs a full-width overlay to stay screen-centered, not boxed between back button and header right.
-    val centerTitle = titlePosition == TitlePosition.CENTER && options.headerTitle is HeaderTitle.Default
-
     Box(
         Modifier.height(AppStatusBar.current + HEADER_HEIGHT.dp)
             .fillMaxWidth()
@@ -112,37 +104,17 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
                 Spacer(Modifier.width(Spacing.M))
             }
 
-            if (centerTitle) {
-                Spacer(Modifier.weight(1f))
-            } else {
-                HeaderContent(
-                    headerTitle = options.headerTitle,
-                    tintIconColor = titleColor,
-                    titlePosition = titlePosition,
-                    modifier = Modifier.weight(1f)
-                )
-            }
+            HeaderContent(
+                options.headerTitle,
+                headerColor.tintIconColor
+                    .copy(alpha = if (inputSearchType == InputSearchType.Animated) 1f - animatedAlpha else 1f)
+            )
             Box(Modifier.onGloballyPositioned {
                 if(headerRightWidthPx.intValue != it.size.width) headerRightWidthPx.intValue = it.size.width
             }){
                 HeaderRight(options.headerRight, options.tintColor, headerColor)
             }
         }
-        if (centerTitle) {
-            Box(
-                modifier = Modifier.height(HEADER_HEIGHT.dp)
-                    .fillMaxWidth()
-                    .padding(horizontal = Spacing.M),
-                contentAlignment = Alignment.Center
-            ) {
-                HeaderContent(
-                    headerTitle = options.headerTitle,
-                    tintIconColor = titleColor,
-                    titlePosition = titlePosition,
-                    modifier = Modifier.fillMaxWidth()
-                )
-            }
-        }
         VerticalShadow(opacity)
     }
 }
@@ -168,23 +140,15 @@ private fun BackButton(borderColor: Color, backgroundButton: Color, tintIconColo
 }
 
 @Composable
-fun HeaderContent(
-    headerTitle: HeaderTitle,
-    tintIconColor: Color,
-    titlePosition: TitlePosition = TitlePosition.LEFT,
-    modifier: Modifier = Modifier,
-){
+fun RowScope.HeaderContent(headerTitle: HeaderTitle, tintIconColor: Color){
     Box(
-        modifier = modifier,
-        contentAlignment = if (titlePosition == TitlePosition.CENTER) Alignment.Center else Alignment.CenterStart
+        Modifier.weight(1f)
     ) {
         when (headerTitle){
             is HeaderTitle.Default -> {
                 HeaderTitle(
                     title = headerTitle.title,
-                    color = tintIconColor,
-                    modifier = Modifier.fillMaxWidth(fraction = if (titlePosition == TitlePosition.CENTER) 0.5f else 1f),
-                    textAlign = if (titlePosition == TitlePosition.CENTER) TextAlign.Center else TextAlign.Start
+                    color = tintIconColor
                 )
             }
             is HeaderTitle.Journey -> {}

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt

@@ -16,13 +16,11 @@ import vn.momo.kits.modifier.setAutomationId
 fun HeaderTitle(
     title: String = "",
     color: Color? = null,
-    modifier: Modifier = Modifier.fillMaxWidth(),
-    textAlign: TextAlign = TextAlign.Start,
 ) {
     Text(
-        modifier = modifier.zIndex(1f).setAutomationId("title_navigation_header"),
+        modifier = Modifier.fillMaxWidth().zIndex(1f).setAutomationId("title_navigation_header"),
         text = title,
-        textAlign = textAlign,
+        textAlign = TextAlign.Start,
         style = Typography.actionSBold.copy(
             fontSize = 15.sp,
             lineHeight = 22.sp,

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/ComposeLottieAnimation.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import io.github.alexzhirkevich.compottie.Compottie
 import io.github.alexzhirkevich.compottie.ExperimentalCompottieApi
 import io.github.alexzhirkevich.compottie.LottieCompositionSpec
+import io.github.alexzhirkevich.compottie.animateLottieCompositionAsState
 import io.github.alexzhirkevich.compottie.dynamic.rememberLottieDynamicProperties
 import io.github.alexzhirkevich.compottie.rememberLottieComposition
 import io.github.alexzhirkevich.compottie.rememberLottiePainter
@@ -48,12 +49,21 @@ internal fun ComposeLottieAnimation(
         null
     }
 
+    val lottieState = animateLottieCompositionAsState(
+        composition = composition,
+        iterations = Compottie.IterateForever,
+    )
+
     Box(modifier.background(bgColor ?: Color.Transparent)) {
         Image(
             painter = rememberLottiePainter(
                 composition = composition,
-                iterations = Compottie.IterateForever,
+                progress = lottieState::value,
                 dynamicProperties = dynamicProperties,
+                enableExpressions = false,
+                expressionEngineFactory = { _, _ ->
+                    error("Lottie JS expressions are disabled in MoMo kits")
+                },
             ),
             contentDescription = null,
             modifier = Modifier.fillMaxSize(),

package/compose/src/iosMain/kotlin/vn/momo/kits/components/NativeImage.ios.kt

@@ -0,0 +1,142 @@
+package vn.momo.kits.components
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.UIKitInteropProperties
+import androidx.compose.ui.viewinterop.UIKitView
+import cocoapods.SDWebImage.*
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSURL
+import platform.UIKit.UIImageView
+import platform.UIKit.UIViewContentMode
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.platform.toUIColor
+
+
+@OptIn(ExperimentalForeignApi::class)
+private val sdImageOptions = SDWebImageRetryFailed or
+        SDWebImageContinueInBackground or
+        SDWebImageScaleDownLargeImages or
+        SDWebImageHighPriority
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+actual fun BoxScope.NativeImageWrapper(
+    urlToLoad: Any,
+    modifier: Modifier,
+    options: Options?,
+    loading: Boolean
+) {
+    val imageOptions = remember(options) {
+        options ?: Options()
+    }
+
+    var imageState by remember { mutableStateOf(ImageState.Loading) }
+    (urlToLoad as? String)?.let { urlString ->
+        val contentModeValue = remember(imageOptions.contentScale) {
+            imageOptions.contentScale.toUIViewContentMode()
+        }
+        key(urlString) {
+            val isGif = isGifImage(urlString)
+            val imageView: UIImageView = remember {
+                if (isGif) {
+                    SDAnimatedImageView().apply {
+                        shouldCustomLoopCount = false
+                        shouldIncrementalLoad = true
+                    }
+                } else {
+                    UIImageView()
+                }
+            }
+
+
+            val loadImage: (Color?) -> Unit = { tint ->
+                imageState = ImageState.Loading
+                val context = tint?.let {
+                    mapOf<Any?, Any?>(
+                        SDWebImageContextImageTransformer to
+                                SDImageTintTransformer.transformerWithColor(it.toUIColor()),
+                    )
+                }
+                imageView.sd_setImageWithURL(
+                    NSURL.URLWithString(urlString),
+                    placeholderImage = null,
+                    options = sdImageOptions,
+                    context = context,
+                    progress = null,
+                    completed = { image, error, _, _ ->
+                        imageState = if (image != null && error == null) {
+                            ImageState.Success
+                        } else {
+                            ImageState.Error
+                        }
+                    },
+                )
+            }
+
+
+            val appliedTint = remember { mutableStateOf(imageOptions.tint) }
+
+
+            DisposableEffect(Unit) {
+                onDispose { imageView.sd_cancelCurrentImageLoad() }
+            }
+
+            LaunchedEffect(Unit) {
+                appliedTint.value = imageOptions.tint
+                loadImage(imageOptions.tint)
+            }
+
+            UIKitView(
+                modifier = Modifier.matchParentSize(),
+                properties = UIKitInteropProperties(),
+                factory = {
+                    imageView.apply {
+                        this.contentMode = contentModeValue
+                        setAlpha(imageOptions.alpha.toDouble())
+                        translatesAutoresizingMaskIntoConstraints = true
+                        sd_imageTransition = SDWebImageTransition.fadeTransitionWithDuration(0.3)
+                    }
+                },
+                update = { view ->
+                    view.contentMode = contentModeValue
+                    view.setAlpha(imageOptions.alpha.toDouble())
+
+                    if (appliedTint.value != imageOptions.tint) {
+                        appliedTint.value = imageOptions.tint
+                        loadImage(imageOptions.tint)
+                    }
+                },
+            )
+        }
+    }
+    when (imageState) {
+        ImageState.Loading -> if (loading) Skeleton(cornerRadius = options?.skeletonCornerRadius ?: 0.dp)
+        ImageState.Error -> {
+            val theme = AppTheme.current
+            Icon(
+                source = "media_fail",
+                color = theme.colors.text.disable,
+                modifier = Modifier.align(Alignment.Center)
+            )
+        }
+
+        ImageState.Success -> {}
+    }
+
+}
+
+private fun ContentScale.toUIViewContentMode(): UIViewContentMode = when (this) {
+    ContentScale.Crop, ContentScale.FillWidth, ContentScale.FillHeight ->
+        UIViewContentMode.UIViewContentModeScaleAspectFill
+
+    ContentScale.Fit, ContentScale.Inside -> UIViewContentMode.UIViewContentModeScaleAspectFit
+    ContentScale.FillBounds -> UIViewContentMode.UIViewContentModeScaleToFill
+    ContentScale.None -> UIViewContentMode.UIViewContentModeCenter
+    else -> UIViewContentMode.UIViewContentModeScaleAspectFill
+}

package/example/ios/Example.xcodeproj/xcuserdata/thanhle.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict />
+</plist>

package/example/ios/Example.xcworkspace/xcuserdata/thanhle.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict />
+</plist>

package/gradle/libs.versions.toml

@@ -13,7 +13,7 @@ androidGradlePlugin = "8.13.2"
 r8 = "8.9.35"
 kotlinx-datetime = "0.7.1"
 airbnb-lottie = "5.2.0"
-compottie = "2.2.1"
+compottie = "2.1.0"
 androidx-activity = "1.9.1"
 androidx-appcompat = "1.7.0"
 material = "1.10.0"
@@ -21,6 +21,7 @@ maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
 kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
+coilGif = "2.6.0"
 
 [libraries]
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor-version" }
@@ -37,9 +38,20 @@ navigation-multiplatform = { module = "org.jetbrains.androidx.navigation:navigat
 coil-multiplatform-core = { module = "io.coil-kt.coil3:coil-core", version.ref = "coil3-multiplatform" }
 coil-multiplatform-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3-multiplatform" }
 coil-multiplatform-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil3-multiplatform" }
+coil-gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil3-multiplatform" }
+coil-giff = { module = "io.coil-kt:coil-gif", version.ref = "coilGif" }
+coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil3-multiplatform" }
+coil-http = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil3-multiplatform" }
 r8 = { module = "com.android.tools:r8", version.ref = "r8" }
 airbnb-lottie = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "airbnb-lottie" }
-compottie = { module = "io.github.alexzhirkevich:compottie", version.ref = "compottie" }
+# AI-GENERATED START
+# Depend on compottie-core (not the `compottie` umbrella). The umbrella drags in the
+# separate `keight` umbrella artifact, which collides with `keight-core` on the
+# `findRoot__at__ScriptRuntime` symbol (duplicate symbol at the iOS `ld` link of
+# shared.framework). compottie-core pulls only `keight-core` (which declares
+# keight.js.JsAny, so the earlier unlinked-symbol error stays fixed too).
+compottie = { module = "io.github.alexzhirkevich:compottie-core", version.ref = "compottie" }
+# AI-GENERATED END
 native-max-api = { group = "vn.momo.maxapi", name = "NativeMaxApi", version.ref = "nativemaxapi" }
 kits = { module = "vn.momo.kits:kits", version.ref = "kits" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }

package/gradle.properties

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

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Dec 22 10:07:29 ICT 2025
-sdk.dir=/Users/phuc/Library/Android/sdk
+#Tue Jun 17 09:25:26 ICT 2025
+sdk.dir=/Users/thanhle/Library/Android/sdk

package/package.json

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

package/.claude/settings.local.json

@@ -1,32 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(yarn react-native:*)",
-      "Read(//Users/phuc/.claude/skills/ai-skill-generator/**)",
-      "Bash(python3 scripts/install_skill.py --update)",
-      "Bash(cd /Users/phuc/momo-kits/.claude/skills/design-system-kits && mkdir -p .claude/skills/design-system-kits && mv SKILL.md README.md references .claude/skills/design-system-kits/)",
-      "Bash(mv .claude/skills/design-system-kits/* . && rmdir .claude/skills/design-system-kits && rmdir .claude/skills)",
-      "Bash(python3 scripts/migrate_screen.py --dry-run sample/shared/src/commonMain/kotlin/screens/ScreenUsage.kt)",
-      "Bash(python3 scripts/migrate_screen.py --dry-run sample/shared/src/commonMain/kotlin/screens/AnimatedHeaderUsage.kt sample/shared/src/commonMain/kotlin/screens/SnackBarScreenUsage.kt 2>&1)",
-      "Bash(python3 scripts/migrate_screen.py --dry-run sample/shared/src/commonMain/kotlin/screens/SnackBarScreenUsage.kt)",
-      "Bash(cp sample/shared/src/commonMain/kotlin/screens/SnackBarScreenUsage.kt /tmp/SnackBarScreenUsage.kt.orig && python3 scripts/migrate_screen.py sample/shared/src/commonMain/kotlin/screens/SnackBarScreenUsage.kt)",
-      "Bash(cp -r /Users/phuc/.claude/skills/migrate-screen-to-navigation-container /Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container)",
-      "Bash(mkdir -p /Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/scripts && mv /Users/phuc/momo-native-kits-2/momo-native-kits/scripts/migrate_screen.py /Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/scripts/migrate_screen.py)",
-      "Bash(python3 .claude/skills/migrate-screen-to-navigation-container/scripts/generate_eval_cases.py)",
-      "Bash(SKILL=\".claude/skills/migrate-screen-to-navigation-container\" && python3 $SKILL/scripts/migrate_screen.py $SKILL/eval/input/ 2>&1 | tail -20)",
-      "Bash(SKILL=\".claude/skills/migrate-screen-to-navigation-container\" && cp -r $SKILL/eval/input $SKILL/eval/output && python3 $SKILL/scripts/migrate_screen.py $SKILL/eval/output/ 2>&1 | tail -20)",
-      "Bash(SKILL=\".claude/skills/migrate-screen-to-navigation-container\" && cp -r $SKILL/eval/input $SKILL/eval/output && python3 $SKILL/scripts/migrate_screen.py $SKILL/eval/output/ 2>&1 | tail -25)",
-      "Bash(SKILL=\".claude/skills/migrate-screen-to-navigation-container\" && cp -r \"$SKILL/eval/input\" \"$SKILL/eval/output\" && python3 \"$SKILL/scripts/migrate_screen.py\" \"$SKILL/eval/output/\" 2>&1 | tail -25)",
-      "Bash(SKILL=\"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container\"\ncp -r \"$SKILL/eval/input\" \"$SKILL/eval/output\"\npython3 \"$SKILL/scripts/migrate_screen.py\" \"$SKILL/eval/output/\" 2>&1 | tail -25)",
-      "Bash(cd \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container\" && python3 scripts/eval_migration.py 2>&1 | tail -80)",
-      "Bash(cd \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container\" && python3 scripts/eval_migration.py 2>&1 | head -30)",
-      "Bash(SKILL=\"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container\" && rm -rf \"$SKILL/eval/output\" && cp -r \"$SKILL/eval/input\" \"$SKILL/eval/output\" && python3 \"$SKILL/scripts/migrate_screen.py\" \"$SKILL/eval/output/\" 2>&1 | tail -5)",
-      "Bash(SKILL=\"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container\"; rm -rf \"${SKILL}/eval/output\"; cp -r \"${SKILL}/eval/input\" \"${SKILL}/eval/output\" && python3 \"${SKILL}/scripts/migrate_screen.py\" \"${SKILL}/eval/output/\" 2>&1 | tail -5)",
-      "Bash(rm -rf \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/eval/output\" && cp -r \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/eval/input\" \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/eval/output\" && python3 \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/scripts/migrate_screen.py\" \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/eval/output/\" 2>&1 | tail -5)",
-      "Bash(python3 \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/scripts/eval_migration.py\" 2>&1 | head -35)",
-      "Bash(python3 \"/Users/phuc/momo-native-kits-2/momo-native-kits/.claude/skills/migrate-screen-to-navigation-container/scripts/eval_migration.py\" 2>&1 | grep -E \"^=|Files eval|Passed|Failed|A0[0-9]|Per-Group|Failures\" | head -40)",
-      "Bash(find /Users/phuc/momo-kits -name \"*.kt\" 2>/dev/null | head -20)",
-      "Bash(find /Users/phuc -name \"*PaymentConfirmScreenFull*\" 2>/dev/null | head -10)"
-    ]
-  }
-}