@momo-kits/native-kits 0.161.2-beta.2-debug → 0.161.2-beta.20-debug

package/compose/build.gradle.kts

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

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/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/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/navigation/StackScreen.kt

@@ -274,7 +274,7 @@ fun ScreenContent(content: @Composable () -> Unit) {
             Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)) {
                 animatedHeader.composable.invoke(scrollState.value)
             }
-            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
+            Box(Modifier.padding(top = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
                 content()
             }
         }

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,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"
@@ -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.2-beta.2
+version=0.161.2-beta.20
 
 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.161.2-beta.2-debug",
+  "version": "0.161.2-beta.20-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},