@momo-kits/native-kits 0.161.3-beta.1-debug → 0.162.0-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.3-beta.1-debug"
+        version = "0.161.0-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/build.gradle.kts.backup

@@ -1,5 +1,5 @@
-import com.vanniktech.maven.publish.JavadocJar
-import com.vanniktech.maven.publish.KotlinMultiplatform
+// import com.vanniktech.maven.publish.JavadocJar
+// import com.vanniktech.maven.publish.KotlinMultiplatform
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.vanniktech.mavenPublish)
+//         alias(libs.plugins.vanniktech.mavenPublish)
     id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
     kotlin("plugin.serialization")
 }
@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = gitlabVersion
+        version = "0.161.0-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -86,14 +86,14 @@ kotlin {
 }
 
 android {
-    namespace = "$gitlabGroup.$gitlabArtifactId"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    namespace = "vn.momo.kits.kits"
+    compileSdk = 35
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
     defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
+        minSdk = 24
     }
 }
 
@@ -132,55 +132,55 @@ compose {
     }
 }
 
-publishing {
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials {
-                username = gitlabUser
-                password = gitlabKey
-            }
-            url = uri("$gitlabUrl")
-        }
-    }
-}
-
-mavenPublishing {
-    configure(
-        KotlinMultiplatform(
-            javadocJar = JavadocJar.Empty(),
-            sourcesJar = true,
-            androidVariantsToPublish = listOf("release")
-        )
-    )
-
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials { username = gitlabUser; password = gitlabKey }
-            url = uri("$gitlabUrl")
-        }
-    }
-
-    coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-
-    pom {
-        name = "$gitlabName Klib"
-        description = "$gitlabName"
-        url = "https://gitlab.mservice.com.vn"
-        licenses {
-            license {
-                name = "The Apache License, Version 2.0"
-                url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-            }
-        }
-        developers {
-            developer {
-                id = "kotlin-hands-on"
-                name = "Kotlin Developer Advocate"
-                url = "https://github.com/kotlin-hands-on/"
-            }
-        }
-    }
-}
+// publishing {
+//     repositories {
+//         maven {
+//             name = "${gitlabRepo}Packages"
+//             credentials {
+//                 username = gitlabUser
+//                 password = gitlabKey
+//             }
+//             url = uri("$gitlabUrl")
+//         }
+//     }
+// }
+
+// mavenPublishing {
+//     configure(
+//         KotlinMultiplatform(
+//             javadocJar = JavadocJar.Empty(),
+//             sourcesJar = true,
+//             androidVariantsToPublish = listOf("release")
+//         )
+//     )
+// 
+//     repositories {
+//         maven {
+//             name = "${gitlabRepo}Packages"
+//             credentials { username = gitlabUser; password = gitlabKey }
+//             url = uri("$gitlabUrl")
+//         }
+//     }
+// 
+//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
+// 
+//     pom {
+//         name = "$gitlabName Klib"
+//         description = "$gitlabName"
+//         url = "https://gitlab.mservice.com.vn"
+//         licenses {
+//             license {
+//                 name = "The Apache License, Version 2.0"
+//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+//             }
+//         }
+//         developers {
+//             developer {
+//                 id = "kotlin-hands-on"
+//                 name = "Kotlin Developer Advocate"
+//                 url = "https://github.com/kotlin-hands-on/"
+//             }
+//         }
+//     }
+// }

package/compose/compose.podspec

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

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

@@ -1,15 +1,12 @@
 package vn.momo.kits.application
 
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
 @Immutable
 data class FeatureFlags(
-    val isBaselineEnabled: Boolean? = false,
-    val isWhiteList: Boolean? = false,
-    val allowFontScale: Boolean? = true,
+    val showBaseLineDebug: Boolean? = false,
 )
 
 @Immutable
@@ -31,6 +28,7 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
+    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -62,6 +60,7 @@ data class MiniAppContext(
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -75,7 +74,7 @@ data class MiniAppContext(
             if (child == null) return parent
 
             return FeatureFlags(
-                isBaselineEnabled = parent.isBaselineEnabled ?: child.isBaselineEnabled
+                showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
             )
         }
     }
@@ -89,19 +88,12 @@ data class ComponentInformation(
     val action: String? = null
 )
 
+var IsShowBaseLineDebug = false
+
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
-var IsShowBaseLineDebug = false
-
-private val UseFontScaleSystemState = mutableStateOf(true)
-var UseFontScaleSystem: Boolean
-    get() = UseFontScaleSystemState.value
-    set(value) {
-        UseFontScaleSystemState.value = value
-    }
-
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
@@ -113,3 +105,5 @@ val AppLanguage = staticCompositionLocalOf<String?> {
 val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
     null
 }
+
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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/BaselineView.kt

@@ -21,6 +21,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.unit.dp
+import io.ktor.util.Platform
+import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.const.Colors
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.platform.getPlatformName
 import vn.momo.kits.platform.getStatusBarHeight
 

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

