@momo-kits/native-kits 0.113.3-webview.2 → 0.114.1-beta.1

package/ios/Swipeable/SwipeCell.swift

@@ -10,9 +10,9 @@ public struct SwipeCellModifier: ViewModifier {
     var trailingSideGroup: [SwipeCellActionItem] = []
     @Binding var currentUserInteractionCellID: String?
     var settings: SwipeCellSettings = .init()
-    
+
     @State private var offsetX: CGFloat = 0
-    
+
     let generator = UINotificationFeedbackGenerator()
     @State private var hapticFeedbackOccurred: Bool = false
     @State private var openSideLock: SwipeGroupSide?
@@ -22,15 +22,23 @@ public struct SwipeCellModifier: ViewModifier {
             if self.leadingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.leadingSideGroup, side: .leading)
             }
-                
+
             if self.trailingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.trailingSideGroup, side: .trailing)
             }
-                
+
             content
                 .offset(x: self.offsetX)
-                .gesture(DragGesture(minimumDistance: 30, coordinateSpace: .local).onChanged(self.dragOnChanged(value:)).onEnded(dragOnEnded(value:)))
-                    
+                .simultaneousGesture(
+                    DragGesture(minimumDistance: 30, coordinateSpace: .local)
+                        .onChanged { value in
+                            self.dragOnChanged(value: value)
+                        }
+                        .onEnded { value in
+                            self.dragOnEnded(value: value)
+                        }
+                )
+
         }.frame(width: cellWidth)
             .edgesIgnoringSafeArea(.horizontal)
             .clipped()
@@ -43,7 +51,7 @@ public struct SwipeCellModifier: ViewModifier {
                 }
             }
     }
-    
+
     internal func swipeToRevealArea(swipeItemGroup: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         HStack {
             if side == .trailing {
@@ -63,17 +71,17 @@ public struct SwipeCellModifier: ViewModifier {
                     }
                 }
             }.opacity(self.swipeRevealAreaOpacity(side: side))
-    
+
             if side == .leading {
                 Spacer()
             }
         }
     }
