@momo-kits/native-kits 0.112.1-beta.10 → 0.112.1-beta.12

package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt

@@ -112,7 +112,7 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressClose() {
-        api?.request("dismiss", "")
+        api?.request("dismiss", "", {_ -> })
     }
 
     fun onPressMore() {

package/ios/Application/ApplicationContext.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+public class ApplicationContext {
+    public static let shared = ApplicationContext()
+    
+    public var appId: String = ""
+    public var appCode: String = ""
+    public var appName: Any? = nil
+    public var appIcon: String = ""
+    public var description: Any? = nil
+    
+    private init() {}
+} 

package/ios/Application/ApplicationEnvironment.swift

@@ -0,0 +1,17 @@
+import SwiftUI
+
+public class ApplicationEnvironment: ObservableObject {
+//    @Published public var theme: Theme
+//    @Published public var applicationContext: ApplicationContext
+//    @Published public var composeAPI: ComposeApi
+//    
+//    public init(
+//        theme: Theme,
+//        applicationContext: ApplicationContext,
+//        composeAPI: ComposeApi
+//    ) {
+//        self.theme = theme
+//        self.applicationContext = applicationContext
+//        self.composeAPI = composeAPI
+//    }
+} 

package/ios/Application/Badge.swift

@@ -0,0 +1 @@
+ 

package/ios/Application/Components.swift

@@ -160,10 +160,10 @@ public struct Header: View {
                                 
                             }
                             
-                            Spacer() // Pushes headerRight to the right
+                            Spacer()
                             
                             if let headerRight = headerRight {
-                                headerRight()
+                                HeaderRight()
                             }
                         }
                         .frame(height: 52)
@@ -204,12 +204,10 @@ public struct Header: View {
                                     .foregroundColor(tintIconColor)
                                     .frame(maxWidth: titlePosition == .center ? .infinity : nil, alignment: titlePosition == .center ? .center : .leading)
                             }
-                            
                             Spacer()
                         }
                         .frame(height: 52)
                         .padding(.horizontal)
-                        
                     }
                     .background(Color.clear)
                 }

package/ios/Application/ComposeApi.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+public protocol ComposeApi {
+    func request(funcName: String, params: Any, _ completion: ((String) -> Void)?)
+    func request(funcName: String, params: Any) -> String
+}
+
+// Default implementation
+public class ComposeApiImpl: ComposeApi {
+    public static let shared = ComposeApiImpl()
+    
+    private init() {}
+    
+    public func request(funcName: String, params: Any, _ completion: ((String) -> Void)?) {
+        // Implement your API request logic here
+    }
+    
+    public func request(funcName: String, params: Any) -> String {
+        // Implement your API request logic here
+        return ""
+    }
+} 

