@momo-kits/native-kits 0.117.1 → 0.118.0-beta.5

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/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(

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

@@ -110,7 +110,8 @@ fun PopupNotify(
             image.ifNotNull(
                 Image(
                     source = image,
-                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f)
+                    modifier = Modifier.fillMaxWidth().aspectRatio(1.777f),
+                    options = Options(alignment =  Alignment.Center)
                 ), null
             )
 

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

@@ -17,6 +17,7 @@ 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
@@ -25,15 +26,23 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 
 @Composable
-fun PromotionPopup(
+fun PopupPromotion(
     source: String = "",
+    onPress: (() -> Unit) = {},
     onClose: (() -> Unit) = {},
 ) {
     Column(Modifier.semantics { testTag = "popup_notify" }) {
         if (source.isNotEmpty()) {
             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)
             )
         }
         Box(

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

@@ -0,0 +1,208 @@
+package vn.momo.kits.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Spacing
+import vn.momo.kits.const.Typography
+
+enum class TitleType { Card, Section }
+enum class TitleSize { Small, Medium, Large }
+enum class IconAlign { Top, Center, Bottom }
+enum class ButtonSize { Small, Large }
+
+@Composable
+fun Title(
+    title: String,
+    type: TitleType = TitleType.Section,
+    size: TitleSize = TitleSize.Medium,
+    icon: String? = null,
+    iconColor: Color? = null,
+    iconAlign: IconAlign = IconAlign.Top,
+    showRightAction: Boolean = false,
+    showTrailingAction: Boolean = false,
+    badgeLabel: String? = null,
+    buttonTitle: String? = null,
+    buttonSize: ButtonSize = ButtonSize.Small,
+    onPressRightAction: () -> Unit = {},
+    onPressTrailingAction: () -> Unit = {},
+    textOnly: Boolean = false,
+    description: String? = null,
+    modifier: Modifier = Modifier
+) {
+    val theme = AppTheme.current
+    val textStyle: TextStyle = when (type) {
+        TitleType.Card -> when (size) {
+            TitleSize.Small -> TextStyle(fontSize = 14.sp, lineHeight = 20.sp)
+            TitleSize.Medium -> TextStyle(fontSize = 16.sp, lineHeight = 22.sp)
+            TitleSize.Large -> TextStyle(fontSize = 18.sp, lineHeight = 26.sp)
+        }
+
+        TitleType.Section -> when (size) {
+            TitleSize.Small -> TextStyle(
+                fontSize = 16.sp,
+                lineHeight = 24.sp,
+                fontWeight = FontWeight.Bold
+            )
+
+            TitleSize.Medium -> TextStyle(
+                fontSize = 18.sp,
+                lineHeight = 26.sp,
+                fontWeight = FontWeight.Bold
+            )
+
+            TitleSize.Large -> TextStyle(
+                fontSize = 20.sp,
+                lineHeight = 28.sp,
+                fontWeight = FontWeight.Bold
+            )
+        }
+    }
+
+    if (textOnly) {
+        Text(
+            text = title,
+            style = textStyle,
+            modifier = modifier
+        )
+        return
+    }
+
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(IntrinsicSize.Min)
+            .padding(8.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        icon?.let {
+            Column(
+                modifier = Modifier.fillMaxHeight().padding(end = Spacing.S),
+                verticalArrangement = when (iconAlign) {
+                    IconAlign.Top -> Arrangement.Top
+                    IconAlign.Center -> Arrangement.Center
+                    IconAlign.Bottom -> Arrangement.Bottom
+                },
+            ) {
+                // Icon
+                Icon(
+                    source = it,
+                    color = iconColor ?: theme.colors.text.default,
+                    modifier = Modifier.size(24.dp)
+                )
+            }
+        }
+
+        Column(
+            modifier = Modifier.weight(1f)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = if (showTrailingAction) Modifier else Modifier.weight(1f),
+                ) {
+                    Text(
+                        text = title,
+                        style = textStyle,
+                        maxLines = if (showTrailingAction || badgeLabel != null) 1 else 2,
+                    )
+
+                    // Badge
+                    badgeLabel?.let {
+                        Spacer(modifier = Modifier.width(4.dp))
+                        Badge(
+                            label = it
+                        )
+                    }
+
+                }
+
+                // Trailing action (icon)
+                if (showTrailingAction && !showRightAction) {
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Box(
+                        modifier = Modifier
+                            .size(24.dp)
+                            .background(
+                                color = if (type == TitleType.Section) Colors.black_06.copy(0.6f) else Colors.black_06.copy(
+                                    0.3f
+                                ),
+                                shape = RoundedCornerShape(12.dp)
+                            )
+                            .clickable { onPressTrailingAction() },
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            source = "arrow_chevron_right_small",
+                            size = 18.dp
+                        )
+                    }
+                }
+            }
+
+            // Description
+            description?.let {
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    text = it,
+                    style = Typography.descriptionDefaultRegular,
+                    color = theme.colors.text.secondary
+                )
+            }
+        }
+
+        // Right action (button or icon)
+        if (showRightAction && !showTrailingAction) {
+            Spacer(modifier = Modifier.width(8.dp))
+            if (buttonTitle != null) {
+                Text(
+                    text = buttonTitle,
+                    style = if (buttonSize === ButtonSize.Small) Typography.actionXsBold else Typography.actionSBold,
+                    color = theme.colors.primary,
+                    modifier = Modifier.clickable { onPressRightAction() }
+                )
+            } else {
+                Box(
+                    modifier = Modifier
+                        .size(24.dp)
+                        .background(
+                            color = Colors.pink_03.copy(alpha = 0.1f),
+                            shape = RoundedCornerShape(12.dp)
+                        )
+                        .clickable { onPressRightAction() },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Icon(
+                        source = "arrow_chevron_right_small",
+                        modifier = Modifier.size(22.dp),
+                        color = theme.colors.primary
+                    )
+                }
+            }
+        }
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -29,11 +29,11 @@ fun scaleSize(size: Float): Float {
 @Composable
 fun getFont(font: String): FontFamily {
     val fontResource = FontResource(
-        "font:${font.substringBeforeLast(".")}",
+        "font:${font.substringBeforeLast("-")}",
         setOf(
             ResourceItem(
                 setOf(),
-                "font/${font.substringBeforeLast(".")}.${font.substringAfterLast(".")}",
+                "composeResources/vn.momo.compose.resources/font/${font.substringBeforeLast(".")}.${font.substringAfterLast(".")}",
                 -1,
                 -1
             )
@@ -46,15 +46,15 @@ fun getFont(font: String): FontFamily {
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val key = "$fontFamily-${fontWeight?.weight}"
     val fontMap = mapOf(
-        "SFProText-100" to "sfprotext_thin.otf",
-        "SFProText-200" to "sfprotext_ultralight.otf",
+        "SFProText-100" to "sfprotext_thin.ttf",
+        "SFProText-200" to "sfprotext_ultralight.ttf",
         "SFProText-300" to "sfprotext_light.ttf",
         "SFProText-400" to "sfprotext_regular.ttf",
         "SFProText-500" to "sfprotext_medium.ttf",
         "SFProText-600" to "sfprotext_semibold.ttf",
         "SFProText-700" to "sfprotext_bold.ttf",
         "SFProText-800" to "sfprotext_heavy.ttf",
-        "SFProText-900" to "sfprotext_black.otf",
+        "SFProText-900" to "sfprotext_black.ttf",
 
         "MoMoSignature-100" to "momosignature.otf",
         "MoMoSignature-200" to "momosignature.otf",

package/ios/Application/Components.swift

@@ -45,13 +45,24 @@ func safeAreaTopInset() -> CGFloat {
 public struct HeaderBackground: View {
     var headerType: HeaderType = .default
     var scrollState: CGFloat
+    var isTransparent: Bool = false
+    
+    public init(
+        headerType: HeaderType = .default,
+        scrollState: CGFloat = 0,
+        isTransparent: Bool = false
+    ) {
+        self.headerType = headerType
+        self.scrollState = scrollState
+        self.isTransparent = isTransparent
+    }
     
     public var body: some View {
         
         let statusBarHeight = safeAreaTopInset()
         
         let opacity = 1 - CGFloat(scrollState) / 200
-        let backgroundColor = scrollState == 0 ? Color.clear : Colors.black01
+        let backgroundColor = isTransparent ? Color.clear : Colors.black01
         
         Group {
             if headerType == .default {
@@ -62,7 +73,9 @@ public struct HeaderBackground: View {
                         .fill(backgroundColor)
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
-                        .overlay(Rectangle()
+                        .overlay(
+                            isTransparent ? nil :
+                            Rectangle()
                             .fill(LinearGradient(
                                 gradient: Gradient(colors: [
                                     Color(red: 1, green: 0.8, blue: 0.87),
@@ -72,7 +85,9 @@ public struct HeaderBackground: View {
                                 endPoint: .bottom))
                                 .opacity(opacity)
                                 .frame(height: height))
-                        .overlay(Rectangle()
+                        .overlay(
+                            isTransparent ? nil :
+                            Rectangle()
                             .fill(Colors.black04)
                             .frame(height: 1)
                             .frame(maxWidth: .infinity)
@@ -111,6 +126,7 @@ public struct Header: View {
     var animatedHeader: AnimatedHeader? = nil
     var scrollState: CGFloat = 0
     var inputSearchProps: InputSearchProps? = nil
+    var tintColor: Color? = nil
     
     @State private var colorFraction: CGFloat = 0
     
@@ -123,7 +139,8 @@ public struct Header: View {
         opacity: CGFloat? = nil,
         animatedHeader: AnimatedHeader? = nil,
         scrollState: CGFloat = 0,
-        inputSearchProps: InputSearchProps? = nil
+        inputSearchProps: InputSearchProps? = nil,
+        tintColor: Color? = nil
     ) {
         self.headerType = headerType
         self.titlePosition = titlePosition
@@ -134,12 +151,13 @@ public struct Header: View {
         self.animatedHeader = animatedHeader
         self.scrollState = scrollState
         self.inputSearchProps = inputSearchProps
+        self.tintColor = tintColor
     }
     
     public var body: some View {
         
-        let tintIconColor = Colors.black17
-        let backgroundButton = Colors.black01.opacity(0.6)
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
 
         if headerType != .none {
             VStack(spacing: 0) {
@@ -148,11 +166,11 @@ public struct Header: View {
                             if let goBack = goBack {
                                 SwiftUI.Button(action: goBack) {
                                     Circle()
-                                        .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
-                                        .background(Circle().fill(backgroundButton))
+                                        .stroke(borderColor, lineWidth: 0.2)
+                                        .background(Circle().fill(backgroundButtonColor))
                                         .frame(width: 28, height: 28)
                                         .overlay(
-                                            Icon(source: "arrow-back", size: 20, color: Colors.black17)
+                                            Icon(source: "arrow-back", size: 20, color: tintColor)
                                         )
                                 }
                                 
@@ -196,8 +214,9 @@ public struct Header: View {
                                 }
                             } else {
                                 Text(title)
-                                    .font(Font.system(size: 17).weight(.bold))          .lineSpacing(22)
-                                    .foregroundColor(tintIconColor)
+                                    .font(Font.system(size: 17).weight(.bold))
+                                    .lineSpacing(22)
+                                    .foregroundColor(tintColor)
                                     .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
                                     .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)
                                     .lineLimit(1)

package/ios/Application/HeaderRight.swift

@@ -75,20 +75,23 @@ struct NavigationButtonConfig {
 
 // MARK: - Components
 public struct HeaderRight: View {
-    public init(headerRight: HeaderRightData? = nil) {
+    public init(headerRight: HeaderRightData? = nil, tintColor: Color? = nil) {
         self.headerRight = headerRight
+        self.tintColor = tintColor
     }
     var headerRight: HeaderRightData?
+    var tintColor: Color? = nil
     
     public var body: some View {
         HStack(alignment: .center) {
-            ToolkitHeaderRight(headerRight: headerRight)
+            ToolkitHeaderRight(headerRight: headerRight, tintColor: tintColor)
         }
     }
 }
 
 struct ToolkitHeaderRight: View {
     var headerRight: HeaderRightData?
+    var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
@@ -176,44 +179,47 @@ struct ToolkitHeaderRight: View {
     }
     
     var body: some View {
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
         
-        HStack(alignment: .center) {
+        HStack(alignment: .center, spacing: 0) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
                     showBadge: showBadge,
-                    onClick: navButtonConfig.onPress
+                    onClick: navButtonConfig.onPress,
+                    tintColor: tintColor
                 )
             }
             
             HStack(alignment: .center, spacing: 0) {
-                Icon(source: "help_center", size: 20)
+                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
                 
                 Rectangle()
-                    .fill(Colors.black20)
+                    .fill(tintColor ?? Colors.black20)
                     .frame(width: 0.5, height: 12)
                 
-                Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
+                Icon(source: "16_navigation_close_circle", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressClose()
                     }
             }
             .frame(width: 65, height: 28)
-            .background(Color.white.opacity(0.6))
+            .background(backgroundButtonColor)
             .cornerRadius(14)
             .overlay(
                 RoundedRectangle(cornerRadius: 14)
-                    .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
+                    .stroke(borderColor, lineWidth: 0.2)
             )
             .padding(.leading, Spacing.S)
         }
@@ -225,17 +231,21 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
+    var tintColor: Color?
     
     var body: some View {
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
+        
         ZStack {
             Circle()
-                .fill(Color.white.opacity(0.6))
+                .fill(backgroundButtonColor)
                 .overlay(
                     Circle()
-                        .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
+                        .stroke(borderColor, lineWidth: 0.2)
                 )
             
-            Icon(source: icon, size: 16)
+            Icon(source: icon, size: 16, color: tintColor)
             
             if showBadge {
                 BadgeDot(size: .small)

package/ios/Application/Screen.swift

@@ -9,6 +9,8 @@ import SwiftUI
 
 public struct Screen<Content: View>: View {
     var backgroundColor: Color?
+    var headerTransparent: Bool = false
+    var tintColor: Color? = Colors.black17
     var isBack: Bool
     var headerType: HeaderType
     var verticalAlignment: VerticalAlignment
@@ -29,6 +31,8 @@ public struct Screen<Content: View>: View {
 
     public init(
         backgroundColor: Color? = nil,
+        headerTransparent: Bool = false,
+        tintColor: Color = Colors.black17,
         isBack: Bool = true,
         headerType: HeaderType = .default,
         verticalAlignment: VerticalAlignment = .top,
@@ -48,6 +52,8 @@ public struct Screen<Content: View>: View {
         @ViewBuilder content: @escaping () -> Content
     ) {
         self.backgroundColor = backgroundColor
+        self.headerTransparent = headerTransparent
+        self.tintColor = tintColor
         self.isBack = isBack
         self.headerType = headerType
         self.verticalAlignment = verticalAlignment
@@ -70,6 +76,9 @@ public struct Screen<Content: View>: View {
     @State private var scrollOffset: CGFloat = 0
 
     public var body: some View {
+        
+        let headerRightInstance = {HeaderRight(tintColor: tintColor)}
+        
         GeometryReader { geometry in
             let topInset = geometry.safeAreaInsets.top
             let keyboardHeight: CGFloat = 0
@@ -95,14 +104,15 @@ public struct Screen<Content: View>: View {
                             headerType: headerType,
                             titlePosition: titlePosition,
                             title: title,
-                            headerRight: headerRight,
+                            headerRight: headerRight ?? headerRightInstance,
                             goBack: goBack,
                             opacity: min(scrollOffset / 114, 1),
                             animatedHeader: animatedHeader,
                             scrollState: scrollOffset,
-                            inputSearchProps: inputSearchProps
+                            inputSearchProps: inputSearchProps,
+                            tintColor: tintColor
                         )
-                        .background(HeaderBackground(headerType: headerType, scrollState: scrollOffset).edgesIgnoringSafeArea(.top))
+                        .background(HeaderBackground(headerType: headerType, scrollState: scrollOffset, isTransparent: headerTransparent).edgesIgnoringSafeArea(.top))
                         .offset(y: topInset)
 
                     }

package/ios/Image/Image.swift

@@ -27,7 +27,7 @@ public struct ImageView: View {
                 error = false
             }
             .resizable()
-            .renderingMode(.original)
+            .renderingMode(color != nil ? .template : .original)
             .placeholder {
                 Rectangle().foregroundColor(.gray)
                 VStack(alignment: .center, content: {
@@ -49,7 +49,7 @@ public struct ImageView: View {
             .scaledToFit()
             .transition(.fade)
             .aspectRatio(aspectRatio, contentMode: contentMode)
-            .modifier(ColorMultiplyModifier(color: color))
+            .foregroundColor(color)
     }
 
     // MARK: Internal

package/ios/Popup/PopupDisplay.swift

@@ -6,6 +6,7 @@ import SwiftUI
 public enum PopupButtonDirection {
     case row
     case column
+    case auto
 }
 
 // MARK: - PopupButtonType
@@ -20,7 +21,7 @@ public enum PopupButtonType {
 public struct PopupDisplay: View {
     // MARK: Lifecycle
 
-    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}) {
+    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}, errorCode: String = "") {
         self._isPresented = isPresented
         self.title = title
         self.description = description
@@ -32,18 +33,26 @@ public struct PopupDisplay: View {
         self.onClose = onClose
         self.closeButtonTitle = closeButtonTitle
         self.actionButtonTitle = actionButtonTitle
+        self.errorCode = errorCode
     }
 
     // MARK: Public
 
+    @State private var textHeight: CGFloat = .zero
+    @State private var isScrollable = false
+    
     public var body: some View {
+        var shouldUseColumn: Bool {
+            buttonDirection == .column || (buttonDirection == .auto && (closeButtonTitle.count > 12 || actionButtonTitle.count > 12))
+        }
+
         VStack(spacing: 12) {
             ZStack(alignment: .topTrailing) {
-                SwiftUI.Button(action: onPressClose) {
+                SwiftUI.Button(action: onClose) {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
                         .frame(width: 22, height: 22)
-                        .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
+                        .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 2))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(15))
                     .padding(.trailing, -11)
@@ -51,50 +60,84 @@ public struct PopupDisplay: View {
                     .zIndex(1)
                     .accessibility(identifier: "ic_popup_close")
 
-            VStack {
-                if(!url.isEmpty) {
-                    WebImage(url: URL(string: url), isAnimating: .constant(true))
-                        .resizable()
-                        .placeholder {
-                            Rectangle()
-                                .fill(Color.gray.opacity(0.3))
-                                .frame(maxWidth: .infinity, maxHeight: 184)
-                        }
-                        .scaledToFill()
-                        .frame(maxWidth: .infinity)
-                        .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
-                        .aspectRatio(2, contentMode: .fit)
-                }
+                VStack {
+                    if(!url.isEmpty) {
+                        WebImage(url: URL(string: url), isAnimating: .constant(true))
+                            .resizable()
+                            .placeholder {
+                                Rectangle()
+                                    .fill(Color.gray.opacity(0.3))
+                                    .frame(maxWidth: .infinity, maxHeight: 184)
+                            }
+                            .aspectRatio(2, contentMode: .fit)
+                            .frame(maxWidth: .infinity, alignment: .center)
+                            .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
+                            .clipped()
+                    }
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
                             .font(.header_default_semibold)
-                            .padding(.top, 16)
+                            .padding(.top, 24)
                             .padding(.bottom, 8)
                             .lineLimit(2)
                             .accessibility(identifier: "title_popup_permission")
 
-                        Text(description)
-                            .foregroundColor(.black)
-                            .font(.paragraph)
-                            .opacity(0.6)
-                            .multilineTextAlignment(.leading)
-                            .padding(.bottom, 20)
+                        Group {
+                            if isScrollable {
+                                ScrollView(showsIndicators: false) {
+                                    Text(description)
+                                        .font(.paragraph)
+                                        .foregroundColor(.black)
+                                        .opacity(0.6)
+                                        .multilineTextAlignment(.leading)
+                                        .background(GeometryReader { geo in
+                                            Color.clear
+                                                .onAppear {
+                                                    textHeight = geo.size.height
+                                                }
+                                        })
+                                }
+                                .frame(height: 60)
+                            } else {
+                                Text(description)
+                                    .font(.paragraph)
+                                    .foregroundColor(.black)
+                                    .opacity(0.6)
+                                    .multilineTextAlignment(.leading)
+                                    .background(GeometryReader { geo in
+                                        Color.clear
+                                            .onAppear {
+                                                textHeight = geo.size.height
+                                                isScrollable = textHeight > 60 // adjust threshold to ~3 lines
+                                            }
+                                    })
+                            }
+                        }.padding(.bottom, 8)
+
+                        if(!errorCode.isEmpty) {
+                            Text(errorCode)
+                                .foregroundColor(Colors.black12)
+                                .font(.description_xs_regular)
+                                .lineLimit(1)
+                                .padding(.bottom, 8)
+                        }
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
                     .padding(.horizontal, 24)
+                    .padding(.bottom, 16)
 
-                    if buttonDirection == .row {
+                    if shouldUseColumn {
                         if buttonType == .text {
-                            RowTextButtons
+                            ColumnTextButtons
                         } else {
-                            RowButtons
+                            ColumnButtons
                         }
                     } else {
                         if buttonType == .text {
-                            ColumnTextButtons
+                            RowTextButtons
                         } else {
-                            ColumnButtons
+                            RowButtons
                         }
                     }
 
@@ -120,7 +163,8 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
-    
+    var errorCode: String
+
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -181,9 +225,4 @@ public struct PopupDisplay: View {
         .padding(.bottom, 24)
     }
 
-
-    func onPressClose(){
-        isPresented = false
-        onClose()
-    }
 }

package/ios/Popup/PopupPromotion.swift

@@ -1,52 +1,67 @@
-import SDWebImageSwiftUI
 import SwiftUI
+import SDWebImageSwiftUI
 
 public struct PopupPromotion: View {
-    // MARK: Lifecycle
-
-    public init(isPresented: Binding<Bool>, url: String = "", buttonTitle: String = "", onPressAction: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}) {
-        self._isPresented = isPresented
-        self.onPressAction = onPressAction
-        self.buttonTitle = buttonTitle
-        self.onClose = onClose
-        self.url = url
-    }
+    var imageUrl: String
+    var onIconClose: (() -> Void)?
+    var onAction: (() -> Void)?
 
-    // MARK: Public
+
+    public init(
+        imageUrl: String,
+        onIconClose: (() -> Void)? = nil,
+        onAction: (() -> Void)? = nil
+    ) {
+        self.imageUrl = imageUrl
+        self.onIconClose = onIconClose
+        self.onAction = onAction
+    }
 
     public var body: some View {
-        VStack(spacing: 12) {
-            ZStack(alignment: .bottom) {
-                WebImage(url: URL(string: url), isAnimating: .constant(true))
-                    .resizable()
-                    .placeholder {
-                        Circle().foregroundColor(.gray)
-                    }
-                    .scaledToFill()
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .cornerRadius(8)
-
-                Button(title: buttonTitle, action: onPressAction)
-                    .padding(.horizontal, 24)
-                    .padding(.bottom, 24)
-            }.clipped()
+        VStack(spacing: 8) {
+            WebImage(url: URL(string: imageUrl)!)
+                .resizable()
+                .placeholder {
+                    Color.gray
+                        .aspectRatio(0.72, contentMode: .fit)
+                        .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
+                        .clipped()
+                }
+                .scaledToFill()
+                .aspectRatio(0.72, contentMode: .fit)
+                .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2, alignment: .center)
+                .clipped()
+                .onTapGesture {
+                    onAction?()
+                }
+
+            buildCloseIcon()
         }
-        .frame(maxWidth: .infinity, maxHeight: 400)
-        .shadow(color: .black.opacity(0.08), radius: 2, x: 0, y: 0)
-        .shadow(color: .black.opacity(0.16), radius: 24, x: 0, y: 0)
-        .padding(.horizontal, 40)
+        .accessibility(identifier: "popup_promotion")
     }
 
-    // MARK: Internal
+    @ViewBuilder
+    private func buildCloseIcon() -> some View {
+        HStack {
+            Spacer()
+            SwiftUI.Button(action: {
+                onIconClose?()
+            }) {
+                ZStack {
+                    Circle()
+                        .strokeBorder(Colors.black01, lineWidth: 2)
+                        .background(Circle().fill(Colors.black17))
+                        .frame(width: 20, height: 20)
 
-    @Binding var isPresented: Bool
-    var onPressAction: () -> Void
-    var onClose: () -> Void
-    var buttonTitle: String
-    var url: String
-
-    func onPressClose(){
-        isPresented = false
-        onClose()
+                    Icon(source: "navigation_close", size: 14, color: Colors.black01)
+                }
+            }
+            .padding(8)
+            Spacer()
+        }
     }
+
 }
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.117.1",
+  "version": "0.118.0-beta.5",
   "private": false,
   "dependencies": {},
   "devDependencies": {},