@momo-kits/native-kits 0.151.2-test.8 → 0.152.1-beta.1

package/ios/Button/Button.swift

@@ -1,4 +1,3 @@
-
 import Foundation
 import SwiftUI
 import Lottie
@@ -23,12 +22,85 @@ public enum ButtonSize {
     case small
 }
 
-// MARK: - Button
+public struct ButtonStyleData {
+    let background: Color
+    let content: Color
+    let border: Color?
+    let borderWidth: CGFloat
+
+    public init(
+        background: Color,
+        content: Color,
+        border: Color? = nil,
+        borderWidth: CGFloat = 1
+    ) {
+        self.background = background
+        self.content = content
+        self.border = border
+        self.borderWidth = borderWidth
+    }
+}
+
+// MARK: - ButtonType Extension (Style mapping)
+
+public extension ButtonType {
+    var style: ButtonStyleData {
+        switch self {
+        case .primary:
+            return ButtonStyleData(
+                background: Colors.primary,
+                content: Colors.black01
+            )
+        case .danger:
+            return ButtonStyleData(
+                background: Colors.error,
+                content: Colors.black01
+            )
+        case .tonal:
+            return ButtonStyleData(
+                background: Colors.primaryLight,
+                content: Colors.primary
+            )
+        case .text:
+            return ButtonStyleData(
+                background: .clear,
+                content: Colors.primary
+            )
+        case .secondary:
+            return ButtonStyleData(
+                background: Colors.black01,
+                content: Colors.black17,
+                border: Colors.black04
+            )
+        case .outline:
+            return ButtonStyleData(
+                background: Colors.card,
+                content: Colors.primary,
+                border: Colors.primary
+            )
+        case .disabled:
+            return ButtonStyleData(
+                background: Colors.black05,
+                content: Colors.black06
+            )
+        }
+    }
+}
+
+// MARK: - Button View
 
 public struct Button: View {
     // MARK: Lifecycle
 
-    public init(title: String = "", action: @escaping () -> Void, type: ButtonType = .primary, size: ButtonSize = .large, iconLeft: AnyView? = nil, iconRight: AnyView? = nil, loading: Bool = false) {
+    public init(
+        title: String = "",
+        action: @escaping () -> Void,
+        type: ButtonType = .primary,
+        size: ButtonSize = .large,
+        iconLeft: AnyView? = nil,
+        iconRight: AnyView? = nil,
+        loading: Bool = false
+    ) {
         self.title = title
         self.action = action
         self.type = type
@@ -38,117 +110,87 @@ public struct Button: View {
         self.loading = loading
     }
 
-    // MARK: Public
-
-    public var body: some View {
-        SwiftUI.Button(action: action) {
-            HStack {
-                if loading {
-                    LottieView(name: "lottie_circle_loader", loopMode: .loop)
-                        .frame(width: iconSize, height: iconSize)
-                        .colorMultiply(.white)
-                } else if let iconLeft = iconLeft {
-                    iconLeft.frame(width: iconSize, height: iconSize)
-                }
-                renderTitle(title: title, type: type, size: size).lineLimit(1).truncationMode(.tail)
-                if let iconRight = iconRight {
-                    iconRight.frame(width: iconSize, height: iconSize)
-                }
-            }
-            .buttonSize(size)
-            .buttonType(type)
-            .opacity(loading ? 0.75 : 1.0)
-        }
-        .disabled(type == .disabled || loading)
-        .clipShape(RoundedRectangle(cornerRadius: Radius.S))
-    }
-
     // MARK: Internal
 
     var title: String
-    var action: () -> Void = {}
-    var type: ButtonType = .primary
-    var size: ButtonSize = .large
+    var action: () -> Void
+    var type: ButtonType
+    var size: ButtonSize
     var iconLeft: AnyView?
     var iconRight: AnyView?
     var loading: Bool
-    
+
+    // MARK: Private Helpers
+
     private var iconSize: CGFloat {
         switch size {
-            case .large: return 24
-            case .medium: return 16
-            case .small: return 16
+        case .large: return 24
+        case .medium, .small: return 16
         }
     }
 
-    func renderTitle(title: String, type: ButtonType, size: ButtonSize) -> Text {
+    private func height(for size: ButtonSize) -> CGFloat {
         switch size {
-        case .large:
-            return Text(title).font(.system(size: 16, weight: Font.Weight.bold))
-        case .medium:
-            return Text(title).font(.system(size: 14, weight: Font.Weight.bold))
-        case .small:
-            return Text(title).font(.system(size: 12, weight: Font.Weight.bold))
+        case .large: return 48
+        case .medium: return 36
+        case .small: return 28
         }
     }
-}
 
-private extension View {
-    func buttonType(_ type: ButtonType) -> some View {
-        switch type {
-        case .primary:
-            return AnyView(self
-                .background(Colors.primary)
-                .foregroundColor(Colors.black01)
-            )
-        case .danger:
-            return AnyView(self
-                .background(Colors.error)
-                .foregroundColor(Colors.black01)
-            )
-        case .tonal:
-            return AnyView(self
-                .background(Colors.primaryLight)
-                .foregroundColor(Colors.primary)
-            )
-        case .text:
-            return AnyView(self
-                .foregroundColor(Colors.primary)
-            )
-        case .secondary:
-            return AnyView(self
-                .background(Colors.black01)
-                .foregroundColor(Colors.black17)
-                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black04, lineWidth: 1))
-            )
-        case .outline:
-            return AnyView(self
-                .background(Colors.card)
-                .foregroundColor(Colors.primary)
-                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.primary, lineWidth: 1))
-            )
-        case .disabled:
-            return AnyView(self
-                .background(Colors.black05)
-                .foregroundColor(Colors.black06)
-            )
+    private func padding(for size: ButtonSize) -> CGFloat {
+        switch size {
+        case .large: return Spacing.L
+        case .medium: return Spacing.M
+        case .small: return Spacing.S
         }
     }
 
-    func buttonSize(_ size: ButtonSize) -> some View {
+    private func renderTitle(title: String, size: ButtonSize) -> Text {
         switch size {
         case .large:
-            return self
-                .frame(maxWidth: .infinity, minHeight: 48, maxHeight: 48)
-                .padding([.leading, .trailing], Spacing.L)
+            return Text(title).font(.system(size: 16, weight: .bold))
         case .medium:
-            return self
-                .frame(minWidth: 80, maxWidth: .infinity, minHeight: 36, maxHeight: 36)
-                .padding([.leading, .trailing], Spacing.M)
+            return Text(title).font(.system(size: 14, weight: .bold))
         case .small:
-            return self
-                .frame(minWidth: 56, maxWidth: 76, minHeight: 28, maxHeight: 28)
-                .padding([.leading, .trailing], Spacing.S)
+            return Text(title).font(.system(size: 12, weight: .bold))
+        }
+    }
+
+    // MARK: View
+
+    public var body: some View {
+        let style = type.style
+
+        SwiftUI.Button(action: action) {
+            HStack(spacing: 8) {
+                if loading {
+                    LottieView(name: "lottie_circle_loader", loopMode: .loop)
+                        .frame(width: iconSize, height: iconSize)
+                        .colorMultiply(style.content)
+                } else if let iconLeft = iconLeft {
+                    iconLeft.frame(width: iconSize, height: iconSize)
+                }
+
+                renderTitle(title: title, size: size)
+                    .lineLimit(1)
+                    .truncationMode(.tail)
+
+                if let iconRight = iconRight {
+                    iconRight.frame(width: iconSize, height: iconSize)
+                }
+            }
+            .frame(maxWidth: .infinity)
+            .padding(.horizontal, padding(for: size))
+            .frame(height: height(for: size))
+            .background(style.background)
+            .foregroundColor(style.content)
+            .overlay(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .stroke(style.border ?? .clear, lineWidth: style.border != nil ? style.borderWidth : 0)
+            )
+            .clipShape(RoundedRectangle(cornerRadius: Radius.S))
+            .opacity(loading ? 0.75 : 1.0)
         }
+        .disabled(type == .disabled || loading)
     }
 }

package/ios/Lottie/LottieView.swift

@@ -15,21 +15,21 @@ struct LottieView: UIViewRepresentable {
   var loopMode: LottieLoopMode = .playOnce
   var contentMode : UIView.ContentMode  = .scaleAspectFit
   var onDone: (() -> Void)?
-  
+
   // Add static cache for animations
   private static var animationCache = NSCache<NSString, LottieAnimation>()
-  
+
   func makeUIView(context: UIViewRepresentableContext<LottieView>) -> UIView {
     let view = UIView(frame: .zero)
-    
+
     // Configure Lottie with optimized settings
     let configuration = LottieConfiguration(
       renderingEngine: .coreAnimation,
       decodingStrategy: .dictionaryBased
     )
-    
+
     let animationView = LottieAnimationView(configuration: configuration)
-    
+
     if let url = url {
       // Use cached animation if available
       if let cachedAnimation = Self.animationCache.object(forKey: url as NSString) {
@@ -50,37 +50,37 @@ struct LottieView: UIViewRepresentable {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
       } else if let animation = LottieAnimation.named(name) {
-          Self.animationCache.setObject(animation, forKey: name as NSString)
-          animationView.animation = animation
-          setupAnimationView(animationView, view)
+        Self.animationCache.setObject(animation, forKey: name as NSString)
+        animationView.animation = animation
+        setupAnimationView(animationView, view)
       }
     }
-    
+
     return view
   }
-  
+
   private func setupAnimationView(_ animationView: LottieAnimationView, _ containerView: UIView) {
     animationView.contentMode = contentMode
     animationView.loopMode = loopMode
     animationView.backgroundBehavior = loopMode == .loop ? .pauseAndRestore : .pause
-    
+
     // Optimize rendering
     animationView.shouldRasterizeWhenIdle = true
-    
+
     animationView.translatesAutoresizingMaskIntoConstraints = false
     containerView.addSubview(animationView)
-    
+
     NSLayoutConstraint.activate([
       animationView.widthAnchor.constraint(equalTo: containerView.widthAnchor),
       animationView.heightAnchor.constraint(equalTo: containerView.heightAnchor)
     ])
-    
+
     animationView.play { finished in
       if finished {
         onDone?()
       }
     }
   }
-  
+
   func updateUIView(_ uiView: UIView, context: UIViewRepresentableContext<LottieView>) {}
 }

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.151.2-test.8",
+  "version": "0.152.1-beta.1",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"

package/ios/Lottie/LottieViewController.swift

@@ -1,55 +0,0 @@
-//
-//  LottieViewController.swift
-//  MoMoPlatform
-//
-//  Created by Đại Trịnh on 26/09/2023.
-//  Copyright © 2023 Facebook. All rights reserved.
-//
-
-import Foundation
-import Lottie
-import SwiftUI
-
-public class LottieViewController: UIViewController {
-  var name: String = ""
-  var url: String?
-  var loopMode: LottieLoopMode = .playOnce
-  var frame: CGRect
-  var id: String?
-
-  init(name: String, url: String? = nil, loopMode: LottieLoopMode, frame: CGRect, id: String? = nil) {
-    self.name = name
-    self.url = url
-    self.loopMode = loopMode
-    self.frame = frame
-    self.id = id
-
-    super.init(nibName: nil, bundle: nil)
-  }
-
-  required init?(coder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  public override func viewDidLoad() {
-    super.viewDidLoad()
-    setupCustomView()
-  }
-
-  private func setupCustomView() {
-    let basicView = UIView()
-    basicView.frame = frame
-
-    let customLottieView = LottieView(name: name, url: url, loopMode: loopMode)
-    let hostViewController = UIHostingController(rootView: customLottieView)
-    hostViewController.view.frame = basicView.bounds;
-    hostViewController.view.backgroundColor = .clear
-
-    // set accessibility label
-    basicView.accessibilityLabel = id ?? "" // Set accessibility label directly to basicView
-    basicView.isAccessibilityElement = true // Ensure basicView is treated as an accessible element
-
-    basicView.addSubview(hostViewController.view)
-    view.addSubview(basicView)
-  }
-}