package/ios/Application/HeaderRight.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Foundation
 
 public struct HeaderRightData {
     var useShortcut: Bool
@@ -73,10 +74,13 @@ struct NavigationButtonConfig {
 }
 
 // MARK: - Components
-struct HeaderRight: View {
+public struct HeaderRight: View {
+    public init(headerRight: HeaderRightData? = nil) {
+        self.headerRight = headerRight
+    }
     var headerRight: HeaderRightData?
     
-    var body: some View {
+    public var body: some View {
         HStack(alignment: .center) {
             ToolkitHeaderRight(headerRight: headerRight)
         }
@@ -87,52 +91,58 @@ struct ToolkitHeaderRight: View {
     var headerRight: HeaderRightData?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // MARK: - Actions
     private func onPressShortcut() {
-        ComposeApi.shared.request(
-            funcName: "onToolAction",
-            params: ["item": ["key": "onFavorite"]]
-        ) { _ in
-            isFavorite.toggle()
-        }
+//        environment.composeAPI.request(
+//            funcName: "onToolAction",
+//            params: ["item": ["key": "onFavorite"]]
+//        ) { _ in
+//            isFavorite.toggle()
+//        }
     }
     
     private func onPressHelpCenter() {
-        let context = ApplicationContext.shared
-        let paramMap: [String: Any] = [
-            "appId": context.appId,
-            "code": context.appCode,
-            "name": context.appName,
-            "icon": context.appIcon,
-            "description": context.description
-        ]
-        ComposeApi.shared.request(
-            funcName: "showHelpCenter",
-            params: paramMap
-        ) { _ in }
+//        let context = environment.applicationContext
+//        let paramMap: [String: Any] = [
+//            "appId": context.appId,
+//            "code": context.appCode,
+//            "name": context.appName,
+//            "icon": context.appIcon,
+//            "description": context.description
+//        ]
+//        environment.composeAPI.request(
+//            funcName: "showHelpCenter",
+//            params: paramMap
+//        ) { _ in }
+        
+        print("Press help center")
     }
     
     private func onPressClose() {
-        ComposeApi.shared.request(funcName: "dismiss", params: "")
+//        environment.composeAPI.request(
+//            funcName: "dismiss",
+//            params: ""
+//        ) { _ in }
     }
     
     private func onPressMore() {
-        let context = ApplicationContext.shared
-        let params: [String: Any] = [
-            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": [
-                "appId": context.appId,
-                "code": context.appCode,
-                "name": context.appName,
-                "icon": context.appIcon,
-                "description": context.description
-            ]
-        ]
-        ComposeApi.shared.request(
-            funcName: "showTools",
-            params: params
-        ) { _ in }
+//        let context = environment.applicationContext
+//        let params: [String: Any] = [
+//            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
+//            "context": [
+//                "appId": context.appId,
+//                "code": context.appCode,
+//                "name": context.appName,
+//                "icon": context.appIcon,
+//                "description": context.description
+//            ]
+//        ]
+//        environment.composeAPI.request(
+//            funcName: "showTools",
+//            params: params
+//        ) { _ in }
     }
     
     private func getNavigationButtonConfig() -> NavigationButtonConfig {
@@ -193,7 +203,7 @@ struct ToolkitHeaderRight: View {
                 RoundedRectangle(cornerRadius: 14)
                     .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
             )
-            .padding(.leading, 8)
+            .padding(.leading, Spacing.S)
         }
     }
 }
@@ -228,4 +238,4 @@ struct NavigationButton: View {
             }
         }
     }
-} 
+} 

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: HeaderRightData?
+    var headerRight: (any View)?
     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: HeaderRightData? = 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,14 +86,14 @@ 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,
                             title: title,
-                            headerRight: headerRight,
+//                            headerRight: headerRight,
                             goBack: goBack,
                             opacity: min(scrollOffset / 114, 1),
                             animatedHeader: animatedHeader,
@@ -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,57 +172,3 @@ struct Footer: View {
         .background(Colors.black01)
     }
 }
-
-public struct Header: View {
-    var headerType: HeaderType = .default
-    var titlePosition: TitlePosition
-    var title: String
-    var headerRight: HeaderRightData?
-    var goBack: (() -> Void)?
-    var opacity: CGFloat? = nil
-    var animatedHeader: AnimatedHeader? = nil
-    var scrollState: CGFloat = 0
-    var inputSearchProps: InputSearchProps? = nil
-    
-    @State private var colorFraction: CGFloat = 0
-    
-    public init(
-        headerType: HeaderType = .default,
-        titlePosition: TitlePosition,
-        title: String,
-        headerRight: HeaderRightData? = nil,
-        goBack: (() -> Void)? = nil,
-        opacity: CGFloat? = nil,
-        animatedHeader: AnimatedHeader? = nil,
-        scrollState: CGFloat = 0,
-        inputSearchProps: InputSearchProps? = nil
-    ) {
-        self.headerType = headerType
-        self.titlePosition = titlePosition
-        self.title = title
-        self.headerRight = headerRight
-        self.goBack = goBack
-        self.opacity = opacity
-        self.animatedHeader = animatedHeader
-        self.scrollState = scrollState
-        self.inputSearchProps = inputSearchProps
-    }
-    
-    public var body: some View {
-        HStack {
-            if let goBack = goBack {
-                Button(action: goBack) {
-                    Text("Back")
-                }
-            }
-            
-            Spacer()
-            
-            if headerRight != nil {
-                HeaderRight(headerRight: headerRight)
-                    .opacity(animatedHeader != nil ? opacity ?? 1 : 1)
-            }
-        }
-    }
-}
-

package/ios/Badge/BadgeDot.swift

@@ -0,0 +1,42 @@
+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)
+            )
+    }
+}
+
+#if DEBUG
+struct BadgeDot_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack(spacing: 10) {
+            BadgeDot(size: .small)
+            BadgeDot(size: .large)
+        }
+    }
+}
+#endif 

package/ios/Icon/Icon.swift

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.112.1-beta.10",
+  "version": "0.112.1-beta.12",
   "private": false,
   "dependencies": {},
   "devDependencies": {},