@momo-kits/native-kits 0.117.1 → 0.117.2-beta.2

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

@@ -23,6 +23,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
@@ -53,11 +54,13 @@ fun Header(
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps? = null,
     headerRightWidth: Dp = 0.dp,
-    useAnimationSearch: Boolean = false
+    useAnimationSearch: Boolean = false,
+    tintColor: Color? = null
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val tintIconColor = AppTheme.current.colors.text.default
-    val backgroundButton = Colors.black_01.copy(alpha = 0.6f)
+    val tintIconColor = tintColor ?: AppTheme.current.colors.text.default
+    val backgroundButton = if (tintColor == Colors.black_01) Colors.black_20.copy(alpha = 0.6f) else Colors.black_01.copy(alpha = 0.6f)
+    val borderColor = if (tintColor == Colors.black_01) Colors.black_01.copy(alpha = 0.2f) else Colors.black_20.copy(alpha = 0.2f)
 
     var colorFraction by remember { mutableStateOf(0f) }
 
@@ -105,7 +108,7 @@ fun Header(
                                 .then(
                                     Modifier.border(
                                         0.2.dp,
-                                        Colors.black_20.copy(alpha = 0.2f),
+                                        borderColor,
                                         RoundedCornerShape(100)
                                     )
                                 )
@@ -122,7 +125,7 @@ fun Header(
                         ) {
                             Icon(
                                 source = "arrow-back",
-                                color = Colors.black_20,
+                                color = tintIconColor,
                                 size = 20.dp,
                             )
                         }

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

@@ -34,6 +34,7 @@ fun animateColor(start: Color, stop: Color, fraction: Float): Color {
 fun HeaderBackground(
     headerType: HeaderType = HeaderType.DEFAULT,
     scrollState: Int,
+    headerTransparent: Boolean = false,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
 
@@ -42,11 +43,15 @@ fun HeaderBackground(
     )
 
     val backgroundColor by animateColorAsState(
-        targetValue = animateColor(
-            Color.Transparent,
-            AppTheme.current.colors.background.surface,
-            opacityAni
-        ),
+        targetValue = if (headerTransparent) {
+            Color.Transparent
+        } else {
+            animateColor(
+                Color.Transparent,
+                AppTheme.current.colors.background.surface,
+                opacityAni
+            )
+        }
     )
 
     when (headerType) {
@@ -54,6 +59,8 @@ fun HeaderBackground(
             HeaderDefault(
                 opacityAni = opacityAni,
                 statusBarHeight = statusBarHeight,
+                backgroundColor = backgroundColor,
+                headerTransparent = headerTransparent
             )
         }
 

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

@@ -23,14 +23,16 @@ import vn.momo.kits.utils.bottomBorder
 fun HeaderDefault(
     opacityAni: Float,
     statusBarHeight: Dp,
+    backgroundColor: Color?,
+    headerTransparent: Boolean = false
 ) {
     val height = statusBarHeight + HEADER_HEIGHT.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
-            .background(AppTheme.current.colors.background.surface)
+            .background(if(headerTransparent && backgroundColor != null) backgroundColor else AppTheme.current.colors.background.surface)
             .bottomBorder(
                 strokeWidth = 1.dp,
-                color = AppTheme.current.colors.border.default
+                color = if(headerTransparent && backgroundColor != null) backgroundColor else AppTheme.current.colors.border.default
             )
     ) {
         Box(
@@ -39,14 +41,24 @@ fun HeaderDefault(
                 .fillMaxWidth()
                 .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 (headerTransparent)
+                        Brush.linearGradient(
+                            colors = listOf(
+                                Color.Transparent,
+                                Color.Transparent,
+                            ),
+                            start = Offset(0f, 0f),
+                            end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
+                        )
+                    else
+                        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) {

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

@@ -30,6 +30,7 @@ import vn.momo.kits.const.Colors
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import vn.momo.kits.const.AppTheme
 
 data class HeaderRightData(
     val useShortcut: Boolean = false,
@@ -80,11 +81,12 @@ object Spacing {
 @Composable
 fun HeaderRight(
     headerRight: HeaderRightData? = null,
+    tintColor: Color? = null,
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        ToolkitHeaderRight(headerRight = headerRight)
+        ToolkitHeaderRight(headerRight = headerRight, tintColor = tintColor)
     }
 }
 
@@ -113,7 +115,7 @@ private fun getNavigationButtonConfig(
 }
 
 @Composable
-private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
+private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null, tintColor: Color? = null) {
     var isFavorite by remember { mutableStateOf(false) }
     val isLoading by remember { mutableStateOf(false) }
     val api = PlatformApi.current as? ComposeApi
@@ -191,6 +193,10 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         isShowShortcut = false
     }
 
+    val tintIconColor = tintColor ?: AppTheme.current.colors.text.default
+    val backgroundButton = if (tintColor == Colors.black_01) Colors.black_20.copy(alpha = 0.6f) else Colors.black_01.copy(alpha = 0.6f)
+    val borderColor = if (tintColor == Colors.black_01) Colors.black_01.copy(alpha = 0.2f) else Colors.black_20.copy(alpha = 0.2f)
+
     Row(
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -199,7 +205,8 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
                 disabled = isLoading,
                 icon = navButtonConfig.icon,
                 showBadge = showBadge,
-                onClick = navButtonConfig.onPress
+                onClick = navButtonConfig.onPress,
+                tintColor = tintIconColor
             )
         }
         Row(
@@ -207,16 +214,17 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
             horizontalArrangement = Arrangement.Center,
             modifier = Modifier
                 .padding(start = Spacing.S)
-                .border(0.2.dp, Color(0x33000000), shape = RoundedCornerShape(14.dp))
+                .border(0.2.dp, borderColor, shape = RoundedCornerShape(14.dp))
                 .width(toolkitWidth)
                 .height(28.dp)
                 .clip(shape = RoundedCornerShape(14.dp))
-                .background(Color(0x99FFFFFF))
+                .background(backgroundButton)
         ) {
             if (context != null) {
                 Icon(
                     source = "help_center",
                     size = 20.dp,
+                    color = tintIconColor,
                     modifier = Modifier.padding(4.dp).clickable {
                         onPressHelpCenter()
                     })
@@ -224,13 +232,14 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
                     modifier = Modifier
                         .width(0.5.dp)
                         .height(12.dp)
-                        .background(Colors.black_20)
+                        .background(tintColor ?: Colors.black_20)
                 )
             }
 
             Icon(
                 source = "16_navigation_close_circle",
                 size = 20.dp,
+                color = tintIconColor,
                 modifier = Modifier.padding(4.dp).clickable { onPressClose() }
             )
         }
@@ -242,8 +251,12 @@ fun NavigationButton(
     disabled: Boolean,
     icon: String,
     showBadge: Boolean? = false,
-    onClick: () -> Unit
+    onClick: () -> Unit,
+    tintColor: Color?
 ) {
+    val backgroundButton = if (tintColor == Colors.black_01) Colors.black_20.copy(alpha = 0.6f) else Colors.black_01.copy(alpha = 0.6f)
+    val borderColor = if (tintColor == Colors.black_01) Colors.black_01.copy(alpha = 0.2f) else Colors.black_20.copy(alpha = 0.2f)
+
     Box(
         modifier = Modifier
             .size(28.dp)
@@ -253,8 +266,8 @@ fun NavigationButton(
             modifier = Modifier
                 .matchParentSize()
                 .clip(CircleShape)
-                .background(Color(0x99FFFFFF))
-                .border(0.2.dp, Color(0x33000000), CircleShape)
+                .background(backgroundButton)
+                .border(0.2.dp, borderColor, CircleShape)
         )
         Box(
             modifier = Modifier.matchParentSize(),
@@ -262,7 +275,8 @@ fun NavigationButton(
         ) {
             Icon(
                 source = icon,
-                size = 20.dp
+                size = 20.dp,
+                color = tintColor
             )
         }
 

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
@@ -25,6 +26,7 @@ fun HeaderTitle(
             lineHeight = 22.sp,
         ),
         color = color,
-        maxLines = 1
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
     )
 }

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

@@ -52,6 +52,8 @@ const val HEADER_HEIGHT = 52
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
+    tintColor: Color? = null,
+    headerTransparent: Boolean = false,
     isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
@@ -103,7 +105,8 @@ fun Screen(
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
-                scrollState = scrollState.value
+                scrollState = scrollState.value,
+                headerTransparent = headerTransparent
             )
         } else {
             Box(
@@ -129,6 +132,7 @@ fun Screen(
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value,
             useAnimationSearch = useAnimationSearch,
+            tintColor = tintColor
         )
 
         Column(
@@ -196,9 +200,8 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
     Box(
         Modifier
             .offset(y = -keyboardSize)
-            .padding(bottom = bottom)
             .shadow(
-                Colors.black_20.copy(alpha = 0.1f),
+                Colors.black_20.copy(alpha = 0.2f),
                 borderRadius = 0.dp,
                 10f,
                 offsetX = 0.dp,
@@ -208,7 +211,9 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
             .background(AppTheme.current.colors.background.surface)
     ) {
         Box(
-            Modifier.fillMaxWidth().padding(vertical = Spacing.S, horizontal = Spacing.M)
+            Modifier.fillMaxWidth()
+                .padding(bottom = bottom)
+                .padding(vertical = Spacing.S, horizontal = Spacing.M)
         ) {
             footer?.invoke()
         }

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputOTP.kt

@@ -8,6 +8,7 @@ import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -35,6 +36,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
@@ -87,7 +89,7 @@ fun InputOTP(
     dataType: String = "number",
     modifier: Modifier = Modifier
 ) {
-    val maxLength = 10
+    val maxLength = length ?: 10
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
 
@@ -100,6 +102,10 @@ fun InputOTP(
         }
     }
 
+    fun onClearText(){
+        handleChangeText("")
+    }
+
 
     Column {
         BasicTextField(
@@ -193,6 +199,22 @@ fun InputOTP(
                             }
                         }
                     }
+                    Box(
+                        modifier = Modifier.align(Alignment.Center).zIndex(10f)
+                    ) {
+                        Row(
+                            horizontalArrangement = Arrangement.End,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Icon(
+                                "24_navigation_close_circle_full",
+                                size = 12.dp,
+                                modifier = Modifier.padding(end = 12.dp).clickable {
+                                    onClearText()
+                                }
+                            )
+                        }
+                    }
                 }
             }
         )

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt

@@ -57,6 +57,7 @@ fun PopupNotify(
     secondary: PopupAction? = null,
     buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
     onIconClose: () -> Unit,
+    isShowCloseIcon: Boolean = true,
 ) {
     var isScroll by remember { mutableStateOf(false) }
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -107,12 +108,13 @@ fun PopupNotify(
                     RoundedCornerShape(Radius.L)
                 )
         ) {
-            image.ifNotNull(
+            if(image.isNotEmpty()) {
                 Image(
                     source = image,
-                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f)
-                ), null
-            )
+                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f),
+                    options = Options(alignment = Alignment.Center)
+                )
+            }
 
             Column(modifier = Modifier.padding(Spacing.XL)) {
                 Text(
@@ -124,7 +126,7 @@ fun PopupNotify(
                 content(Modifier.padding(top = Spacing.S))
                 if (error.isNotEmpty()) {
                     Text(
-                        text = error,
+                        text = "Mã lỗi: " + error,
                         style = Typography.descriptionXsRegular,
                         color = AppTheme.current.colors.text.hint,
                         maxLines = 1,
@@ -143,34 +145,36 @@ fun PopupNotify(
             }
         }
 
-        Box(
-            Modifier
-                .width(22.dp)
-                .height(22.dp)
-                .offset(x = -(1).dp, y = (-11).dp)
-                .background(
-                    color = AppTheme.current.colors.text.default,
-                    shape = RoundedCornerShape(Radius.M)
-                )
-                .border(
-                    width = 2.dp,
+        if(isShowCloseIcon) {
+            Box(
+                Modifier
+                    .width(22.dp)
+                    .height(22.dp)
+                    .offset(x = -(1).dp, y = (-11).dp)
+                    .background(
+                        color = AppTheme.current.colors.text.default,
+                        shape = RoundedCornerShape(Radius.M)
+                    )
+                    .border(
+                        width = 2.dp,
+                        color = AppTheme.current.colors.background.surface,
+                        shape = RoundedCornerShape(Radius.M)
+                    )
+                    .clip(RoundedCornerShape(100))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = { onClose { onIconClose() } }
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                Icon(
+                    source = "navigation_close",
                     color = AppTheme.current.colors.background.surface,
-                    shape = RoundedCornerShape(Radius.M)
+                    size = 16.dp,
+                    modifier = Modifier.setAutomationId("ic_popup_close")
                 )
-                .clip(RoundedCornerShape(100))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = { onClose { onIconClose() } }
-                ),
-            contentAlignment = Alignment.Center
-        ) {
-            Icon(
-                source = "navigation_close",
-                color = AppTheme.current.colors.background.surface,
-                size = 16.dp,
-                modifier = Modifier.setAutomationId("ic_popup_close")
-            )
+            }
         }
     }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/components/{PromotionPopup.kt → PopupPromotion.kt}

@@ -17,25 +17,35 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.utils.ifNotNull
 
 @Composable
-fun PromotionPopup(
+fun PopupPromotion(
     source: String = "",
+    onPress: (() -> Unit) = {},
     onClose: (() -> Unit) = {},
 ) {
     Column(Modifier.semantics { testTag = "popup_notify" }) {
-        if (source.isNotEmpty()) {
+        source.ifNotNull(
             Image(
                 source = source,
-                modifier = Modifier.fillMaxWidth().aspectRatio(0.72f),
-            )
-        }
+                modifier = Modifier.fillMaxWidth()
+                    .aspectRatio(0.72f)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onPress
+                    ),
+                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Crop)
+            ), null
+        )
         Box(
             modifier = Modifier
                 .padding(top = Spacing.S)

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Switch.kt

@@ -17,6 +17,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.utils.ifTrue
 
 @Composable
@@ -24,6 +25,8 @@ fun Switch(
     value: Boolean = false,
     onChange: (Boolean) -> Unit = {},
     disabled: Boolean = false,
+    title: String? = "",
+    accessibilityId: String? = ""
 ) {
     val circleBackgroundColor = value.ifTrue(Colors.black_01, Colors.black_03)
     var backgroundColor = value.ifTrue(Colors.green_03, Colors.black_07)
@@ -32,27 +35,35 @@ fun Switch(
     }
 
     Box(
-        modifier = Modifier.then(
-            Modifier.width(38.dp).height(20.dp).border(
-                0.dp, Color.Unspecified,
-                RoundedCornerShape(20.dp)
-            ).background(backgroundColor, RoundedCornerShape(20.dp)).clip(RoundedCornerShape(20.dp))
-                .clickable(
-                    enabled = !disabled,
-                    onClick = { onChange(!value) }
-                )
-                .padding(horizontal = Spacing.XS)
-        ),
-        contentAlignment = value.ifTrue(Alignment.CenterEnd, Alignment.CenterStart)
+        modifier = Modifier.setAutomationId( accessibilityId ?: "toggle_${title ?: "unknown"}_${value}")
     ) {
         Box(
-            modifier = Modifier.size(14.dp)
-                .border(0.dp, Color.Unspecified, RoundedCornerShape(percent = 100))
-                .background(circleBackgroundColor, RoundedCornerShape(percent = 100)),
-            contentAlignment = Alignment.Center
-        )
-        {
-            Box(Modifier.size(6.dp).background(backgroundColor, RoundedCornerShape(percent = 100)))
+            modifier = Modifier.then(
+                Modifier.width(38.dp).height(20.dp).border(
+                    0.dp, Color.Unspecified,
+                    RoundedCornerShape(20.dp)
+                ).background(backgroundColor, RoundedCornerShape(20.dp))
+                    .clip(RoundedCornerShape(20.dp))
+                    .clickable(
+                        enabled = !disabled,
+                        onClick = { onChange(!value) }
+                    )
+                    .padding(horizontal = Spacing.XS)
+            ),
+            contentAlignment = value.ifTrue(Alignment.CenterEnd, Alignment.CenterStart)
+        ) {
+            Box(
+                modifier = Modifier.size(14.dp)
+                    .border(0.dp, Color.Unspecified, RoundedCornerShape(percent = 100))
+                    .background(circleBackgroundColor, RoundedCornerShape(percent = 100)),
+                contentAlignment = Alignment.Center
+            )
+            {
+                Box(
+                    Modifier.size(6.dp)
+                        .background(backgroundColor, RoundedCornerShape(percent = 100))
+                )
+            }
         }
     }
 }