@@ -0,0 +1,17 @@
+package vn.momo.kits.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import vn.momo.kits.application.ScaleSizeMaxRate
+
+@Composable
+fun ScaleSizeScope(
+    scaleSizeMaxRate: Float? = null,
+    content: @Composable () -> Unit
+) {
+    CompositionLocalProvider(
+        ScaleSizeMaxRate provides scaleSizeMaxRate,
+    ) {
+        content()
+    }
+}

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

@@ -1,6 +1,7 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.border
+import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -37,8 +38,9 @@ fun Text(
     minLines: Int = 1,
     letterSpacing: TextUnit = TextUnit.Unspecified,
     softWrap: Boolean = true,
-    accessibilityId: String? = null
-) {
+    accessibilityId: String? = null,
+    inlineContent: Map<String, InlineTextContent> = mapOf(),
+    ) {
     Text(
         text = AnnotatedString(text),
         color = color,
@@ -53,7 +55,8 @@ fun Text(
         minLines = minLines,
         letterSpacing = letterSpacing,
         softWrap = softWrap,
-        accessibilityId = accessibilityId
+        accessibilityId = accessibilityId,
+        inlineContent = inlineContent
     )
 }
 
@@ -73,7 +76,8 @@ fun Text(
     minLines: Int = 1,
     letterSpacing: TextUnit = TextUnit.Unspecified,
     softWrap: Boolean = true,
-    accessibilityId: String? = null
+    accessibilityId: String? = null,
+    inlineContent: Map<String, InlineTextContent> = mapOf(),
 ) {
     // Cache theme access to avoid repeated lookups
     val theme = AppTheme.current
@@ -124,7 +128,8 @@ fun Text(
         minLines = minLines,
         textDecoration = textDecoration,
         onTextLayout = onTextLayout ?: {},
-        overflow = overflow
+        overflow = overflow,
+        inlineContent = inlineContent
     )
 }
 

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -7,11 +7,15 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.application.UseFontScaleSystem
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.Res
 import vn.momo.uikits.resources.momosignature
@@ -29,23 +33,34 @@ import kotlin.math.max
 import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
-const val MAX_FONT_SCALE = 1.2f
+const val MAX_FONT_SCALE = 1.5f
+const val MAX_DEVICE_SCALE = 5
 
 @Composable
 fun scaleSize(size: Float): Float {
-    if (UseFontScaleSystem) {
-        val deviceWidth = getScreenDimensions().width
-        val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
-        val fontScale = LocalDensity.current.fontScale
+    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
+    val deviceWidth = getScreenDimensions().width
+    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
-        val maxSize = size * MAX_FONT_SCALE
-        val fontSizeScaleDevice = if (deviceScale > 1) deviceScale * size else size
-        val fontSizeScaleOS = if (fontScale > 1) fontScale * size else size
+    val density = LocalDensity.current
+    val fontScale = density.fontScale
+
+    var fontSizeScaleDevice = size
+    var fontSizeScaleOS = size
 
-        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+    if (deviceScale > 1) {
+        fontSizeScaleDevice =
+            min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
 
-    return size
+    if (fontScale > 1) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
+    }
+
+    return max(
+        fontSizeScaleDevice,
+        fontSizeScaleOS
+    )
 }
 
 @Composable

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

@@ -9,9 +9,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
 import vn.momo.kits.application.*
 import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
@@ -57,19 +54,6 @@ fun NavigationContainer(
     DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
-    LaunchedEffect(maxApi) {
-        val api = maxApi ?: return@LaunchedEffect
-        runCatching {
-            api.observer("use_font_scale")
-                .map { parseUseFontScale(it) }
-                .distinctUntilChanged()
-                .catch { /* ignore observer errors, keep current value */ }
-                .collect { enabled ->
-                    UseFontScaleSystem = enabled
-                }
-        }
-    }
-
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
@@ -80,6 +64,7 @@ fun NavigationContainer(
             ApplicationContext provides mergedContext,
             AppConfig provides config,
             AppLanguage provides language,
+            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
         ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
@@ -158,15 +143,3 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
-
-private fun parseUseFontScale(raw: Any?): Boolean = when (raw) {
-    null -> true
-    is Boolean -> raw
-    is String -> raw.isBlank() || !raw.equals("false", ignoreCase = true)
-    is Number -> raw.toInt() != 0
-    is Map<*, *> -> {
-        val nested = raw["response"] ?: raw["value"] ?: raw["data"]
-        if (nested === raw) true else parseUseFontScale(nested)
-    }
-    else -> true
-}

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/gradle/libs.versions.toml

@@ -13,13 +13,13 @@ 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"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.160.1-beta.6"
+kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
 
 [libraries]
@@ -39,7 +39,14 @@ coil-multiplatform-compose = { module = "io.coil-kt.coil3:coil-compose", version
 coil-multiplatform-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", 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.3-beta.1
+version=0.162.0
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven