@momo-kits/native-kits 0.113.3-beta.1 → 0.113.3-beta.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(52.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,6 +80,9 @@ fun Header(
         colorFraction
     )
 
+    val searchAnimationEnable =
+        inputSearchProps != null && useAnimationSearch && headerType == HeaderType.EXTENDED
+
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
@@ -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()
                     }
@@ -142,15 +153,10 @@ fun Header(
                 } else {
                     Box(
                         Modifier.weight(1f).graphicsLayer {
-                            alpha = if (useAnimationSearch) {
-                                1f - (opacity ?: 1f)
-                            } else {
-                                if (animatedHeader !== null) opacity ?: 1f else 1f
-                            }
+                            alpha = if (searchAnimationEnable) 1f - (opacity) else 1f
                         },
                         contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
                     ) {
-
                         HeaderTitle(
                             title = title,
                             color = tintIconColor,
@@ -161,6 +167,13 @@ fun Header(
                     }
                 }
             }
+
+            if (searchAnimationEnable) {
+                AnimationSearchInput(
+                    animations = animations,
+                    inputSearchProps = inputSearchProps!!
+                )
+            }
         }
     }
 }

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

@@ -10,7 +10,6 @@ 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,12 +34,8 @@ 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()
 
@@ -66,12 +61,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/HeaderExtended.kt

@@ -37,100 +37,54 @@ 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 + 52.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/Screen.kt

@@ -50,7 +50,6 @@ enum class HeaderType {
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
-    isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
@@ -64,8 +63,6 @@ fun Screen(
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = { HeaderRight() },
     fabProps: FabProps? = null,
-    animatedHeader: AnimatedHeader? = null,
-    layoutOffset: Dp = 56.dp,
     inputSearchProps: InputSearchProps? = null,
     useAnimationSearch: Boolean = false,
     headerRightWidth: Dp = 0.dp,
@@ -88,49 +85,23 @@ fun Screen(
         targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
     )
 
-    val headerAnimated =
-        @Composable {
-            animatedHeader?.composable?.invoke(scrollState.value)
-        }
-
     Box(
         Modifier.fillMaxSize()
             .background(backgroundColor ?: AppTheme.current.colors.background.default)
     ) {
 
-        if (animatedHeader === null) {
-            HeaderBackground(
-                headerType = headerType,
-                scrollState = scrollState.value,
-                inputSearchProps= inputSearchProps,
-                useAnimationSearch = useAnimationSearch,
-                headerRightWidth = headerRightWidth
-            )
-        } else {
-            Box(
-                Modifier.zIndex(2f)
-                    .background(Color.White.copy(alpha = opacity))
-                    .graphicsLayer { alpha = opacity }
-            ) {
-                HeaderBackground(
-                    isBack = isBack,
-                    headerType = headerType,
-                    scrollState = scrollState.value,
-                    inputSearchProps= inputSearchProps,
-                    useAnimationSearch = useAnimationSearch,
-                    headerRightWidth = headerRightWidth
-                )
-            }
-        }
-
+        HeaderBackground(
+            headerType = headerType,
+            scrollState = scrollState.value,
+        )
         Header(
             headerType = headerType,
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            headerRightWidth = headerRightWidth,
             goBack = goBack,
             opacity = opacity,
-            animatedHeader = animatedHeader,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value,
             useAnimationSearch = useAnimationSearch,
@@ -138,7 +109,7 @@ fun Screen(
 
         Column(
             modifier = Modifier.fillMaxSize()
-                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
+                .padding(top = if (headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = {
                         keyboardController?.hide()
@@ -146,7 +117,6 @@ fun Screen(
                 }
                 .zIndex(1f),
         ) {
-
             Column(
                 modifier = Modifier
                     .conditional(scrollable) { weight(1f) }
@@ -159,12 +129,7 @@ fun Screen(
                 horizontalAlignment = horizontalAlignment
             ) {
                 Box {
-                    headerAnimated()
                     Column {
-                        if (animatedHeader !== null) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
-                        }
-
                         if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
                             Spacer(modifier = Modifier.padding(top = statusBarHeight))
                         }

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,17 +27,16 @@ 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
         ),
     )
@@ -53,17 +52,14 @@ fun useHeaderSearchAnimation(
         ) * ((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 / 52f).coerceIn(0f, 1f)) * 52
     )
     return HeaderAnimations(
         opacity = opacityAni,
         backgroundSearch = backgroundSearch,
         translateX = animatedTranslateX,
         width = animatedWidth,
-        height = animatedHeight
+        translateY = animatedTranslateY
     )
 }

package/package.json

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