@momo-kits/native-kits 0.161.2-beta.8-debug → 0.161.2-nocompotie.999-debug

package/compose/build.gradle.kts

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
+    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.2-beta.8-debug"
+        version = "0.161.2-nocompotie.999-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -73,7 +73,6 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
-            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
@@ -109,17 +108,12 @@ repositories {
         }
     }
     mavenCentral()
-    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" }
     }
     maven {
-        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
-        credentials {
-            username = "viewer"
-            password = "viewer"
-        }
+        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
         isAllowInsecureProtocol = true
     }
 }

package/compose/build.gradle.kts.backup

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
+    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -73,7 +73,6 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
-            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
@@ -109,17 +108,12 @@ repositories {
         }
     }
     mavenCentral()
-    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" }
     }
     maven {
-        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
-        credentials {
-            username = "viewer"
-            password = "viewer"
-        }
+        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
         isAllowInsecureProtocol = true
     }
 }

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-search-header.1'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -78,14 +78,8 @@ actual fun LottieAnimation(
     tintColor: Color?,
     bgColor: Color?,
     placedAsOverlay: Boolean,
-    modifier: Modifier,
-    useCompose: Boolean
+    modifier: Modifier
 ) {
-    if (useCompose) {
-        ComposeLottieAnimation(path, tintColor, bgColor, modifier)
-        return
-    }
-
     val json = readJson(path)
 
     if (json.isEmpty()) {

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

@@ -3,7 +3,6 @@ package vn.momo.kits.navigation
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.unit.Dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -50,9 +49,7 @@ fun NavigationContainer(
         }
     }
 
-    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
-    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
-    val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
+    val startDestination = DynamicScreenRegistry.register(initialScreenName, initialScreen, options)
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
@@ -135,7 +132,6 @@ fun NavigationContainer(
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
         }
     }
 }

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

@@ -196,18 +196,6 @@ object DynamicScreenRegistry {
         return DynamicScreenRoute(id)
     }
 
-    fun nextId(): Int = idCounter++
-
-    fun bind(id: Int, screenName: String, content: @Composable () -> Unit, options: NavigationOptions?) {
-        screens[id] = DynamicScreen(
-            id = id,
-            name = screenName,
-            content = content,
-            options = options
-        )
-        if (id >= idCounter) idCounter = id + 1 // keep counter ahead after process-death restore
-    }
-
     fun unregisterScreen(id: Int) {
         screens.remove(id)
     }

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

@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -28,12 +27,10 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 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
@@ -182,20 +179,23 @@ internal fun StackScreen(
                 HeaderBackground()
             }
 
