@momo-kits/native-kits 0.113.3-beta.5 → 0.113.3-beta.7

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

@@ -115,11 +115,12 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressClose() {
-        api?.request("dismiss", "", {_ -> })
+        api?.request("dismiss", "", { _ -> })
     }
 
     fun onPressMore() {
-        api?.request("showTools",
+        api?.request(
+            "showTools",
             mapOf(
                 "tools" to headerRight?.tools?.map { it.toMap() },
                 "context" to mapOf(
@@ -180,10 +181,18 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         group.items.any { it.showBadge }
     }
 
+    val toolkitWidth = if (context !== null) 65.dp else 28.dp
+
+    var isShowShortcut = headerRight?.useShortcut == true
+    //backup case context null of more icon
+    if (headerRight?.useMore == true && context == null) {
+        isShowShortcut = false
+    }
+
     Row(
         verticalAlignment = Alignment.CenterVertically
     ) {
-        if (headerRight?.useShortcut == true) {
+        if (isShowShortcut) {
             NavigationButton(
                 disabled = isLoading,
                 icon = navButtonConfig.icon,
@@ -197,20 +206,26 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
             modifier = Modifier
                 .padding(start = Spacing.S)
                 .border(0.2.dp, Color(0x33000000), shape = RoundedCornerShape(14.dp))
-                .width(65.dp)
+                .width(toolkitWidth)
                 .height(28.dp)
                 .clip(shape = RoundedCornerShape(14.dp))
                 .background(Color(0x99FFFFFF))
         ) {
-            Icon(source = "help_center", size = 20.dp, modifier = Modifier.padding(4.dp).clickable {
-                onPressHelpCenter()
-            })
-            Box(
-                modifier = Modifier
-                    .width(0.5.dp)
-                    .height(12.dp)
-                    .background(Colors.black_20)
-            )
+            if (context != null) {
+                Icon(
+                    source = "help_center",
+                    size = 20.dp,
+                    modifier = Modifier.padding(4.dp).clickable {
+                        onPressHelpCenter()
+                    })
+                Box(
+                    modifier = Modifier
+                        .width(0.5.dp)
+                        .height(12.dp)
+                        .background(Colors.black_20)
+                )
+            }
+
             Icon(
                 source = "16_navigation_close_circle",
                 size = 20.dp,

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

@@ -9,6 +9,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.internal.FormatLanguage
 import vn.momo.kits.components.TrustBannerData
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -48,6 +50,10 @@ data class MiniAppContext(
     val appId: String = "",
     val appCode: String = "",
     val description: Any? = null,
+    val support: Map<String, Any?> = emptyMap(),
+    val toolkitConfig: Map<String, Any?> = emptyMap(),
+    val providerId: String = "",
+    val permissions: List<Map<String, Any>>? = emptyList()
 )
 
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
@@ -64,6 +70,10 @@ val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
 
+val AppLanguage = staticCompositionLocalOf<String?> {
+    null
+}
+
 data class KitConfig(
     val trustBanner: TrustBannerData? = null,
     val headerBar: String? = null,
@@ -77,6 +87,7 @@ fun ApplicationContainer(
     statusBarHeight: Dp? = AppStatusBar.current,
     applicationContext: MiniAppContext? = null,
     config: KitConfig? = null,
+    language: String? = null,
     content: @Composable () -> Unit,
 ) {
     var appTheme by remember { mutableStateOf(theme) }
@@ -105,7 +116,8 @@ fun ApplicationContainer(
         AppNavigator provides Navigator(),
         AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
-        AppConfig provides config
+        AppConfig provides config,
+        AppLanguage provides language
     ) {
         content()
     }

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

@@ -161,7 +161,7 @@ fun Screen(
                         }
 
                         if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
-                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.M)))
+                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.S)))
                         }
                         content()
                     }

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

@@ -20,6 +20,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.application.AppConfig
+import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
@@ -62,10 +63,10 @@ fun TrustBanner(
     serviceName: String = "",
     screenName: String = "",
     onPress: ((Map<String, String>) -> Unit)? = null,
-    trackEvent: ((String, Map<String, String>) -> Unit)? = null,
-    language: String = "vi"
+    trackEvent: ((String, Map<String, String>) -> Unit)? = null
 ) {
     val appConfig = AppConfig.current
+    val language = AppLanguage.current ?: "vi"
     val trustBanner = appConfig?.trustBanner ?: defaultBanner
     val trackParams = mapOf(
         "service_name" to serviceName,

package/ios/Application/ApplicationEnvironment.swift

@@ -23,12 +23,20 @@ public class MiniAppContext {
     }
 }
 
+public class KitConfig {
+    public var trustBanner: TrustBannerData? = nil
+    public var headerBar: String? = nil
+    public var headerGradient: String? = nil
+}
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
-    let composeApi: KitComposeApi
+    let composeApi: KitComposeApi?
+    let config: KitConfig?
     
-    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
+        self.config = config
     }
 }

package/ios/Application/HeaderRight.swift

@@ -95,7 +95,7 @@ struct ToolkitHeaderRight: View {
     
     // MARK: - Actions
     private func onPressShortcut() {
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
@@ -112,14 +112,14 @@ struct ToolkitHeaderRight: View {
             "icon": context?.appIcon,
             "description": context?.description
         ]
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "dismiss",
             params: ""
         ) { _ in }
@@ -137,7 +137,7 @@ struct ToolkitHeaderRight: View {
                 "description": context?.description
             ]
         ]
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in

package/ios/Popup/PopupDisplay.swift

@@ -103,6 +103,8 @@ public struct PopupDisplay: View {
         }
         .background(Color.white.cornerRadius(15))
         .padding(.horizontal, 12)
+        .accessibilityElement(children: .ignore)
+        .accessibility(identifier: "popup_notify")
     }
 
     // MARK: Internal

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -11,179 +11,110 @@ import SDWebImageSwiftUI
 
 let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
 
-struct TrustBannerData: Decodable {
-    let trustBanner: TrustBanner
-}
-
-struct TrustBanner: Decodable {
-    let content: Dictionary<String, String>
+public struct TrustBannerData: Decodable {
+    let content: [String: String]
+    let subContent: [String: String]
     let pciImage: String
     let sslImage: String
     let urlConfig: String
-    let featureCode: String
     let icons: [String]
     let momoImage: String
-
+    
     enum CodingKeys: String, CodingKey {
-        case content, pciImage, sslImage, icons, momoImage
+        case content
+        case subContent
+        case pciImage
+        case sslImage
+        case icons
+        case 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."],
+let defaultBanner = TrustBannerData(
+    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.png",
     sslImage: "https://static.momocdn.net/app/img/kits/trustBanner/ssl.png",
-    urlConfig: "https://momo.vn/an-toan-bao-mat",
-    featureCode: "login_and_security",
+    urlConfig: "login_and_security",
     icons: [
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_viettinbank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_agribank.png",
         "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()
-
-    public init(serviceName: String?,
-                screenName: String?,
-                onPress: ((_ params: NSDictionary) -> Void)?,
-                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"])
-        }
+public struct TrustBanner: View {
+    @EnvironmentObject var applicationEnvironment: ApplicationEnvironment
+    
+    var onPress: ((String)->Void)?
+     
+    public init(onPress: ((String)->Void)?) {
         self.onPress = onPress
-        self.trackEvent = trackEvent
-        self.screenName = screenName
-        self.serviceName = serviceName
-        self.language = language
     }
-
-    public var body: some View {
-        if let trustBanner = viewModel.trustBanner {
-            TrustBannerContentView(trustBanner: trustBanner.trustBanner, onPress: onPress, trackEvent: trackEvent, serviceName: serviceName, screenName: screenName, language: language)
+    
+    var language: String? = "vi"
+    
+    func onPressSecurity() {
+        if (onPress != nil) {
+            onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
         }
     }
-}
-
-struct TrustBannerContentView: View {
-    var trustBanner: TrustBanner
-    var onPress: ((_ params: NSDictionary) -> Void)?
-    var trackEvent: ((_ eventName: String, _ params: NSDictionary) -> Void)?
-    var serviceName: String?
-    var screenName: String?
-    var language: String?
     
-    var body: some View {
-        GeometryReader { geo in
-            HStack(alignment: .center, spacing: 8) {
-                WebImage(url: URL(string: trustBanner.momoImage))
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 64, height: 64)
-                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)
+    
+    public var body: some View {
+        HStack(alignment: .center, spacing: 8) {
+            WebImage(url: URL(string: applicationEnvironment.config?.trustBanner?.momoImage ?? defaultBanner.momoImage))
+                .resizable()
+                .scaledToFit()
+                .frame(width: 64, height: 64)
+            VStack(alignment: .leading){
+                Text(applicationEnvironment.config?.trustBanner?.content[language ?? "vi"] as? String ?? defaultBanner.content[language ?? "vi"])
+                    .foregroundColor(Color(hex: "484848"))
+                    .lineLimit(2)
+                    .font(.system(size: 13, weight: Font.Weight.regular))
+                    .lineSpacing(3)
+                    .padding(.bottom, 8)
+                HStack {
+                    HStack(spacing: 0) {
+                        Text(applicationEnvironment.config?.trustBanner?.subContent[language ?? "vi"] as? String ?? defaultBanner.subContent[language ?? "vi"])
+                            .foregroundColor(Colors.pink03)
+                            .font(.system(size: 13, weight: .bold))
+                            .padding(.trailing, 4)
+                        
+                        Icon(source: "arrow_chevron_right_small", color: Colors.pink03)
+                    }.onTapGesture {
+                        onPressSecurity()
+                    }
+                    
+                    Spacer()
                     HStack{
-                        HStack{
-                            WebImage(url:  URL(string: trustBanner.pciImage))
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 52, height: 20)
-                            WebImage(url:  URL(string: trustBanner.sslImage))
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 52, height: 20)
-                        }
-                        Spacer()
-                        HStack(spacing: -6){
-                            ForEach(trustBanner.icons, id: \.self) { iconURL in
-                                WebImage(url: URL(string: iconURL))
-                                    .resizable()
-                                    .scaledToFit()
-                                    .frame(width:24, height: 24)
-                                    .background(Color.white)
-                                    .cornerRadius(12)
-                                    .overlay(
-                                        Circle().stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
-                                    )
-                            }
-                            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)
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.pciImage ?? defaultBanner.pciImage))
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 24, height: 20)
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.sslImage ?? defaultBanner.sslImage))
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 52, height: 20)
                     }
                 }
+                
             }
-            .frame(width: geo.size.width - 24)
-            .padding(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
-            .background(Color(hex: 0xFFF2F8FF))
-            .cornerRadius(12)
-            .onTapGesture {
-                if let trackEvent = trackEvent {
-                    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])
-                }
-            }
+            
+        }
+        .padding(.all, 12)
+        .background(Color(hex: "F2F8FF"))
+        .cornerRadius(12)
+        .onTapGesture {
+            onPressSecurity()
         }
+        .frame(maxWidth: UIScreen.main.bounds.size.width)
     }
 }

package/package.json

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