@momo-kits/native-kits 0.160.1-searchBackground.2-debug → 0.160.1-searchBackground.3-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-searchBackground.2-debug"
+        version = "0.160.1-searchBackground.3-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

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

@@ -104,6 +104,7 @@ fun LiteScreen(
     headerRightData: HeaderRightData? = null,
     headerTintColor: Color? = null,
     headerBackgroundColor: Color? = null,
+    headerSpaceBetween: Dp? = null,
     /*  End of header props  */
 
     screenContent: @Composable () -> Unit,
@@ -140,6 +141,7 @@ fun LiteScreen(
             headerRightData = headerRightData,
             tintColor = headerTintColor,
             headerBackgroundColor = headerBackgroundColor,
+            headerSpaceBetween = headerSpaceBetween,
         )
 
         Box(
@@ -172,6 +174,7 @@ private fun LiteScreenHeader(
     useAnimationSearch: Boolean = true,
     onGoBack: (() -> Unit)? = null,
     headerBackgroundColor: Color? = null,
+    headerSpaceBetween: Dp? = null,
     inputSearchProps: LiteInputSearchProps? = null,
     headerRight: @Composable (() -> Unit)? = null,
 ) {
@@ -248,6 +251,7 @@ private fun LiteScreenHeader(
         statusBarHeight,
         titlePosition,
         scrollPercentage,
+        headerSpaceBetween,
     ) {
         LiteScreenHeaderPolicy(
             useAnimationSearch = useAnimationSearch,
@@ -255,6 +259,7 @@ private fun LiteScreenHeader(
             statusBarHeight = statusBarHeight,
             titlePosition = titlePosition,
             scrollPercentage = scrollPercentage,
+            headerSpaceBetween = headerSpaceBetween,
         )
     }
 
@@ -350,6 +355,7 @@ private class LiteScreenHeaderPolicy(
     private val statusBarHeight: Dp,
     private val scrollPercentage: State<Float>,
     private val titlePosition: TitlePosition,
+    private val headerSpaceBetween: Dp? = null,
 ) : MeasurePolicy {
 
     override fun MeasureScope.measure(
@@ -357,6 +363,7 @@ private class LiteScreenHeaderPolicy(
         constraints: Constraints
     ): MeasureResult {
         val spacing12 = Spacing.M.roundToPx()
+        val spaceBetween = headerSpaceBetween?.roundToPx() ?: spacing12
         val statusBarPx = statusBarHeight.roundToPx()
         val scrollPercent = scrollPercentage.value
 
@@ -376,7 +383,7 @@ private class LiteScreenHeaderPolicy(
             )
         val inputSearchConstraints = if (isHeaderExtend) {
             val minWidth =
-                if (useAnimationSearch) realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spacing12 * 2
+                if (useAnimationSearch) realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spaceBetween * 2
                 else realConstraints.maxWidth
             realConstraints.copy(
                 maxWidth = (realConstraints.maxWidth * (1 - scrollPercent)).toInt()
@@ -384,8 +391,8 @@ private class LiteScreenHeaderPolicy(
             )
         } else {
             var spaceConsumed = 0
-            if (backIconPlaceable.safeWidth != 0) spaceConsumed += backIconPlaceable.safeWidth + spacing12
-            if (headerRightPlaceable.safeWidth != 0) spaceConsumed += headerRightPlaceable.safeWidth + spacing12
+            if (backIconPlaceable.safeWidth != 0) spaceConsumed += backIconPlaceable.safeWidth + spaceBetween
+            if (headerRightPlaceable.safeWidth != 0) spaceConsumed += headerRightPlaceable.safeWidth + spaceBetween
             realConstraints.copy(
                 maxWidth = realConstraints.maxWidth - spaceConsumed
             )
@@ -394,7 +401,7 @@ private class LiteScreenHeaderPolicy(
             ?.measure(inputSearchConstraints)
         val titlePlaceable = measurables.find { it.layoutId == HeaderId.TITLE_ID }?.measure(
             constraints = realConstraints.copy(
-                maxWidth = realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spacing12 * 2
+                maxWidth = realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spaceBetween * 2
             )
         )
 
@@ -432,7 +439,7 @@ private class LiteScreenHeaderPolicy(
                     x = startX,
                     y = startY + backIconPlaceable.verticalCenterOffset(firstRowMaxHeight),
                 )
-                curX += backIconPlaceable.safeWidth + spacing12
+                curX += backIconPlaceable.safeWidth + spaceBetween
             }
 
             headerRightPlaceable?.place(
@@ -457,7 +464,7 @@ private class LiteScreenHeaderPolicy(
 
             val inputSearchOffset = if (isHeaderExtend) {
                 IntOffset(
-                    x = startX + ((backIconPlaceable.safeWidth + spacing12) * (scrollPercent * 2f).coerceIn(
+                    x = startX + ((backIconPlaceable.safeWidth + spaceBetween) * (scrollPercent * 2f).coerceIn(
                         0f, 1f
                     )).toInt(),
                     y = (curY * (1 - scrollPercent)).toInt().coerceAtLeast(
@@ -518,6 +525,7 @@ data class LiteInputSearchProps(
     
     val customBackIcon: @Composable (() -> Unit)? = null,
     val customSearchIcon: @Composable (() -> Unit)? = null,
+    val customPlaceHolder: @Composable (() -> Unit)? = null,
 
     val iconRightTextField: @Composable ((Modifier) -> Unit)? = null,
 )
@@ -629,7 +637,7 @@ private fun LiteInputSearch(
                         contentAlignment = Alignment.CenterStart,
                     ) {
                         if (!placeHolder.isNullOrEmpty()) {
-                            Text(
+                            inputSearchProps.customPlaceHolder?.invoke() ?: Text(
                                 text = placeHolder ?: "",
                                 style = Typography.bodyDefaultRegular,
                                 maxLines = 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-searchBackground.2-debug",
+  "version": "0.160.1-searchBackground.3-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},