@momo-kits/native-kits 0.160.7-debug → 0.160.8-debug

package/compose/build.gradle.kts

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

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

@@ -63,6 +63,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
@@ -78,6 +79,7 @@ import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.kitsAutomationId
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.modifier.setAutomationId
@@ -101,6 +103,9 @@ fun LiteScreen(
     useAnimationSearch: Boolean = true,
     titlePosition: TitlePosition = TitlePosition.LEFT,
     headerRightData: HeaderRightData? = null,
+    headerTintColor: Color? = null,
+    headerBackgroundColor: Color? = null,
+    headerSpaceBetween: Dp? = null,
     /*  End of header props  */
 
     screenContent: @Composable () -> Unit,
@@ -135,6 +140,9 @@ fun LiteScreen(
             titlePosition = titlePosition,
             useAnimationSearch = useAnimationSearch,
             headerRightData = headerRightData,
+            tintColor = headerTintColor,
+            headerBackgroundColor = headerBackgroundColor,
+            headerSpaceBetween = headerSpaceBetween,
         )
 
         Box(
@@ -166,6 +174,8 @@ private fun LiteScreenHeader(
     titlePosition: TitlePosition = TitlePosition.LEFT,
     useAnimationSearch: Boolean = true,
     onGoBack: (() -> Unit)? = null,
+    headerBackgroundColor: Color? = null,
+    headerSpaceBetween: Dp? = null,
     inputSearchProps: LiteInputSearchProps? = null,
     headerRight: @Composable (() -> Unit)? = null,
 ) {
@@ -242,6 +252,7 @@ private fun LiteScreenHeader(
         statusBarHeight,
         titlePosition,
         scrollPercentage,
+        headerSpaceBetween,
     ) {
         LiteScreenHeaderPolicy(
             useAnimationSearch = useAnimationSearch,
@@ -249,6 +260,7 @@ private fun LiteScreenHeader(
             statusBarHeight = statusBarHeight,
             titlePosition = titlePosition,
             scrollPercentage = scrollPercentage,
+            headerSpaceBetween = headerSpaceBetween,
         )
     }
 
@@ -260,17 +272,21 @@ private fun LiteScreenHeader(
                     HeaderId.EXTENDED_HEADER_HEIGHT.toPx(),
                     size.height,
                 )
-                drawRect(color = Colors.black_01)
-                drawRect(
-                    brush = Brush.linearGradient(
-                        colors = listGradientColors,
-                        start = Offset.Zero,
-                        end = Offset(
-                            x = 0f,
-                            y = headerHeight * (1 - scrollPercentage.value),
-                        ),
+                headerBackgroundColor?.let {
+                    drawRect(color = it)
+                } ?: run {
+                    drawRect(color = Colors.black_01)
+                    drawRect(
+                        brush = Brush.linearGradient(
+                            colors = listGradientColors,
+                            start = Offset.Zero,
+                            end = Offset(
+                                x = 0f,
+                                y = headerHeight * (1 - scrollPercentage.value),
+                            ),
+                        )
                     )
-                )
+                }
             },
         content = {
             if (onGoBack != null) {
@@ -279,17 +295,19 @@ private fun LiteScreenHeader(
                         .size(28.dp)
                         .layoutId(HeaderId.BACK_ID)
                         .clip(CircleShape)
-                        .border(
-                            width = 0.2.dp,
-                            color = headerColor.borderColor,
-                            shape = CircleShape,
-                        )
-                        .background(color = headerColor.backgroundButton)
+                        .conditional(inputSearchProps?.customBackIcon == null) {
+                            this.border(
+                                width = 0.2.dp,
+                                color = headerColor.borderColor,
+                                shape = CircleShape,
+                            )
+                                .background(color = headerColor.backgroundButton)
+                        }
                         .noFeedbackClickable(onClick = onGoBack)
                         .setAutomationId("btn_navigation_back")
                         .padding(Spacing.XS),
                 ) {
-                    Icon(
+                    inputSearchProps?.customBackIcon?.invoke() ?: Icon(
                         source = "arrow-back",
                         color = headerColor.tintIconColor,
                         size = 20.dp,
@@ -338,6 +356,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(
@@ -345,6 +364,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
 
@@ -364,7 +384,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()
@@ -372,8 +392,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
             )
@@ -382,7 +402,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
             )
         )
 
@@ -420,7 +440,7 @@ private class LiteScreenHeaderPolicy(
                     x = startX,
                     y = startY + backIconPlaceable.verticalCenterOffset(firstRowMaxHeight),
                 )
-                curX += backIconPlaceable.safeWidth + spacing12
+                curX += backIconPlaceable.safeWidth + spaceBetween
             }
 
             headerRightPlaceable?.place(
@@ -445,7 +465,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(
@@ -504,6 +524,11 @@ data class LiteInputSearchProps(
 
     val placeHolder: String? = null,
 
+    val customBackIcon: @Composable (() -> Unit)? = null,
+    val customSearchIcon: @Composable (() -> Unit)? = null,
+    val customPlaceHolder: @Composable (() -> Unit)? = null,
+    val customTextStyle: TextStyle? = null,
+    val customIconClear: @Composable (() -> Unit)? = null,
     val iconRightTextField: @Composable ((Modifier) -> Unit)? = null,
 )
 
@@ -545,7 +570,6 @@ private fun LiteInputSearch(
         val textFieldModifier = remember(inputSearchProps.modifier) {
             inputSearchProps.modifier
                 .weight(1f)
-                .sizeIn(minHeight = 36.dp)
         }
         BasicTextField(
             value = textState,
@@ -554,7 +578,7 @@ private fun LiteInputSearch(
             keyboardOptions = inputSearchProps.keyboardOptions,
             keyboardActions = inputSearchProps.keyboardActions,
             modifier = textFieldModifier,
-            textStyle = inputFieldStyle,
+            textStyle = inputSearchProps.customTextStyle ?: inputFieldStyle,
             singleLine = true,
             interactionSource = interactionSource,
             decorationBox = { innerTextField ->
@@ -592,10 +616,6 @@ private fun LiteInputSearch(
 
                 Row(
                     modifier = Modifier
-                        .background(
-                            color = theme.colors.background.surface,
-                            shape = RoundedCornerShape(Radius.XL),
-                        )
                         .padding(
                             horizontal = Spacing.M,
                             vertical = Spacing.S,
@@ -603,7 +623,7 @@ private fun LiteInputSearch(
                     horizontalArrangement = Arrangement.Start,
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
-                    Icon(
+                    inputSearchProps.customSearchIcon?.invoke() ?: Icon(
                         source = "navigation_search",
                         modifier = Modifier.padding(end = Spacing.XS),
                         size = 24.dp,
@@ -614,9 +634,9 @@ private fun LiteInputSearch(
                         contentAlignment = Alignment.CenterStart,
                     ) {
                         if (!placeHolder.isNullOrEmpty()) {
-                            Text(
+                            inputSearchProps.customPlaceHolder?.invoke() ?: Text(
                                 text = placeHolder ?: "",
-                                style = Typography.bodyDefaultRegular,
+                                style = inputSearchProps.customTextStyle ?: Typography.bodyDefaultRegular,
                                 maxLines = 1,
                                 color = theme.colors.text.hint,
                                 overflow = TextOverflow.Ellipsis
@@ -626,7 +646,7 @@ private fun LiteInputSearch(
                     }
 
                     if (isShowClear) {
-                        Icon(
+                        inputSearchProps.customIconClear?.invoke() ?: Icon(
                             source = "24_navigation_close_circle_full",
                             size = 16.dp,
                             color = theme.colors.text.hint,
@@ -717,4 +737,4 @@ fun Modifier.hideKeyboardOnTap() = composed {
             focusManager.clearFocus()
         }
     }
-}
+}

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.160.7
+version=0.160.8
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.7-debug",
+  "version": "0.160.8-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},