@momo-kits/native-kits 0.161.2-beta.15-debug → 0.161.2-beta.16-debug

package/compose/build.gradle.kts

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

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/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)
     }
 }
@@ -155,7 +127,7 @@ private fun BackButton(borderColor: Color, backgroundButton: Color, tintIconColo
             .background(backgroundButton, RoundedCornerShape(100))
             .border(width = 0.2.dp, color = borderColor, shape = RoundedCornerShape(100))
             .activeOpacityClickable(onClick = onBackHandler)
-            .padding(Spacing.XS)
+//            .padding(Spacing.XS)
             .setAutomationId("btn_navigation_back"),
         contentAlignment = Alignment.Center
     ) {
@@ -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,9 +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
-// AI-GENERATED START
 import io.github.alexzhirkevich.compottie.animateLottieCompositionAsState
-// AI-GENERATED END
 import io.github.alexzhirkevich.compottie.dynamic.rememberLottieDynamicProperties
 import io.github.alexzhirkevich.compottie.rememberLottieComposition
 import io.github.alexzhirkevich.compottie.rememberLottiePainter
@@ -51,15 +49,6 @@ internal fun ComposeLottieAnimation(
         null
     }
 
-    // AI-GENERATED START
-    // We use the compottie-core painter (not the umbrella overload) so the `keight`
-    // umbrella stays out of the iOS link graph (see libs.versions.toml). The core painter
-    // requires us to drive playback and supply the expression engine ourselves:
-    //  - animateLottieCompositionAsState gives the looping progress (IterateForever).
-    //  - enableExpressions = false disables Lottie JS expressions, which live in the
-    //    umbrella + keight umbrella. MoMo's UI animations do not use JS expressions.
-    //  - expressionEngineFactory is never invoked while enableExpressions = false
-    //    (AnimationState.scriptEngine is `by lazy`), so the stub below cannot run.
     val lottieState = animateLottieCompositionAsState(
         composition = composition,
         iterations = Compottie.IterateForever,
@@ -80,5 +69,4 @@ internal fun ComposeLottieAnimation(
             modifier = Modifier.fillMaxSize(),
         )
     }
-    // AI-GENERATED END
 }

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