@momo-kits/native-kits 0.113.1-beta.2 → 0.113.1-beta.4

package/ios/Application/Screen.swift

@@ -20,13 +20,13 @@ public struct Screen<Content: View>: View {
     var onContentLayout: ((CGRect) -> Void)?
     var useAvoidKeyboard: Bool
     var footer: (() -> AnyView)?
-    var headerRight: (() -> AnyView)?
+    var headerRight: (()->any View)? = {HeaderRight()}
     var animatedHeader: AnimatedHeader? = nil
     var layoutOffset: CGFloat
     var inputSearchProps: InputSearchProps? = nil
     var fabProps: FabProps? = nil
     var content: () -> Content
-    
+
     public init(
         backgroundColor: Color? = nil,
         isBack: Bool = true,
@@ -40,7 +40,7 @@ public struct Screen<Content: View>: View {
         onContentLayout: ((CGRect) -> Void)? = nil,
         useAvoidKeyboard: Bool = true,
         footer: (() -> AnyView)? = nil,
-        headerRight: (() -> AnyView)? = nil,
+        headerRight:  (()->any View)? = {HeaderRight()},
         animatedHeader: AnimatedHeader? = nil,
         layoutOffset: CGFloat = 56,
         inputSearchProps: InputSearchProps? = nil,
@@ -66,19 +66,19 @@ public struct Screen<Content: View>: View {
         self.fabProps = fabProps
         self.content = content
     }
-    
+
     @State private var scrollOffset: CGFloat = 0
-    
+
     public var body: some View {
         GeometryReader { geometry in
             let safeAreaInsets = geometry.safeAreaInsets
             let statusBarHeight = safeAreaInsets.top
             let keyboardHeight: CGFloat = 0
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
-            
+
             ZStack {
                 (backgroundColor ?? Color.white).edgesIgnoringSafeArea(.all)
-                
+
                 VStack(spacing: 0) {
                     ZStack {
                         if animatedHeader == nil {
@@ -86,9 +86,9 @@ public struct Screen<Content: View>: View {
                         } else {
                             Color.white.opacity(Double(min(scrollOffset / 114, 1)))
                                 .overlay(HeaderBackground(headerType: headerType, scrollState: scrollOffset))
-                            
+
                         }
-                        
+
                         Header(
                             headerType: headerType,
                             titlePosition: titlePosition,
@@ -101,13 +101,13 @@ public struct Screen<Content: View>: View {
                             inputSearchProps: inputSearchProps
                         ).padding(.bottom, headerType == .extended ? 0 : -safeAreaTopInset())
                     }.padding(.top, -safeAreaTopInset())
-                    
-                    
+
+
                     VStack(alignment: horizontalAlignment, spacing: 0) {
                         if animatedHeader != nil {
                             Spacer().frame(height: statusBarHeight + 52 + layoutOffset)
                         }
-                        
+
                         if scrollable {
                             ScrollView(.vertical, showsIndicators: false) {
                                 VStack {
@@ -125,19 +125,19 @@ public struct Screen<Content: View>: View {
                         }
                     }
                     .padding(.bottom, keyboardSize)
-                    
-                    
+
+
                     if let footerView = footer?() {
                         ZStack(alignment: .top) {
                             Rectangle()
                                 .fill(Colors.black20)
                                 .frame(height: 4)
                                 .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
-                            
+
                             Footer(footerView: footerView, keyboardSize: keyboardSize)
                         }
                     }
-                    
+
                     if let fabProps = fabProps {
                         FloatingButton(
                             scrollOffset: scrollOffset,
@@ -154,7 +154,7 @@ public struct Screen<Content: View>: View {
                         )
                     }
                 }
-                
+
             }
         }
     }
@@ -163,7 +163,7 @@ public struct Screen<Content: View>: View {
 struct Footer: View {
     var footerView: AnyView
     var keyboardSize: CGFloat
-    
+
     var body: some View {
         VStack {
             footerView
@@ -172,4 +172,3 @@ struct Footer: View {
         .background(Colors.black01)
     }
 }
-

package/ios/Badge/BadgeDot.swift

@@ -0,0 +1,31 @@
+import SwiftUI
+
+public enum DotSize {
+    case small
+    case large
+    
+    var size: CGFloat {
+        switch self {
+        case .small: return 10
+        case .large: return 16
+        }
+    }
+}
+
+public struct BadgeDot: View {
+    var size: DotSize
+    
+    public init(size: DotSize = .large) {
+        self.size = size
+    }
+    
+    public var body: some View {
+        Circle()
+            .fill(Colors.red03)
+            .frame(width: size.size, height: size.size)
+            .overlay(
+                Circle()
+                    .stroke(Colors.black01, lineWidth: 1)
+            )
+    }
+}

package/ios/Button/Button.swift

@@ -98,8 +98,9 @@ private extension View {
         case .secondary:
             return AnyView(self
                 .background(Colors.card)
-                .foregroundColor(Colors.primary)
+                .foregroundColor(Colors.text)
                 .cornerRadius(8)
+                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black06, lineWidth: 1))
                 .padding(2)
             )
         case .outline:

package/ios/Icon/Icon.swift

@@ -44,9 +44,7 @@ public struct Icon: View {
 
     public var body: some View {
         if let uri = iconSources[source]?.uri {
-            ImageView(uri)
-                .frame(width: size, height: size)
-                .foregroundColor(color)
+            ImageView(uri, color: color).frame(width: size, height: size)
         }
     }
 }

package/ios/Image/Image.swift

@@ -8,11 +8,12 @@ import SwiftUI
 public struct ImageView: View {
     // MARK: Lifecycle
 
-    public init(_ url: String, aspectRatio: CGFloat? = nil, contentMode: ContentMode = ContentMode.fit, placeholder: AnyView? = nil) {
+    public init(_ url: String, aspectRatio: CGFloat? = nil, contentMode: ContentMode = ContentMode.fit, placeholder: AnyView? = nil, color: Color? = nil) {
         self.url = url
         self.aspectRatio = aspectRatio
         self.contentMode = contentMode
         self.placeholder = placeholder
+        self.color = color
     }
 
     // MARK: Public
@@ -26,6 +27,7 @@ public struct ImageView: View {
                 error = false
             }
             .resizable()
+            .renderingMode(.template)
             .placeholder {
                 Rectangle().foregroundColor(.gray)
                 VStack(alignment: .center, content: {
@@ -47,6 +49,7 @@ public struct ImageView: View {
             .scaledToFit()
             .transition(.fade)
             .aspectRatio(aspectRatio, contentMode: contentMode)
+            .modifier(ColorMultiplyModifier(color: color))
     }
 
     // MARK: Internal
@@ -54,7 +57,20 @@ public struct ImageView: View {
     var aspectRatio: CGFloat?
     var contentMode: ContentMode
     var placeholder: AnyView?
+    var color: Color?
 
     @State var error: Bool = false
     var url: String
 }
+
+private struct ColorMultiplyModifier: ViewModifier {
+    let color: Color?
+    
+    func body(content: Content) -> some View {
+        if let color {
+            content.colorMultiply(color)
+        } else {
+            content
+        }
+    }
+}

package/ios/Popup/PopupDisplay.swift

@@ -43,7 +43,6 @@ public struct PopupDisplay: View {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
                         .frame(width: 16, height: 16)
-                        .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(8))
                     .offset(x: 6, y: -6)
@@ -53,17 +52,15 @@ public struct PopupDisplay: View {
                     WebImage(url: URL(string: url), isAnimating: .constant(true))
                         .resizable()
                         .scaledToFill()
-                        .frame(maxWidth: .infinity)
+                        .frame(maxWidth: .infinity, maxHeight: 164)
                         .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
-                        .aspectRatio(2, contentMode: .fit)
 
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
-                            .font(.title3)
-                            .padding(.top, 16)
-                            .padding(.bottom, 8)
-                            .lineLimit(2)
+                            .font(.headerText1)
+                            .padding(.top, 12)
+                            .padding(.bottom, 24)
 
                         Text(description)
                             .foregroundColor(.black)
@@ -90,8 +87,10 @@ public struct PopupDisplay: View {
                 }.clipped()
             }
         }
-        .background(Color.white.cornerRadius(15))
-        .padding(.horizontal, 24)
+        .background(Color.white.cornerRadius(8))
+        .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)
     }
 
     // MARK: Internal

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.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#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.113.1-beta.2",
+  "version": "0.113.1-beta.4",
   "private": false,
   "dependencies": {},
   "devDependencies": {},