@momo-kits/native-kits 0.113.1-beta.6 → 0.113.1-beta.8

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

@@ -0,0 +1,196 @@
+package vn.momo.kits.application
+
+import androidx.compose.animation.animateColorAsState
+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.BoxWithConstraints
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+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.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+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
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import vn.momo.kits.components.Icon
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.const.AppStatusBar
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
+import vn.momo.kits.const.Spacing
+import vn.momo.kits.modifier.setAutomationId
+import vn.momo.kits.platform.getStatusBarHeight
+
+enum class TitlePosition {
+    LEFT, CENTER,
+}
+
+data class AnimatedHeader(
+    val type: HeaderType = HeaderType.DEFAULT,
+    val composable: @Composable (scrollState: Int) -> Unit = {}
+)
+
+@Composable
+fun Header(
+    headerType: HeaderType = HeaderType.DEFAULT,
+    titlePosition: TitlePosition,
+    title: String,
+    headerRight: @Composable (() -> Unit)? = null,
+    goBack: (() -> Unit)? = null,
+    opacity: Float? = null,
+    animatedHeader: AnimatedHeader? = null,
+    scrollState: Int = 0,
+    inputSearchProps: InputSearchProps? = null,
+    useAnimationSearch: Boolean = false
+) {
+    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
+    val tintIconColor = AppTheme.current.colors.text.default
+    val backgroundButton = Colors.black_01.copy(alpha = 0.6f)
+    val miniAppContext = ApplicationContext.current
+
+    var colorFraction by remember { mutableStateOf(0f) }
+
+    LaunchedEffect(scrollState) {
+        snapshotFlow { scrollState }
+            .map { (it / 50f).coerceIn(0f, 1f) }
+            .distinctUntilChanged()
+            .collect { fraction -> colorFraction = fraction }
+    }
+
+    val backgroundSearch by animateColorAsState(
+        targetValue = animateColor(
+            Colors.black_01,
+            AppTheme.current.colors.background.default,
+            colorFraction
+        )
+    )
+
+    fun getHeaderRightOpacity(): Float {
+        if (useAnimationSearch) {
+            return 1f - (opacity ?: 1f)
+        }
+        return if (animatedHeader !== null) opacity ?: 1f else 1f
+    }
+
+    if (headerType != HeaderType.NONE) {
+        BoxWithConstraints(
+            Modifier.height(statusBarHeight + 52.dp)
+                .fillMaxWidth()
+                .zIndex(10f),
+            contentAlignment = Alignment.BottomCenter
+        ) {
+            Row(
+                modifier = Modifier.height(52.dp)
+                    .fillMaxWidth()
+                    .padding(horizontal = Spacing.M),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                Box {
+                    if (goBack != null) {
+                        Box(
+                            modifier = Modifier
+                                .size(28.dp)
+                                .then(
+                                    Modifier.border(
+                                        0.2.dp,
+                                        Colors.black_20.copy(alpha = 0.2f),
+                                        RoundedCornerShape(100)
+                                    )
+                                )
+                                .background(
+                                    backgroundButton,
+                                    RoundedCornerShape(100)
+                                )
+                                .clickable(
+                                    onClick = goBack
+                                )
+                                .padding(Spacing.XS)
+                                .setAutomationId("btn_navigation_back"),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Icon(
+                                source = "arrow-back",
+                                color = Colors.black_20,
+                                size = 20.dp,
+                            )
+                        }
+                    }
+                }
+
+                if (((useAnimationSearch && inputSearchProps != null) || inputSearchProps == null) && miniAppContext != null) {
+                    Box(Modifier.graphicsLayer {
+                        alpha = getHeaderRightOpacity()
+                    }) {
+                        headerRight?.invoke()
+                    }
+                }
+            }
+
+            // Title
+            Row(
+                modifier = Modifier.height(52.dp)
+                    .fillMaxWidth()
+                    .padding(horizontal = Spacing.M),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                if (goBack != null && titlePosition == TitlePosition.LEFT) {
+                    Spacer(Modifier.width(40.dp))
+                }
+                if (inputSearchProps != null && !useAnimationSearch) {
+                    InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
+                } else {
+                    Box(
+                        Modifier.weight(1f).graphicsLayer {
+                            alpha = if (useAnimationSearch && inputSearchProps != null) {
+                                1f - (opacity ?: 1f)
+                            } else {
+                                if (animatedHeader !== null) opacity ?: 1f else 1f
+                            }
+                        },
+                        contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
+                    ) {
+                        HeaderTitle(
+                            title = title,
+                            color = tintIconColor,
+                            modifier = Modifier.semantics {
+                                testTag = "title_navigation_header"
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+fun animateColor(start: Color, stop: Color, fraction: Float): Color {
+    return Color(
+        red = start.red + fraction * (stop.red - start.red),
+        green = start.green + fraction * (stop.green - start.green),
+        blue = start.blue + fraction * (stop.blue - start.blue),
+        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
+    )
+}

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

@@ -0,0 +1,70 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.const.AppStatusBar
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.platform.getScreenDimensions
+import vn.momo.kits.platform.getStatusBarHeight
+
+private const val SCREEN_PADDING = 12
+private const val BACK_WIDTH = 28
+
+@Composable
+fun HeaderBackground(
+    isBack: Boolean = true,
+    headerType: HeaderType = HeaderType.DEFAULT,
+    scrollState: Int,
+    inputSearchProps: InputSearchProps? = null,
+    headerRightWidth: Dp = 0.dp,
+    useAnimationSearch: Boolean = false
+) {
+    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
+    val screenWidth = getScreenDimensions().width
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
+    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
+
+    val animations = useHeaderSearchAnimation(
+        scrollState = scrollState,
+        statusBarHeight = statusBarHeight,
+        leftPosition = leftPosition,
+        searchWidth = searchWidth,
+        headerRightWidth = headerRightWidth
+    )
+
+    val backgroundColor = if (scrollState == 0) {
+        Color.Transparent
+    } else {
+        AppTheme.current.colors.background.surface
+    }
+
+    when (headerType) {
+        HeaderType.DEFAULT -> {
+            val height = statusBarHeight + 52.dp
+            HeaderDefault(
+                height = height,
+                animations = animations,
+                backgroundColor = backgroundColor
+            )
+        }
+
+        HeaderType.EXTENDED -> {
+           HeaderExtended(
+                animations = animations,
+                inputSearchProps = inputSearchProps,
+                useAnimationSearch = useAnimationSearch,
+                backgroundColor = backgroundColor
+           )
+        }
+
+        else -> {
+            Box(modifier = Modifier.fillMaxWidth())
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.components.Image
+import vn.momo.kits.components.Options
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.utils.bottomBorder
+
+@Composable
+fun HeaderDefault(
+    height: Dp,
+    backgroundColor: Color,
+    animations: HeaderAnimations
+) {
+    Box(
+        modifier = Modifier.fillMaxWidth().height(height)
+            .background(backgroundColor)
+            .bottomBorder(
+                strokeWidth = 1.dp,
+                color = AppTheme.current.colors.border.default
+            )
+    ) {
+        Box(
+            modifier = Modifier
+                .height(height)
+                .fillMaxWidth()
+                .alpha(animations.opacity)
+                .background(
+                    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) {
+            Image(
+                loading = false,
+                source = AppTheme.current.assets.headerBackground!!,
+                modifier = Modifier.fillMaxWidth().height(height),
+                options = Options(
+                    contentScale = ContentScale.FillWidth
+                )
+            )
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+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.draw.alpha
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import vn.momo.kits.components.Image
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.components.Options
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Spacing
+
+@Composable
+fun HeaderExtended(
+    animations: HeaderAnimations,
+    inputSearchProps: InputSearchProps? = null,
+    useAnimationSearch: Boolean = false,
+    backgroundColor: Color = Color.Transparent
+){
+    Box(
+        modifier = Modifier.fillMaxWidth().height(animations.height.dp)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(154.dp)
+                .alpha(animations.opacity)
+                .background(
+                    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) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(backgroundColor)
+                ) {
+                    Image(
+                        loading = false,
+                        source = AppTheme.current.assets.headerBackground!!,
+                        modifier = Modifier.fillMaxWidth().height(154.dp),
+                        options = Options(
+                            contentScale = ContentScale.FillWidth
+                        )
+                    )
+                }
+            }
+        }
+
+        if (inputSearchProps != null && useAnimationSearch) {
+            Box(
+                modifier = Modifier
+                    .height(52.dp)
+                    .offset(
+                        x = animations.translateX.dp
+                    )
+                    .padding(vertical = Spacing.S)
+                    .align(Alignment.BottomStart)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .width(animations.width.dp)
+                        .background(
+                            color = animations.backgroundSearch,
+                            shape = RoundedCornerShape(Radius.XL)
+                        )
+                ) {
+                    InputSearch(
+                        inputSearchProps = inputSearchProps.copy(
+                            showButtonText = false,
+                            backgroundColor = Color.Transparent
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+

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

@@ -79,12 +79,12 @@ object Spacing {
 
 @Composable
 fun HeaderRight(
-    headerRight: HeaderRightData? = null,
+    data: HeaderRightData? = null,
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        ToolkitHeaderRight(headerRight = headerRight)
+        ToolkitHeaderRight(headerRight = data)
     }
 }
 

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

@@ -0,0 +1,27 @@
+package vn.momo.kits.application
+
+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.zIndex
+import vn.momo.kits.components.Text
+import vn.momo.kits.const.Typography
+
+
+@Composable
+fun HeaderTitle(
+    title: String = "",
+    modifier: Modifier = Modifier,
+    textAlign: TextAlign = TextAlign.Start,
+    color: Color? = null,
+) {
+    Text(
+        modifier = Modifier.then(modifier).zIndex(1f),
+        text = title,
+        textAlign = textAlign,
+        style = Typography.actionS,
+        color = color,
+        maxLines = 1
+    )
+}

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

@@ -84,7 +84,7 @@ fun Screen(
     val bottomPadding = min(indicator, 21.dp)
 
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
+        targetValue = ((scrollState.value / 114f)).coerceIn(0f, 1f)
     )
 
     val headerAnimated =

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

@@ -0,0 +1,61 @@
+package vn.momo.kits.application
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
+import androidx.compose.runtime.getValue
+
+data class HeaderAnimations(
+    val opacity: Float,
+    val backgroundSearch: Color,
+    val translateX: Float,
+    val width: Float,
+    val height: Float
+)
+
+@Composable
+fun useHeaderSearchAnimation(
+    scrollState: Int,
+    statusBarHeight: Dp,
+    leftPosition: Dp,
+    searchWidth: Int,
+    headerRightWidth: Dp
+): HeaderAnimations {
+    val opacityAni by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f)
+    )
+
+    val backgroundSearch by animateColorAsState(
+        targetValue = animateColor(
+            AppTheme.current.colors.background.default,
+            Colors.black_01,
+            opacityAni
+        )
+    )
+
+    val animatedTranslateX by animateFloatAsState(
+        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12
+    )
+
+    val animatedWidth by animateFloatAsState(
+        targetValue = (scrollState / 52f).coerceIn(0f, 1f) *
+                ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth
+    )
+
+    val animatedHeight by animateFloatAsState(
+        targetValue = (1 - (scrollState / 52f).coerceIn(0f, 1f)) *
+                (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52)
+    )
+
+    return HeaderAnimations(
+        opacity = opacityAni,
+        backgroundSearch = backgroundSearch,
+        translateX = animatedTranslateX,
+        width = animatedWidth,
+        height = animatedHeight
+    )
+}

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

@@ -115,7 +115,7 @@ fun PopupNotify(
             )
 
             Column(modifier = Modifier.padding(Spacing.XL)) {
-                Text(style = Typography.titleXs, maxLines = 2, text = title)
+                Text(style = Typography.titleXs, maxLines = 1, text = title)
                 content(Modifier.padding(top = Spacing.S))
                 if (error.isNotEmpty()) {
                     Text(

package/ios/Application/ApplicationEnvironment.swift

@@ -23,12 +23,22 @@ public class MiniAppContext {
     }
 }
 
+public struct Config: Decodable {
+    public let trustBanner: TrustBanner?
+    
+    enum CodingKeys: String, CodingKey {
+        case trustBanner = "trust_banner"
+    }
+}
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi
+    @Published public var config: Config?
     
-    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
+    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi, config: Config? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
+        self.config = config
     }
 }

package/ios/Button/Button.swift

@@ -98,8 +98,9 @@ private extension View {
         case .secondary:
             return AnyView(self
                 .background(Colors.card)
-                .foregroundColor(Colors.primary)
+                .foregroundColor(Colors.text)
                 .cornerRadius(8)
+                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black06, lineWidth: 1))
                 .padding(2)
             )
         case .outline:

package/ios/Popup/PopupDisplay.swift

@@ -43,7 +43,6 @@ public struct PopupDisplay: View {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
                         .frame(width: 16, height: 16)
-                        .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(8))
                     .offset(x: 6, y: -6)
@@ -53,17 +52,15 @@ public struct PopupDisplay: View {
                     WebImage(url: URL(string: url), isAnimating: .constant(true))
                         .resizable()
                         .scaledToFill()
-                        .frame(maxWidth: .infinity)
+                        .frame(maxWidth: .infinity, maxHeight: 164)
                         .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
-                        .aspectRatio(2, contentMode: .fit)
 
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
-                            .font(.title3)
-                            .padding(.top, 16)
-                            .padding(.bottom, 8)
-                            .lineLimit(2)
+                            .font(.headerText1)
+                            .padding(.top, 12)
+                            .padding(.bottom, 24)
 
                         Text(description)
                             .foregroundColor(.black)
@@ -90,8 +87,10 @@ public struct PopupDisplay: View {
                 }.clipped()
             }
         }
-        .background(Color.white.cornerRadius(15))
-        .padding(.horizontal, 24)
+        .background(Color.white.cornerRadius(8))
+        .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)
     }
 
     // MARK: Internal
@@ -107,7 +106,7 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
-    
+
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -154,10 +153,7 @@ public struct PopupDisplay: View {
 
     var ColumnButtons: some View {
         VStack(alignment: .trailing) {
-            Button(
-                title: actionButtonTitle,
-                action: onPressAction
-            )
+            Button(title: actionButtonTitle, action: onPressAction)
             Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -9,14 +9,9 @@ import Foundation
 import SwiftUI
 import SDWebImageSwiftUI
 
-let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
-
-struct TrustBannerData: Decodable {
-    let trustBanner: TrustBanner
-}
-
-struct TrustBanner: Decodable {
+public struct TrustBanner: Decodable {
     let content: Dictionary<String, String>
+    let subContent: Dictionary<String, String>
     let pciImage: String
     let sslImage: String
     let urlConfig: String
@@ -25,18 +20,20 @@ struct TrustBanner: Decodable {
     let momoImage: String
 
     enum CodingKeys: String, CodingKey {
-        case content, pciImage, sslImage, icons, momoImage
+        case content, subContent, pciImage, sslImage, icons, momoImage
         case urlConfig = "url_config"
         case featureCode = "feature_code"
     }
 }
 
 let defaultBanner = TrustBanner(
-    content: ["vi": "Bảo mật thông tin & An toàn tài sản của bạn là ưu tiên hàng đầu của MoMo.",
-              "en": "Your data security and money safety are MoMo's top priorities."],
-    pciImage: "https://static.momocdn.net/app/img/kits/trustBanner/pci.png",
+    content: ["vi": "An toàn tài sản & Bảo mật thông tin của bạn là ưu tiên hàng đầu của MoMo.",
+             "en": "Ensuring financial security and data privacy is MoMo's highest priority."],
+    subContent: ["vi": "Tìm hiểu thêm",
+                "en": "Learn more"],
+    pciImage: "https://static.momocdn.net/app/img/kits/trustBanner/pci_dss.png",
     sslImage: "https://static.momocdn.net/app/img/kits/trustBanner/ssl.png",
-    urlConfig: "https://momo.vn/an-toan-bao-mat",
+    urlConfig: "login_and_security",
     featureCode: "login_and_security",
     icons: [
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_viettinbank.png",
@@ -44,58 +41,23 @@ let defaultBanner = TrustBanner(
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_vietcombank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_bidv.png"
     ],
-    momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_momo_secu.png"
+    momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
 )
 
-let defaultData = TrustBannerData(trustBanner: defaultBanner)
-
-class TrustBannerViewModel: ObservableObject {
-    @Published var trustBanner: TrustBannerData?
-
-    init() {
-        fetchData(from: jsonUrl)
-    }
-
-    func fetchData(from urlString: String) {
-        guard let url = URL(string: urlString) else { return }
-
-        URLSession.shared.dataTask(with: url) { [weak self] data, response, error in
-            guard let self = self else { return }
-
-            if let error = error {
-                print("Data fetching error: \(error)")
-                return
-            }
-
-            guard let data = data else {
-                print("No data received")
-                return
-            }
-            do {
-                let decodedData = try JSONDecoder().decode(TrustBannerData.self, from: data)
-                DispatchQueue.main.async {
-                    self.trustBanner = decodedData
-                }
-            } catch {
-                print("Decoding error: \(error)")
-            }
-        }.resume()
-    }
-}
-
 public struct TrustBannerView: View {
     var serviceName: String? = ""
     var screenName: String? = ""
     var onPress: ((_ params: NSDictionary) -> Void)?
     var trackEvent: ((_ eventName: String, _ params: NSDictionary) -> Void)?
     var language: String?
-
-    @ObservedObject private var viewModel = TrustBannerViewModel()
+    
+    @EnvironmentObject private var environment: ApplicationEnvironment
 
     public init(serviceName: String?,
                 screenName: String?,
                 onPress: ((_ params: NSDictionary) -> Void)?,
-                trackEvent: ((_ eventName: String,_ params: NSDictionary) -> Void)?, language: String? = "vi") {
+                trackEvent: ((_ eventName: String,_ params: NSDictionary) -> Void)?, 
+                language: String? = "vi") {
         if let trackEvent = trackEvent {
             trackEvent("service_component_displayed", ["service_name": serviceName ?? "", "screen_name": screenName ?? "", "component_name": "logo_trust"])
         }
@@ -107,9 +69,15 @@ public struct TrustBannerView: View {
     }
 
     public var body: some View {
-        if let trustBanner = viewModel.trustBanner {
-            TrustBannerContentView(trustBanner: trustBanner.trustBanner, onPress: onPress, trackEvent: trackEvent, serviceName: serviceName, screenName: screenName, language: language)
-        }
+        let trustBanner = environment.config?.trustBanner ?? defaultBanner
+        TrustBannerContentView(
+            trustBanner: trustBanner,
+            onPress: onPress,
+            trackEvent: trackEvent,
+            serviceName: serviceName,
+            screenName: screenName,
+            language: language
+        )
     }
 }
 
@@ -128,52 +96,47 @@ struct TrustBannerContentView: View {
                     .resizable()
                     .scaledToFit()
                     .frame(width: 64, height: 64)
-                VStack(alignment: .leading, spacing: 8){
+                VStack(alignment: .leading, spacing: 8) {
                     Text(trustBanner.content[language ?? "vi"] ?? "")
                         .foregroundColor(Color(hex: 0xFF484848))
                         .lineLimit(2)
-                        .font(.system(size: 12, weight: Font.Weight.regular))
-                        .frame(width: geo.size.width - 24 - 64 - 8, height: 40,alignment: .leading)
-                    HStack{
-                        HStack{
-                            WebImage(url:  URL(string: trustBanner.pciImage))
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 52, height: 20)
-                            WebImage(url:  URL(string: trustBanner.sslImage))
+                        .font(.system(size: 12))
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    
+                    HStack {
+                        HStack(spacing: 2) {
+                            Text(trustBanner.subContent[language ?? "vi"] ?? "")
+                                .foregroundColor(Color(hex: 0xFFEB2F96))
+                                .font(.system(size: 12))
+                            
+                            WebImage(url: URL(string: "https://img.mservice.io/momo_app_v2/new_version/img/appx_icon/16_arrow_chevron_right_small.png"))
                                 .resizable()
-                                .scaledToFit()
-                                .frame(width: 52, height: 20)
+                                .renderingMode(.template)
+                                .foregroundColor(Color(hex: 0xFFEB2F96))
+                                .frame(width: 16, height: 16)
                         }
+                        
                         Spacer()
-                        HStack(spacing: -6){
-                            ForEach(trustBanner.icons, id: \.self) { iconURL in
-                                WebImage(url: URL(string: iconURL))
+                        
+                        HStack(spacing: 4) {
+                            if let pciUrl = URL(string: trustBanner.pciImage) {
+                                WebImage(url: pciUrl)
                                     .resizable()
                                     .scaledToFit()
-                                    .frame(width:24, height: 24)
-                                    .background(Color.white)
-                                    .cornerRadius(12)
-                                    .overlay(
-                                        Circle().stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
-                                    )
+                                    .frame(width: 27, height: 20)
                             }
-                            Text("36+")
-                                .font(.system(size: 10, weight: Font.Weight.regular))
-                                .frame(width: 24, height: 24, alignment: .center)
-                                .foregroundColor(Color(hex: 0xFFEB2F96))
-                                .background(Color(hex: 0xFFFDEAF4))
-                                .cornerRadius(12)
-                                .overlay(
-                                    Circle()
-                                        .stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
-                                )
-                        }.frame(width: 96, height: 24)
+                            
+                            if let sslUrl = URL(string: trustBanner.sslImage) {
+                                WebImage(url: sslUrl)
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width: 52, height: 20)
+                            }
+                        }
                     }
                 }
             }
-            .frame(width: geo.size.width - 24)
-            .padding(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
+            .padding(12)
             .background(Color(hex: 0xFFF2F8FF))
             .cornerRadius(12)
             .onTapGesture {
@@ -181,7 +144,7 @@ struct TrustBannerContentView: View {
                     trackEvent("service_component_clicked", ["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "component_name": "logo_trust", "url_config": trustBanner.urlConfig])
                 }
                 if let onPress = onPress {
-                    onPress(["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "component_name": "logo_trust", "url_config": trustBanner.urlConfig, "feature_code": trustBanner.featureCode])
+                    onPress(["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "url_config": trustBanner.urlConfig])
                 }
             }
         }

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Tue Apr 23 16:40:15 ICT 2024
+sdk.dir=/Users/hung.dao1/Library/Android/sdk

package/package.json

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

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

@@ -1,379 +0,0 @@
-package vn.momo.kits.application
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.animateFloatAsState
-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.BoxWithConstraints
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-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.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-import vn.momo.kits.components.Icon
-import vn.momo.kits.components.Image
-import vn.momo.kits.components.InputSearch
-import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.components.Options
-import vn.momo.kits.components.Text
-import vn.momo.kits.const.AppStatusBar
-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
-import vn.momo.kits.modifier.setAutomationId
-import vn.momo.kits.platform.getScreenDimensions
-import vn.momo.kits.platform.getStatusBarHeight
-import vn.momo.kits.utils.bottomBorder
-
-enum class TitlePosition {
-    LEFT, CENTER,
-}
-
-private const val SCREEN_PADDING = 12
-private const val BACK_WIDTH = 28
-
-data class AnimatedHeader(
-    val type: HeaderType = HeaderType.DEFAULT,
-    val composable: @Composable (scrollState: Int) -> Unit = {}
-)
-
-@Composable
-fun HeaderBackground(
-    isBack: Boolean = true,
-    headerType: HeaderType = HeaderType.DEFAULT,
-    scrollState: Int,
-    inputSearchProps: InputSearchProps? = null,
-    headerRightWidth: Dp = 0.dp,
-    useAnimationSearch: Boolean = false
-) {
-    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val screenWidth = getScreenDimensions().width
-    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
-    val searchWidth = screenWidth - (SCREEN_PADDING * 2)
-
-    val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f),
-    )
-
-    val backgroundColor by animateColorAsState(
-        targetValue = animateColor(
-            Color.Transparent,
-            AppTheme.current.colors.background.surface,
-            opacityAni
-        ),
-    )
-
-    val backgroundSearch by animateColorAsState(
-        targetValue = animateColor(
-            AppTheme.current.colors.background.default,
-            Colors.black_01,
-            opacityAni
-        ),
-    )
-
-    val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
-    )
-
-    val animatedWidth by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(
-            0f,
-            1f
-        ) * ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth,
-    )
-
-    val animatedHeight by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f).coerceIn(
-            0f,
-            1f
-        )) * (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52),
-    )
-
-    when (headerType) {
-        HeaderType.DEFAULT -> {
-            val height = statusBarHeight + 52.dp
-            Box(
-                modifier = Modifier.fillMaxWidth().height(height)
-                    .background(backgroundColor)
-                    .bottomBorder(
-                        strokeWidth = 1.dp,
-                        color = AppTheme.current.colors.border.default
-                    )
-            ) {
-                Box(
-                    modifier = Modifier
-                        .height(height)
-                        .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 (AppTheme.current.assets.headerBackground != null) {
-                    Image(
-                        loading = false,
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(height),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
-        }
-
-        HeaderType.EXTENDED -> {
-            Box(
-                modifier = Modifier.fillMaxWidth().height(animatedHeight.dp)
-            ) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(154.dp)
-                        .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 (AppTheme.current.assets.headerBackground != null) {
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .background(backgroundColor)
-                        ) {
-                            Image(
-                                loading = false,
-                                source = AppTheme.current.assets.headerBackground!!,
-                                modifier = Modifier.fillMaxWidth().height(154.dp),
-                                options = Options(
-                                    contentScale = ContentScale.FillWidth
-                                )
-                            )
-                        }
-                    }
-                }
-
-                if (inputSearchProps != null && useAnimationSearch) {
-                    Box(
-                        modifier = Modifier
-                            .height(52.dp)
-                            .offset(
-                                x = animatedTranslateX.dp
-                            )
-                            .padding(vertical = Spacing.S)
-                            .align(Alignment.BottomStart)
-                    ) {
-                        Box(
-                            modifier = Modifier
-                                .width(animatedWidth.dp)
-                                .background(
-                                    color = backgroundSearch,
-                                    shape = RoundedCornerShape(Radius.XL)
-                                )
-                        ) {
-                            InputSearch(
-                                inputSearchProps = inputSearchProps.copy(
-                                    showButtonText = false,
-                                    backgroundColor = Color.Transparent
-                                )
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        else -> {
-            Box(modifier = Modifier.fillMaxWidth())
-        }
-    }
-}
-
-@Composable
-fun Header(
-    headerType: HeaderType = HeaderType.DEFAULT,
-    titlePosition: TitlePosition,
-    title: String,
-    headerRight: @Composable (() -> Unit)? = null,
-    goBack: (() -> Unit)? = null,
-    opacity: Float? = null,
-    animatedHeader: AnimatedHeader? = null,
-    scrollState: Int = 0,
-    inputSearchProps: InputSearchProps? = null,
-    useAnimationSearch: Boolean = false
-) {
-    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val tintIconColor = AppTheme.current.colors.text.default
-    val backgroundButton = Colors.black_01.copy(alpha = 0.6f)
-    val miniAppContext = ApplicationContext.current
-
-    var colorFraction by remember { mutableStateOf(0f) }
-
-    LaunchedEffect(scrollState) {
-        snapshotFlow { scrollState }
-            .map { (it / 50f).coerceIn(0f, 1f) }
-            .distinctUntilChanged()
-            .collect { fraction -> colorFraction = fraction }
-    }
-
-    if (headerType != HeaderType.NONE) {
-        BoxWithConstraints(
-            Modifier.height(statusBarHeight + 52.dp)
-                .fillMaxWidth()
-                .zIndex(10f),
-            contentAlignment = Alignment.BottomCenter
-        ) {
-            Row(
-                modifier = Modifier.height(52.dp)
-                    .fillMaxWidth()
-                    .padding(horizontal = Spacing.M),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                Box {
-                    if (goBack != null) {
-                        Box(
-                            modifier = Modifier
-                                .size(28.dp)
-                                .then(
-                                    Modifier.border(
-                                        0.2.dp,
-                                        Colors.black_20.copy(alpha = 0.2f),
-                                        RoundedCornerShape(100)
-                                    )
-                                )
-                                .background(
-                                    backgroundButton,
-                                    RoundedCornerShape(100)
-                                )
-                                .clickable(
-                                    onClick = goBack
-                                )
-                                .padding(Spacing.XS)
-                                .setAutomationId("btn_navigation_back"),
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Icon(
-                                source = "arrow-back",
-                                color = Colors.black_20,
-                                size = 20.dp,
-                            )
-                        }
-                    }
-                }
-
-                if (inputSearchProps == null && miniAppContext != null) {
-                    Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
-                    }) {
-                        headerRight?.invoke()
-                    }
-                }
-            }
-
-            // Title
-            Row(
-                modifier = Modifier.height(52.dp)
-                    .fillMaxWidth()
-                    .padding(horizontal = Spacing.M),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                if (goBack != null && titlePosition == TitlePosition.LEFT) {
-                    Spacer(Modifier.width(40.dp))
-                } else {
-                    Box(
-                        Modifier.weight(1f).graphicsLayer {
-                            alpha = if (useAnimationSearch && inputSearchProps != null) {
-                                1f - (opacity ?: 1f)
-                            } else {
-                                if (animatedHeader !== null) opacity ?: 1f else 1f
-                            }
-                        },
-                        contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
-                    ) {
-                        HeaderTitle(
-                            title = title,
-                            color = tintIconColor,
-                            modifier = Modifier.semantics {
-                                testTag = "title_navigation_header"
-                            }
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun HeaderTitle(
-    title: String = "",
-    modifier: Modifier = Modifier,
-    textAlign: TextAlign = TextAlign.Start,
-    color: Color? = null,
-) {
-    Text(
-        modifier = Modifier.then(modifier).zIndex(1f),
-        text = title,
-        textAlign = textAlign,
-        style = Typography.actionS,
-        color = color,
-        maxLines = 1
-    )
-}
-
-fun animateColor(start: Color, stop: Color, fraction: Float): Color {
-    return Color(
-        red = start.red + fraction * (stop.red - start.red),
-        green = start.green + fraction * (stop.green - start.green),
-        blue = start.blue + fraction * (stop.blue - start.blue),
-        alpha = start.alpha + fraction * (stop.alpha - start.alpha)
-    )
-}