@momo-kits/native-kits 0.89.33-rc.2 → 0.89.33-rc.4

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

@@ -50,7 +50,6 @@ 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.shadow
 import vn.momo.kits.platform.getStatusBarHeight
 import vn.momo.kits.utils.bottomBorder
 
@@ -67,7 +66,6 @@ data class AnimatedHeader(
 @Composable
 fun HeaderBackground(
     headerType: HeaderType = HeaderType.DEFAULT,
-    useShadow: Boolean? = true,
     scrollState: Int
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -140,21 +138,12 @@ fun HeaderBackground(
                 }
             }
         }
+
         else -> {
             Box(modifier = Modifier.fillMaxWidth())
         }
     }
-    Box(
-        modifier = Modifier.fillMaxWidth().height(statusBarHeight + 52.dp)
-            .alpha(1 - opacityAni)
-            .background(Colors.black_01)
-            .then(
-                if (useShadow == true) Modifier.shadow() else Modifier.bottomBorder(
-                    1.dp,
-                    Colors.black_04
-                )
-            )
-    )
+
 }
 
 @Composable
@@ -163,11 +152,9 @@ fun Header(
     titlePosition: TitlePosition,
     title: String,
     headerRight: @Composable (() -> Unit)? = null,
-    isBack: Boolean = true,
-    goBack: (() -> Unit) = { },
+    goBack: (() -> Unit)? = null,
     opacity: Float? = null,
     animatedHeader: AnimatedHeader? = null,
-    useSearchInput: Boolean? = false,
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps?
 ) {
@@ -207,7 +194,7 @@ fun Header(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Box {
-                    if (isBack) {
+                    if (goBack != null) {
                         Box(
                             modifier = Modifier
                                 .size(28.dp)
@@ -239,12 +226,11 @@ fun Header(
                         }
                     }
                 }
-                if (useSearchInput == false) {
-                    Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
-                    }) {
-                        headerRight?.invoke()
-                    }
+
+                Box(Modifier.graphicsLayer {
+                    alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                }) {
+                    headerRight?.invoke()
                 }
             }
 
@@ -255,13 +241,12 @@ fun Header(
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                if (isBack) {
+                if (goBack != null && titlePosition == TitlePosition.LEFT) {
                     Spacer(Modifier.width(40.dp))
                 }
-                if (useSearchInput == true && inputSearchProps != null) {
+                if (inputSearchProps != null) {
                     InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
-                }
-                else{
+                } else{
                     Box(
                         Modifier.weight(1f).graphicsLayer {
                             alpha = if (animatedHeader !== null) opacity ?: 1f else 1f

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

@@ -56,7 +56,7 @@ fun Screen(
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     title: String = "Stack",
     titlePosition: TitlePosition = TitlePosition.LEFT,
-    goBack: (() -> Unit) = { },
+    goBack: (() -> Unit)? = null,
     scrollable: Boolean = true,
     scrollState: ScrollState = rememberScrollState(),
     onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
@@ -66,8 +66,6 @@ fun Screen(
     fabProps: FabProps? = null,
     animatedHeader: AnimatedHeader? = null,
     layoutOffset: Dp = 56.dp,
-    useShadow: Boolean? = true,
-    useSearchInput: Boolean? = false,
     inputSearchProps: InputSearchProps? = null,
     content: @Composable () -> Unit,
 ) {
@@ -106,7 +104,6 @@ fun Screen(
             ) {
                 HeaderBackground(
                     headerType = headerType,
-                    useShadow = useShadow,
                     scrollState = scrollState.value
                 )
             }
@@ -118,10 +115,8 @@ fun Screen(
             titlePosition = titlePosition,
             headerRight = headerRight,
             goBack = goBack,
-            isBack = isBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
-            useSearchInput = useSearchInput,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value
         )

package/package.json

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