-            Box(Modifier.zIndex(4f)) {
+            Box(Modifier.zIndex(5f)) {
                 Header(onBackHandler)
             }
 
-            Column(Modifier.zIndex(5f)) {
+            Column(Modifier.zIndex(6f)) {
                 SearchAnimated(isScrollInProgress = scrollInProcess)
             }
 
             Column(Modifier.zIndex(2f).fillMaxSize()) {
                 MainContent(content = content)
+            }
+
+            Box(Modifier.zIndex(4f).align(Alignment.BottomCenter)) {
                 FooterContent()
             }
 
-            Box(Modifier.zIndex(6f)) {
+            Box(Modifier.zIndex(7f)) {
                 FloatingContent()
             }
 
@@ -261,6 +261,11 @@ fun ColumnScope.MainContent(content: @Composable () -> Unit) {
         ScreenContent(content = content)
     }
 
+    if (options.footerComponent != null) {
+        val footerHeight = LocalFooterHeightPx.current
+        val footerHeightDp = with(density) { footerHeight.value.toDp() }
+        Spacer(Modifier.height(footerHeightDp))
+    }
 }
 
 @Composable
@@ -274,7 +279,7 @@ fun ScreenContent(content: @Composable () -> Unit) {
             Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)) {
                 animatedHeader.composable.invoke(scrollState.value)
             }
-            Box(Modifier.padding(top = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
+            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
                 content()
             }
         }
@@ -287,24 +292,22 @@ fun ScreenContent(content: @Composable () -> Unit) {
 fun FooterContent() {
     val options = LocalOptions.current
     if (options.footerComponent != null) {
-        val keyboardSize = keyboardSizeState()
-        val bottomPadding = (AppNavigationBar.current - keyboardSize.value).coerceAtLeast(0.dp)
+        val ime = WindowInsets.ime
+        val density = LocalDensity.current
+        val imeBottom = ime.getBottom(density)
+        val thresholdPx = with(density) { 50.dp.toPx() }
+        val isKeyboardVisible = imeBottom > thresholdPx
+        val bottomPadding = if (isKeyboardVisible) 0.dp else AppNavigationBar.current
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }
 
-@Composable
-fun keyboardSizeState(): State<Dp> {
-    val bottom = WindowInsets.ime.asPaddingValues()
-    return rememberUpdatedState(bottom.calculateBottomPadding())
-}
-
 @Composable
 fun OverplayView(bottomTabIndex: Int, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
-        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 7f).fillMaxSize()) {
+        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 8f).fillMaxSize()) {
             if (bottomTabIndex != -1) return@Box
             if (OverplayComponentRegistry.currentRootId() != id) return@Box
             OverplayComponentRegistry.OverlayComponent()
@@ -463,6 +466,13 @@ fun SearchAnimated(
     }
 }
 
+@Composable
+internal fun isKeyboardVisible(): Boolean {
+    val ime = WindowInsets.ime
+    val density = LocalDensity.current
+    return ime.getBottom(density) > 0
+}
+
 private fun quantize(value: Int, stepPx: Int): Int {
     if (stepPx <= 1) return value
     return (value / stepPx) * stepPx

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

@@ -44,21 +44,13 @@ fun supportsImePadding(): Boolean = when (val v = getOSVersion()) {
     is OSVersion.IOS -> true
 }
 
-/**
- * @param useCompose when `true`, renders via the pure-Compose Compottie engine instead of the
- * platform-native engine (airbnb-lottie on Android, lottie-ios on iOS). Defaults to `false` for
- * backward compatibility. Note: when `useCompose = true`, `tintColor` recolors only the fill/stroke
- * color slots (matching the native lottie-ios per-keypath tint), so gradient and text-layer colors
- * are left untinted; `placedAsOverlay` is a no-op.
- */
 @Composable
 expect fun LottieAnimation(
     path: String,
     tintColor: Color? = null,
     bgColor: Color? = null,
     placedAsOverlay: Boolean = false,
-    modifier: Modifier = Modifier,
-    useCompose: Boolean = false
+    modifier: Modifier = Modifier
 )
 
 expect fun NativePaint.setColor(

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

@@ -24,21 +24,13 @@ fun getResource(name: String): DrawableResource {
 @Composable
 fun readJson(name: String): String {
     val path = name.plus(".json")
-    val candidatePaths = listOf(
-        path,
-        "composeResources/vn.momo.compose.resources/$path",
-    )
 
     val jsonContent by rememberState(path, { "" }) {
         val cached = resourceCache.getOrPut(path) {
-            var content = ""
-            for (candidate in candidatePaths) {
-                try {
-                    content = readResourceBytes(candidate).decodeToString()
-                    break
-                } catch (_: Exception) {
-                    // try next candidate
-                }
+            val content = try {
+                readResourceBytes(path).decodeToString()
+            } catch (_: Exception) {
+                ""
             }
             ResourceCache.JSON(content)
         } as ResourceCache.JSON

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -98,14 +98,8 @@ actual fun LottieAnimation(
     tintColor: Color?,
     bgColor: Color?,
     placedAsOverlay: Boolean,
-    modifier: Modifier,
-    useCompose: Boolean
+    modifier: Modifier
 ) {
-    if (useCompose) {
-        ComposeLottieAnimation(path, tintColor, bgColor, modifier)
-        return
-    }
-
     var animation by remember { mutableStateOf<CompatibleAnimation?>(null) }
 
     LaunchedEffect(Unit) {

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,6 @@ androidGradlePlugin = "8.13.2"
 r8 = "8.9.35"
 kotlinx-datetime = "0.7.1"
 airbnb-lottie = "5.2.0"
-compottie = "2.2.1"
 androidx-activity = "1.9.1"
 androidx-appcompat = "1.7.0"
 material = "1.10.0"
@@ -39,7 +38,6 @@ 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" }
 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.5
+version=0.161.2-nocompotie.999
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#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.8-debug",
+  "version": "0.161.2-nocompotie.999-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/settings.gradle.kts

@@ -19,11 +19,7 @@ pluginManagement {
             credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
         }
         maven {
-            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
-            credentials {
-                username = "viewer"
-                password = "viewer"
-            }
+            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
             isAllowInsecureProtocol = true
         }
     }
@@ -39,20 +35,12 @@ dependencyResolutionManagement {
             }
         }
         mavenCentral()
-        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/")
-            credentials {
-                username = "viewer"
-                password = "viewer"
-            }
+            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
             isAllowInsecureProtocol = true
         }
     }

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

@@ -1,62 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-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.dynamic.rememberLottieDynamicProperties
-import io.github.alexzhirkevich.compottie.rememberLottieComposition
-import io.github.alexzhirkevich.compottie.rememberLottiePainter
-import vn.momo.kits.utils.readJson
-
-@OptIn(ExperimentalCompottieApi::class)
-@Composable
-internal fun ComposeLottieAnimation(
-    path: String,
-    tintColor: Color?,
-    bgColor: Color?,
-    modifier: Modifier,
-) {
-    val json = readJson(path)
-
-    if (json.isEmpty()) {
-        Box(modifier.background(bgColor ?: Color.Transparent))
-        return
-    }
-
-    val composition by rememberLottieComposition(json) {
-        LottieCompositionSpec.JsonString(json)
-    }
-
-    // Recolor only the fill/stroke color slots (matching the native lottie-ios per-keypath tint)
-    // instead of a global ColorFilter.tint, which would flatten a multicolor animation to a silhouette.
-    val dynamicProperties = if (tintColor != null) {
-        rememberLottieDynamicProperties(tintColor) {
-            shapeLayer("**") {
-                fill("**") { color { tintColor } }
-                stroke("**") { color { tintColor } }
-            }
-        }
-    } else {
-        null
-    }
-
-    Box(modifier.background(bgColor ?: Color.Transparent)) {
-        Image(
-            painter = rememberLottiePainter(
-                composition = composition,
-                iterations = Compottie.IterateForever,
-                dynamicProperties = dynamicProperties,
-            ),
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-        )
-    }
-}