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

package/compose/build.gradle.kts

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

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

@@ -78,6 +78,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
@@ -102,6 +103,7 @@ fun LiteScreen(
     titlePosition: TitlePosition = TitlePosition.LEFT,
     headerRightData: HeaderRightData? = null,
     headerTintColor: Color? = null,
+    headerBackgroundColor: Color? = null,
     /*  End of header props  */
 
     screenContent: @Composable () -> Unit,
@@ -137,6 +139,7 @@ fun LiteScreen(
             useAnimationSearch = useAnimationSearch,
             headerRightData = headerRightData,
             tintColor = headerTintColor,
+            headerBackgroundColor = headerBackgroundColor,
         )
 
         Box(
@@ -168,6 +171,7 @@ private fun LiteScreenHeader(
     titlePosition: TitlePosition = TitlePosition.LEFT,
     useAnimationSearch: Boolean = true,
     onGoBack: (() -> Unit)? = null,
+    headerBackgroundColor: Color? = null,
     inputSearchProps: LiteInputSearchProps? = null,
     headerRight: @Composable (() -> Unit)? = null,
 ) {
@@ -262,36 +266,42 @@ 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) {
-                inputSearchProps?.customBackIcon?.invoke() ?: Box(
+                Box(
                     modifier = Modifier
                         .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,

package/package.json

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