-    
+
     internal func buttonContentView(item: SwipeCellActionItem, group: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         ZStack {
             item.backgroundColor
-                
+
             HStack {
                 if self.warnSwipeOutCondition(side: side, hasSwipeOut: item.swipeOutAction) && item.swipeOutButtonView != nil {
                     item.swipeOutButtonView!()
@@ -81,28 +89,28 @@ public struct SwipeCellModifier: ViewModifier {
                     item.buttonView()
                 }
             }
-        
+
         }.frame(width: self.itemButtonWidth(item: item, itemGroup: group, side: side))
     }
-    
+
     internal func menuWidth(side: SwipeGroupSide)->CGFloat {
         switch side {
         case .leading:
             return self.leadingSideGroup.map { $0.buttonWidth }.reduce(0, +)
-          
+
         case .trailing:
             return self.trailingSideGroup.map { $0.buttonWidth }.reduce(0, +)
         }
     }
-    
+
     // MARK: drag gesture
-    
+
     internal func dragOnChanged(value: DragGesture.Value) {
         let horizontalTranslation = value.translation.width
         if self.nonDraggableCondition(horizontalTranslation: horizontalTranslation) {
             return
         }
-        
+
         if self.openSideLock != nil {
             // if one side is open, we need to add the menu width!
             let menuWidth = self.openSideLock == .leading ? self.menuWidth(side: .leading) : self.menuWidth(side: .trailing)
@@ -110,9 +118,9 @@ public struct SwipeCellModifier: ViewModifier {
             self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
             return
         }
-        
+
         self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
-        
+
         if horizontalTranslation > 8 || horizontalTranslation < -8 { // makes sure the swipe cell doesn't open too easily
             self.currentUserInteractionCellID = self.id
             self.offsetX = horizontalTranslation
@@ -120,11 +128,11 @@ public struct SwipeCellModifier: ViewModifier {
             self.offsetX = 0
         }
     }
-    
+
     internal func nonDraggableCondition(horizontalTranslation: CGFloat)->Bool {
         return self.offsetX == 0 && (self.leadingSideGroup.isEmpty && horizontalTranslation > 0 || self.trailingSideGroup.isEmpty && horizontalTranslation < 0)
     }
-    
+
     internal func dragOnEnded(value: DragGesture.Value) {
         let swipeOutTriggerValue = self.cellWidth * self.settings.swipeOutTriggerRatio
 
@@ -139,7 +147,7 @@ public struct SwipeCellModifier: ViewModifier {
                 } else {
                     self.lockSideMenu(side: .leading)
                 }
-                
+
             } else {
                 // leading group emtpy
                 self.setOffsetX(value: 0)
@@ -160,7 +168,7 @@ public struct SwipeCellModifier: ViewModifier {
             }
         }
     }
-    
+
     internal func triggerHapticFeedbackIfNeeded(horizontalTranslation: CGFloat) {
         let side: SwipeGroupSide = horizontalTranslation > 0 ? .leading : .trailing
         let group = side == .leading ? self.leadingSideGroup : self.trailingSideGroup
@@ -170,7 +178,7 @@ public struct SwipeCellModifier: ViewModifier {
             self.hapticFeedbackOccurred = true
         }
     }
-    
+
     internal func swipeOutItemWithHapticFeedback(group: [SwipeCellActionItem])->SwipeCellActionItem? {
         if let item = group.filter({ $0.swipeOutAction == true }).first {
             if item.swipeOutHapticFeedbackType != nil {
@@ -179,7 +187,7 @@ public struct SwipeCellModifier: ViewModifier {
         }
         return nil
     }
-    
+
     internal func swipeOutAction(item: SwipeCellActionItem, sideFactor: CGFloat) {
         if item.swipeOutIsDestructive {
             let swipeOutWidth = cellWidth + 10
@@ -188,12 +196,12 @@ public struct SwipeCellModifier: ViewModifier {
         } else {
             self.setOffsetX(value: 0) // open side lock set in function!
         }
-      
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             item.actionCallback()
         }
     }
-    
+
     internal func lockSideMenu(side: SwipeGroupSide) {
         self.setOffsetX(value: side.sideFactor * self.menuWidth(side: side))
         self.openSideLock = side
@@ -214,7 +222,7 @@ public struct SwipeCellModifier: ViewModifier {
         let dynamicButtonWidth = self.dynamicButtonWidth(item: item, itemCount: itemGroup.count, side: side)
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         let swipeOutActionCondition = side == .leading ? self.offsetX > triggerValue : self.offsetX < -triggerValue
-        
+
         if item.swipeOutAction && swipeOutActionCondition {
             return self.offsetX.magnitude + settings.addWidthMargin
         } else if swipeOutActionCondition && item.swipeOutAction == false && itemGroup.contains(where: { $0.swipeOutAction == true }) {
@@ -223,12 +231,12 @@ public struct SwipeCellModifier: ViewModifier {
             return dynamicButtonWidth
         }
     }
-    
+
     internal func dynamicButtonWidth(item: SwipeCellActionItem, itemCount: Int, side: SwipeGroupSide)->CGFloat {
         let menuWidth = self.menuWidth(side: side)
         return (self.offsetX.magnitude + settings.addWidthMargin) * (item.buttonWidth / menuWidth)
     }
-    
+
     internal func warnSwipeOutCondition(side: SwipeGroupSide, hasSwipeOut: Bool)->Bool {
         if hasSwipeOut == false {
             return false
@@ -236,11 +244,11 @@ public struct SwipeCellModifier: ViewModifier {
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         return (side == .trailing && self.offsetX < -triggerValue) || (side == .leading && self.offsetX > triggerValue)
     }
-    
+
     internal func swipeRevealAreaOpacity(side: SwipeGroupSide)->Double {
         switch side {
         case .leading:
-        
+
             return self.offsetX > 5 ? 1 : 0
         case .trailing:
             return self.offsetX < -5 ? 1 : 0

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.
-#Sun Mar 02 11:30:14 ICT 2025
-sdk.dir=/Users/nguyenhoangson/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.3-webview.2",
+  "version": "0.114.1-beta.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},