@momo-kits/native-kits 0.114.2-beta.1 → 0.114.2-beta.2

package/ios/Application/HeaderRight.swift

@@ -6,7 +6,7 @@ public struct HeaderRightData {
     var useMore: Bool
     var tools: [ToolGroup]
     var toolCallback: ((String) -> Void)?
-
+    
     public init(
         useShortcut: Bool = false,
         useMore: Bool = false,
@@ -25,7 +25,7 @@ public struct Tool {
     var icon: String
     var showBadge: Bool
     var name: [String: String]
-
+    
     public init(
         key: String,
         icon: String,
@@ -37,7 +37,7 @@ public struct Tool {
         self.showBadge = showBadge
         self.name = name
     }
-
+    
     func toMap() -> [String: Any] {
         return [
             "key": key,
@@ -51,7 +51,7 @@ public struct Tool {
 public struct ToolGroup {
     var title: [String: String]
     var items: [Tool]
-
+    
     public init(
         title: [String: String] = [:],
         items: [Tool]
@@ -59,7 +59,7 @@ public struct ToolGroup {
         self.title = title
         self.items = items
     }
-
+    
     func toMap() -> [String: Any] {
         return [
             "title": title,
@@ -79,7 +79,7 @@ public struct HeaderRight: View {
         self.headerRight = headerRight
     }
     var headerRight: HeaderRightData?
-
+    
     public var body: some View {
         HStack(alignment: .center) {
             ToolkitHeaderRight(headerRight: headerRight)
@@ -92,17 +92,17 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
-
+    
     // MARK: - Actions
     private func onPressShortcut() {
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
             isFavorite.toggle()
         }
     }
-
+    
     private func onPressHelpCenter() {
         let context = environment.applicationContext
         let paramMap: [String: Any] = [
@@ -112,20 +112,19 @@ 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 }
     }
-
-
+    
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
@@ -136,13 +135,13 @@ struct ToolkitHeaderRight: View {
                 "name": context?.appName,
                 "icon": context?.appIcon,
                 "description": context?.description,
-                 "support": context?.support,
-                 "toolkitConfig": context?.toolkitConfig,
-                 "providerId": context?.providerId,
-                 "permissions": context?.permissions
+                "support": context?.support,
+                "toolkitConfig": context?.toolkitConfig,
+                "providerId": context?.providerId,
+                "permissions": context?.permissions
             ]
         ]
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
@@ -157,12 +156,12 @@ struct ToolkitHeaderRight: View {
             }
         }
     }
-
+    
     private func getNavigationButtonConfig() -> NavigationButtonConfig {
         let totalTools = headerRight?.tools.reduce(0) { $0 + $1.items.count } ?? 0
         var icon = isFavorite ? "pin_star_checked" : "pin_star"
         var onClickHandler: () -> Void = onPressShortcut
-
+        
         if totalTools > 1 || headerRight?.useMore == true {
             icon = "navigation_more_icon"
             onClickHandler = onPressMore
@@ -172,16 +171,16 @@ struct ToolkitHeaderRight: View {
                 headerRight?.toolCallback?(singleTool.key)
             }
         }
-
+        
         return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
     }
-
+    
     var body: some View {
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
-
+        
         HStack(alignment: .center) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
@@ -191,18 +190,18 @@ struct ToolkitHeaderRight: View {
                     onClick: navButtonConfig.onPress
                 )
             }
-
+            
             HStack(alignment: .center, spacing: 0) {
                 Icon(source: "help_center", size: 20)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
-
+                
                 Rectangle()
                     .fill(Colors.black20)
                     .frame(width: 0.5, height: 12)
-
+                
                 Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
                     .padding(4)
                     .onTapGesture {
@@ -226,7 +225,7 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
-
+    
     var body: some View {
         ZStack {
             Circle()
@@ -235,9 +234,9 @@ struct NavigationButton: View {
                     Circle()
                         .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
                 )
-
+            
             Icon(source: icon, size: 16)
-
+            
             if showBadge {
                 BadgeDot(size: .small)
                     .offset(x: -2, y: -2)

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/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.
-#Wed Aug 21 14:20:12 ICT 2024
-sdk.dir=/Users/huynhdung/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.114.2-beta.1",
+  "version": "0.114.2-beta.2",
   "private": false,
   "dependencies": {},
   "devDependencies": {},