@momo-kits/native-kits 0.113.3-beta.6 → 0.113.3-rc.2

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

@@ -0,0 +1,58 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+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.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Spacing
+
+@Composable
+fun AnimationSearchInput(
+    animations: HeaderAnimations,
+    inputSearchProps: InputSearchProps
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .offset(
+                x = animations.translateX.dp,
+                y = animations.translateY.dp
+            )
+    ) {
+        Box(
+            modifier = Modifier
+                .height(HEADER_HEIGHT.dp)
+                .padding(vertical = Spacing.S)
+                .zIndex(1f)
+        ) {
+            Box(
+                modifier = Modifier
+                    .width(animations.width.dp)
+                    .background(
+                        color = animations.backgroundSearch,
+                        shape = RoundedCornerShape(Radius.XL)
+                    )
+            ) {
+                InputSearch(
+                    inputSearchProps = inputSearchProps.copy(
+                        showButtonText = false,
+                        backgroundColor = Color.Transparent
+                    )
+                )
+            }
+        }
+    }
+
+}

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

@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -47,10 +48,11 @@ fun Header(
     title: String,
     headerRight: @Composable (() -> Unit)? = null,
     goBack: (() -> Unit)? = null,
-    opacity: Float? = null,
+    opacity: Float = 1f,
     animatedHeader: AnimatedHeader? = null,
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps? = null,
+    headerRightWidth: Dp = 0.dp,
     useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -65,6 +67,12 @@ fun Header(
             .distinctUntilChanged()
             .collect { fraction -> colorFraction = fraction }
     }
+    val animations = useHeaderSearchAnimation(
+        opacityAni = opacity,
+        scrollState = scrollState,
+        headerRightWidth = headerRightWidth,
+        isBack = goBack != null
+    )
 
     val backgroundSearch = animateColor(
         Colors.black_01,
@@ -72,15 +80,18 @@ fun Header(
         colorFraction
     )
 
+    val searchAnimationEnable =
+        inputSearchProps != null && useAnimationSearch && headerType == HeaderType.EXTENDED
+
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
-            Modifier.height(statusBarHeight + 52.dp)
+            Modifier.height(statusBarHeight + HEADER_HEIGHT.dp)
                 .fillMaxWidth()
                 .zIndex(10f),
             contentAlignment = Alignment.BottomCenter
         ) {
             Row(
-                modifier = Modifier.height(52.dp)
+                modifier = Modifier.height(HEADER_HEIGHT.dp)
                     .fillMaxWidth()
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
@@ -120,7 +131,7 @@ fun Header(
 
                 if (useAnimationSearch || inputSearchProps == null) {
                     Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                        alpha = if (animatedHeader !== null) opacity else 1f
                     }) {
                         headerRight?.invoke()
                     }
@@ -129,7 +140,7 @@ fun Header(
 
             // Title
             Row(
-                modifier = Modifier.height(52.dp)
+                modifier = Modifier.height(HEADER_HEIGHT.dp)
                     .fillMaxWidth()
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
@@ -143,9 +154,9 @@ fun Header(
                     Box(
                         Modifier.weight(1f).graphicsLayer {
                             alpha = if (useAnimationSearch) {
-                                1f - (opacity ?: 1f)
+                                1f - (opacity)
                             } else {
-                                if (animatedHeader !== null) opacity ?: 1f else 1f
+                                if (animatedHeader !== null) opacity else 1f
                             }
                         },
                         contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
@@ -161,6 +172,13 @@ fun Header(
                     }
                 }
             }
+
+            if (searchAnimationEnable) {
+                AnimationSearchInput(
+                    animations = animations,
+                    inputSearchProps = inputSearchProps!!
+                )
+            }
         }
     }
 }

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

@@ -8,9 +8,6 @@ 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
-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.getStatusBarHeight
@@ -35,17 +32,13 @@ fun animateColor(start: Color, stop: Color, fraction: Float): Color {
 
 @Composable
 fun HeaderBackground(
-    isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     scrollState: Int,
-    inputSearchProps: InputSearchProps? = null,
-    headerRightWidth: Dp = 0.dp,
-    useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
 
     val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f),
+        targetValue = (1 - (scrollState / HEADER_HEIGHT*1f)).coerceIn(0f, 1f),
     )
 
     val backgroundColor by animateColorAsState(
@@ -66,12 +59,7 @@ fun HeaderBackground(
 
         HeaderType.EXTENDED -> {
             HeaderExtended(
-                scrollState = scrollState,
-                inputSearchProps = inputSearchProps,
-                headerRightWidth = headerRightWidth,
-                useAnimationSearch = useAnimationSearch,
                 opacityAni = opacityAni,
-                isBack = isBack,
                 statusBarHeight = statusBarHeight,
                 backgroundColor = backgroundColor,
             )

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

@@ -24,7 +24,7 @@ fun HeaderDefault(
     opacityAni: Float,
     statusBarHeight: Dp,
 ) {
-    val height = statusBarHeight + 52.dp
+    val height = statusBarHeight + HEADER_HEIGHT.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
             .background(AppTheme.current.colors.background.surface)

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

@@ -1,18 +1,10 @@
 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
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-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
 import androidx.compose.ui.geometry.Offset
@@ -22,115 +14,62 @@ 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 androidx.compose.ui.zIndex
 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
-    )
-
     Box(
-        modifier = Modifier.fillMaxWidth()
-            .height(animations.height.dp)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(154.dp)
-                .alpha(opacityAni)
-                .background(
-                    Brush.linearGradient(
-                        colors = listOf(
-                            Color(0xFFFDCADE),
-                            Color(0x00FDCADE)
-                        ),
-                        start = Offset(0f, 0f),
-                        end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
-                    )
-                )
-        ) {
-            if (AppTheme.current.assets.headerBackground != null) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(backgroundColor)
-                ) {
-                    Image(
-                        loading = false,
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(154.dp),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
-        }
-
-        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
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(154.dp)
+            .alpha(opacityAni)
+            .background(
+                Brush.linearGradient(
+                    colors = listOf(
+                        Color(0xFFFDCADE),
+                        Color(0x00FDCADE)
+                    ),
+                    start = Offset(0f, 0f),
+                    end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
                 )
-        )
-        if (inputSearchProps != null && useAnimationSearch) {
+            )
+    ) {
+        if (AppTheme.current.assets.headerBackground != null) {
             Box(
                 modifier = Modifier
-                    .height(52.dp)
-                    .offset(
-                        x = animations.translateX.dp
-                    )
-                    .padding(vertical = Spacing.S)
-                    .align(Alignment.BottomStart)
-                    .zIndex(1f)
+                    .fillMaxWidth()
+                    .background(backgroundColor)
             ) {
-                Box(
-                    modifier = Modifier
-                        .width(animations.width.dp)
-                        .background(
-                            color = animations.backgroundSearch,
-                            shape = RoundedCornerShape(Radius.XL)
-                        )
-                ) {
-                    InputSearch(
-                        inputSearchProps = inputSearchProps.copy(
-                            showButtonText = false,
-                            backgroundColor = Color.Transparent
-                        )
+                Image(
+                    loading = false,
+                    source = AppTheme.current.assets.headerBackground!!,
+                    modifier = Modifier.fillMaxWidth().height(154.dp),
+                    options = Options(
+                        contentScale = ContentScale.FillWidth
                     )
-                }
+                )
             }
         }
     }
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .alpha(1f - opacityAni)
+            .height(statusBarHeight + HEADER_HEIGHT.dp)
+            .background(
+                AppTheme.current.colors.background.surface
+            )
+            .bottomBorder(
+                strokeWidth = 1.dp,
+                color = AppTheme.current.colors.border.default
+            )
+    )
 }

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

@@ -115,11 +115,12 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressClose() {
-        api?.request("dismiss", "", {_ -> })
+        api?.request("dismiss", "", { _ -> })
     }
 
     fun onPressMore() {
-        api?.request("showTools",
+        api?.request(
+            "showTools",
             mapOf(
                 "tools" to headerRight?.tools?.map { it.toMap() },
                 "context" to mapOf(
@@ -180,6 +181,7 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         group.items.any { it.showBadge }
     }
 
+    val toolkitWidth = if (context !== null) 65.dp else 28.dp
     Row(
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -197,20 +199,26 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
             modifier = Modifier
                 .padding(start = Spacing.S)
                 .border(0.2.dp, Color(0x33000000), shape = RoundedCornerShape(14.dp))
-                .width(65.dp)
+                .width(toolkitWidth)
                 .height(28.dp)
                 .clip(shape = RoundedCornerShape(14.dp))
                 .background(Color(0x99FFFFFF))
         ) {
-            Icon(source = "help_center", size = 20.dp, modifier = Modifier.padding(4.dp).clickable {
-                onPressHelpCenter()
-            })
-            Box(
-                modifier = Modifier
-                    .width(0.5.dp)
-                    .height(12.dp)
-                    .background(Colors.black_20)
-            )
+            if (context != null) {
+                Icon(
+                    source = "help_center",
+                    size = 20.dp,
+                    modifier = Modifier.padding(4.dp).clickable {
+                        onPressHelpCenter()
+                    })
+                Box(
+                    modifier = Modifier
+                        .width(0.5.dp)
+                        .height(12.dp)
+                        .background(Colors.black_20)
+                )
+            }
+
             Icon(
                 source = "16_navigation_close_circle",
                 size = 20.dp,

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

@@ -47,6 +47,8 @@ enum class HeaderType {
     NONE
 }
 
+const val HEADER_HEIGHT = 52
+
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
@@ -85,7 +87,7 @@ fun Screen(
     val bottomPadding = min(indicator, 21.dp)
 
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
+        targetValue = ((scrollState.value / HEADER_HEIGHT*1f)).coerceIn(0f, 1f),
     )
 
     val headerAnimated =
@@ -101,10 +103,7 @@ fun Screen(
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
-                scrollState = scrollState.value,
-                inputSearchProps= inputSearchProps,
-                useAnimationSearch = useAnimationSearch,
-                headerRightWidth = headerRightWidth
+                scrollState = scrollState.value
             )
         } else {
             Box(
@@ -113,21 +112,17 @@ fun Screen(
                     .graphicsLayer { alpha = opacity }
             ) {
                 HeaderBackground(
-                    isBack = isBack,
                     headerType = headerType,
-                    scrollState = scrollState.value,
-                    inputSearchProps= inputSearchProps,
-                    useAnimationSearch = useAnimationSearch,
-                    headerRightWidth = headerRightWidth
+                    scrollState = scrollState.value
                 )
             }
         }
-
         Header(
             headerType = headerType,
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            headerRightWidth = headerRightWidth,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
@@ -138,7 +133,7 @@ fun Screen(
 
         Column(
             modifier = Modifier.fillMaxSize()
-                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
+                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + HEADER_HEIGHT.dp else 0.dp)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = {
                         keyboardController?.hide()
@@ -162,11 +157,11 @@ fun Screen(
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
+                            Spacer(modifier = Modifier.padding(top = statusBarHeight + HEADER_HEIGHT.dp + layoutOffset))
                         }
 
                         if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight))
+                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.M)))
                         }
                         content()
                     }

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

@@ -16,7 +16,7 @@ data class HeaderAnimations(
     val backgroundSearch: Color,
     val translateX: Float,
     val width: Float,
-    val height: Float
+    val translateY: Float
 )
 
 private const val SCREEN_PADDING = 12
@@ -27,43 +27,39 @@ fun useHeaderSearchAnimation(
     opacityAni: Float,
     scrollState: Int,
     headerRightWidth: Dp,
-    statusBarHeight: Dp,
     isBack: Boolean
 ): HeaderAnimations {
     val screenWidth = getScreenDimensions().width
-    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 12.dp
     val searchWidth = screenWidth - (SCREEN_PADDING * 2)
 
     val backgroundSearch by animateColorAsState(
         targetValue = animateColor(
-            AppTheme.current.colors.background.default,
             Colors.black_01,
+            AppTheme.current.colors.background.default,
             opacityAni
         ),
     )
 
     val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
+        targetValue = (scrollState / HEADER_HEIGHT*1f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
     )
 
     val animatedWidth by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(
+        targetValue = (scrollState / HEADER_HEIGHT*1f).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),
+    val animatedTranslateY by animateFloatAsState(
+        targetValue = (1 - (scrollState / HEADER_HEIGHT* 1f).coerceIn(0f, 1f)) * HEADER_HEIGHT
     )
     return HeaderAnimations(
         opacity = opacityAni,
         backgroundSearch = backgroundSearch,
         translateX = animatedTranslateX,
         width = animatedWidth,
-        height = animatedHeight
+        translateY = animatedTranslateY
     )
 }

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

@@ -143,7 +143,7 @@ fun PopupNotify(
             Modifier
                 .width(22.dp)
                 .height(22.dp)
-                .offset(x = Spacing.M / 2, y = -Spacing.M)
+                .offset(x = -Spacing.M / 2, y = -Spacing.M)
                 .background(
                     color = AppTheme.current.colors.text.default,
                     shape = RoundedCornerShape(Radius.M)

package/ios/Application/Components.swift

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

package/ios/Application/Screen.swift

@@ -34,7 +34,7 @@ public struct Screen<Content: View>: View {
         verticalAlignment: VerticalAlignment = .top,
         horizontalAlignment: HorizontalAlignment = .leading,
         title: String = "Stack",
-        titlePosition: TitlePosition = .left,
+        titlePosition: TitlePosition = .center,
         goBack: (() -> Void)? = nil,
         scrollable: Bool = true,
         onContentLayout: ((CGRect) -> Void)? = nil,

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.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.113.3-beta.6",
+  "version": "0.113.3-rc.2",
   "private": false,
   "dependencies": {},
   "devDependencies": {},