@momo-kits/native-kits 0.113.2-beta.15 → 0.113.2-beta.16

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

@@ -1,5 +1,6 @@
 package vn.momo.kits.application
 
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -23,6 +24,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
@@ -40,6 +42,15 @@ import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.platform.getStatusBarHeight
 
+enum class TitlePosition {
+    LEFT, CENTER,
+}
+
+data class AnimatedHeader(
+    val type: HeaderType = HeaderType.DEFAULT,
+    val composable: @Composable (scrollState: Int) -> Unit = {}
+)
+
 @Composable
 fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
@@ -66,15 +77,24 @@ fun Header(
             .collect { fraction -> colorFraction = fraction }
     }
 
-    val backgroundSearch = animateColor(
-        Colors.black_01,
-        AppTheme.current.colors.background.default,
-        colorFraction
+    val backgroundSearch by animateColorAsState(
+        targetValue = animateColor(
+            AppTheme.current.colors.background.surface,
+            AppTheme.current.colors.background.default,
+            colorFraction
+        )
     )
 
+    val backgroundColor = if (scrollState == 0) {
+        Color.Transparent
+    } else {
+        AppTheme.current.colors.background.surface
+    }
+
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
+                .background(backgroundColor)
                 .fillMaxWidth()
                 .zIndex(10f),
             contentAlignment = Alignment.BottomCenter
@@ -118,9 +138,9 @@ fun Header(
                     }
                 }
 
-                if (useAnimationSearch || inputSearchProps == null) {
+                if ((useAnimationSearch && inputSearchProps != null) || inputSearchProps == null) {
                     Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                        alpha = if (useAnimationSearch) 1f - (opacity ?: 1f) else 1f
                     }) {
                         headerRight?.invoke()
                     }
@@ -136,32 +156,40 @@ fun Header(
             ) {
                 if (goBack != null && titlePosition == TitlePosition.LEFT) {
                     Spacer(Modifier.width(40.dp))
+                }
+                if (inputSearchProps != null && !useAnimationSearch) {
+                    InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
                 } else {
-                    if (inputSearchProps != null && !useAnimationSearch) {
-                        InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
-                    } else {
-                        Box(
-                            Modifier.weight(1f).graphicsLayer {
-                                alpha = if (useAnimationSearch) {
-                                    1f - (opacity ?: 1f)
-                                } else {
-                                    if (animatedHeader !== null) opacity ?: 1f else 1f
-                                }
-                            },
-                            contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
-                        ) {
-
-                            HeaderTitle(
-                                title = title,
-                                color = tintIconColor,
-                                modifier = Modifier.semantics {
-                                    testTag = "title_navigation_header"
-                                }
-                            )
-                        }
+                    Box(
+                        Modifier.weight(1f).graphicsLayer {
+                            alpha = if (useAnimationSearch && inputSearchProps != null) {
+                                1f - (opacity ?: 1f)
+                            } else {
+                                if (animatedHeader !== null) opacity ?: 1f else 1f
+                            }
+                        },
+                        contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
+                    ) {
+                        HeaderTitle(
+                            title = title,
+                            color = tintIconColor,
+                            modifier = Modifier.semantics {
+                                testTag = "title_navigation_header"
+                            }
+                        )
                     }
                 }
             }
         }
     }
-}
+}
+
+
+fun animateColor(start: Color, stop: Color, fraction: Float): Color {
+    return Color(
+        red = start.red + fraction * (stop.red - start.red),
+        green = start.green + fraction * (stop.green - start.green),
+        blue = start.blue + fraction * (stop.blue - start.blue),
+        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
+    )
+}

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

@@ -1,11 +1,8 @@
 package vn.momo.kits.application
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -13,25 +10,11 @@ import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
+import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.kits.platform.getStatusBarHeight
 
