@momo-kits/native-kits 0.117.1 → 0.117.2-beta.2

package/ios/Popup/PopupDisplay.swift

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

package/ios/Popup/PopupPromotion.swift

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

package/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
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

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