-enum class TitlePosition {
-    LEFT, CENTER,
-}
-
-data class AnimatedHeader(
-    val type: HeaderType = HeaderType.DEFAULT,
-    val composable: @Composable (scrollState: Int) -> Unit = {}
-)
-
-fun animateColor(start: Color, stop: Color, fraction: Float): Color {
-    return Color(
-        red = start.red + fraction * (stop.red - start.red),
-        green = start.green + fraction * (stop.green - start.green),
-        blue = start.blue + fraction * (stop.blue - start.blue),
-        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
-    )
-}
+private const val SCREEN_PADDING = 12
+private const val BACK_WIDTH = 28
 
 @Composable
 fun HeaderBackground(
@@ -43,39 +26,41 @@ fun HeaderBackground(
     useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
+    val screenWidth = getScreenDimensions().width
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
+    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
 
-    val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f),
+    val animations = useHeaderSearchAnimation(
+        scrollState = scrollState,
+        statusBarHeight = statusBarHeight,
+        leftPosition = leftPosition,
+        searchWidth = searchWidth,
+        headerRightWidth = headerRightWidth
     )
 
-    val backgroundColor by animateColorAsState(
-        targetValue = animateColor(
-            Color.Transparent,
-            AppTheme.current.colors.background.surface,
-            opacityAni
-        ),
-    )
+    val backgroundColor = if (scrollState == 0) {
+        Color.Transparent
+    } else {
+        AppTheme.current.colors.background.surface
+    }
 
     when (headerType) {
         HeaderType.DEFAULT -> {
+            val height = statusBarHeight + 52.dp
             HeaderDefault(
-                opacityAni = opacityAni,
-                statusBarHeight = statusBarHeight,
-                backgroundColor = backgroundColor,
+                height = height,
+                animations = animations,
+                backgroundColor = backgroundColor
             )
         }
 
         HeaderType.EXTENDED -> {
-            HeaderExtended(
-                scrollState = scrollState,
+           HeaderExtended(
+                animations = animations,
                 inputSearchProps = inputSearchProps,
-                headerRightWidth = headerRightWidth,
                 useAnimationSearch = useAnimationSearch,
-                opacityAni = opacityAni,
-                isBack = isBack,
-                statusBarHeight = statusBarHeight,
-                backgroundColor = backgroundColor,
-            )
+                backgroundColor = backgroundColor
+           )
         }
 
         else -> {

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

@@ -21,11 +21,10 @@ import vn.momo.kits.utils.bottomBorder
 
 @Composable
 fun HeaderDefault(
-    opacityAni: Float,
-    statusBarHeight: Dp,
-    backgroundColor: Color
+    height: Dp,
+    backgroundColor: Color,
+    animations: HeaderAnimations
 ) {
-    val height = statusBarHeight + 52.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
             .background(backgroundColor)
@@ -38,7 +37,7 @@ fun HeaderDefault(
             modifier = Modifier
                 .height(height)
                 .fillMaxWidth()
-                .alpha(opacityAni)
+                .alpha(animations.opacity)
                 .background(
                     Brush.linearGradient(
                         colors = listOf(

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

@@ -1,7 +1,5 @@
 package vn.momo.kits.application
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -20,47 +17,30 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Image
 import vn.momo.kits.components.InputSearch
 import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.components.Options
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
-import vn.momo.kits.platform.getScreenDimensions
-import vn.momo.kits.utils.bottomBorder
 
 @Composable
 fun HeaderExtended(
-    opacityAni: Float,
-    inputSearchProps: InputSearchProps?,
-    useAnimationSearch: Boolean = true,
-    scrollState: Int,
-    headerRightWidth: Dp,
-    isBack: Boolean,
-    statusBarHeight: Dp,
-    backgroundColor: Color
-) {
-    val animations = useHeaderSearchAnimation(
-        opacityAni = opacityAni,
-        scrollState = scrollState,
-        headerRightWidth = headerRightWidth,
-        statusBarHeight = statusBarHeight,
-        isBack = isBack
-    )
-
+    animations: HeaderAnimations,
+    inputSearchProps: InputSearchProps? = null,
+    useAnimationSearch: Boolean = false,
+    backgroundColor: Color = Color.Transparent
+){
     Box(
-        modifier = Modifier.fillMaxWidth()
-            .height(animations.height.dp)
+        modifier = Modifier.fillMaxWidth().height(animations.height.dp)
     ) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(154.dp)
-                .alpha(opacityAni)
+                .alpha(animations.opacity)
                 .background(
                     Brush.linearGradient(
                         colors = listOf(
@@ -90,19 +70,6 @@ fun HeaderExtended(
             }
         }
 
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .alpha(1f - opacityAni)
-                .height(statusBarHeight + 52.dp)
-                .background(
-                    AppTheme.current.colors.background.surface
-                )
-                .bottomBorder(
-                    strokeWidth = 1.dp,
-                    color = AppTheme.current.colors.border.default
-                )
-        )
         if (inputSearchProps != null && useAnimationSearch) {
             Box(
                 modifier = Modifier
@@ -131,4 +98,5 @@ fun HeaderExtended(
             }
         }
     }
-}
+}
+

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

@@ -79,12 +79,12 @@ object Spacing {
 
 @Composable
 fun HeaderRight(
-    headerRight: HeaderRightData? = null,
+    data: HeaderRightData? = null,
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        ToolkitHeaderRight(headerRight = headerRight)
+        ToolkitHeaderRight(headerRight = data)
     }
 }
 
@@ -180,6 +180,8 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         group.items.any { it.showBadge }
     }
 
+    if (context === null) return
+
     Row(
         verticalAlignment = Alignment.CenterVertically
     ) {

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

@@ -8,6 +8,7 @@ import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
 import vn.momo.kits.const.Typography
 
+
 @Composable
 fun HeaderTitle(
     title: String = "",

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

@@ -68,7 +68,6 @@ fun Screen(
     layoutOffset: Dp = 56.dp,
     inputSearchProps: InputSearchProps? = null,
     useAnimationSearch: Boolean = false,
-    headerRightWidth: Dp = 0.dp,
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -85,7 +84,7 @@ fun Screen(
     val bottomPadding = min(indicator, 21.dp)
 
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
+        targetValue = ((scrollState.value / 114f)).coerceIn(0f, 1f)
     )
 
     val headerAnimated =
@@ -95,16 +94,15 @@ fun Screen(
 
     Box(
         Modifier.fillMaxSize()
-            .background(backgroundColor ?: AppTheme.current.colors.background.default)
+            .background(AppTheme.current.colors.background.surface)
     ) {
 
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
                 scrollState = scrollState.value,
-                inputSearchProps= inputSearchProps,
-                useAnimationSearch = useAnimationSearch,
-                headerRightWidth = headerRightWidth
+                inputSearchProps = inputSearchProps,
+                useAnimationSearch = useAnimationSearch
             )
         } else {
             Box(
@@ -116,9 +114,8 @@ fun Screen(
                     isBack = isBack,
                     headerType = headerType,
                     scrollState = scrollState.value,
-                    inputSearchProps= inputSearchProps,
-                    useAnimationSearch = useAnimationSearch,
-                    headerRightWidth = headerRightWidth
+                    inputSearchProps = inputSearchProps,
+                    useAnimationSearch = useAnimationSearch
                 )
             }
         }
@@ -133,7 +130,7 @@ fun Screen(
             animatedHeader = animatedHeader,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value,
-            useAnimationSearch = useAnimationSearch,
+            useAnimationSearch = useAnimationSearch
         )
 
         Column(
@@ -158,7 +155,11 @@ fun Screen(
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
-                Box {
+                Box(
+                    modifier = Modifier.background(
+                        backgroundColor ?: AppTheme.current.colors.background.default
+                    )
+                ) {
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {

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

@@ -3,13 +3,11 @@ package vn.momo.kits.application
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
-import vn.momo.kits.platform.getScreenDimensions
+import androidx.compose.runtime.getValue
 
 data class HeaderAnimations(
     val opacity: Float,
@@ -19,46 +17,40 @@ data class HeaderAnimations(
     val height: Float
 )
 
-private const val SCREEN_PADDING = 12
-private const val BACK_WIDTH = 28
-
 @Composable
 fun useHeaderSearchAnimation(
-    opacityAni: Float,
     scrollState: Int,
-    headerRightWidth: Dp,
     statusBarHeight: Dp,
-    isBack: Boolean
+    leftPosition: Dp,
+    searchWidth: Int,
+    headerRightWidth: Dp
 ): HeaderAnimations {
-    val screenWidth = getScreenDimensions().width
-    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
-    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
+    val opacityAni by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f)
+    )
 
     val backgroundSearch by animateColorAsState(
         targetValue = animateColor(
             AppTheme.current.colors.background.default,
             Colors.black_01,
             opacityAni
-        ),
+        )
     )
 
     val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
+        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12
     )
 
     val animatedWidth by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(
-            0f,
-            1f
-        ) * ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth,
+        targetValue = (scrollState / 52f).coerceIn(0f, 1f) *
+                ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth
     )
 
     val animatedHeight by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f).coerceIn(
-            0f,
-            1f
-        )) * (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52),
+        targetValue = (1 - (scrollState / 52f).coerceIn(0f, 1f)) *
+                (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52)
     )
+
     return HeaderAnimations(
         opacity = opacityAni,
         backgroundSearch = backgroundSearch,

package/ios/Application/Components.swift

@@ -203,7 +203,9 @@ public struct Header: View {
                                 Text(title)
                                     .font(.headline)
                                     .foregroundColor(tintIconColor)
+                                    .frame(maxWidth: UIScreen.main.bounds.width - 172)
                                     .frame(maxWidth: titlePosition == .center ? .infinity : nil, alignment: titlePosition == .center ? .center : .leading)
+                                    .lineLimit(1)
                             }
                             Spacer()
                         }

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.
-#Sun Mar 02 11:30:14 ICT 2025
-sdk.dir=/Users/nguyenhoangson/Library/Android/sdk
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.113.2-beta.15",
+  "version": "0.113.2-beta.16",
   "private": false,
   "dependencies": {},
   "devDependencies": {},