@momo-kits/native-kits 0.162.2-sp.5-debug → 0.162.2-sp.6-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.2-sp.5-debug"
+        version = "0.162.2-sp.6-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.2-sp.5-debug'
+    spec.version                  = '0.162.2-sp.6-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.2-sp.5
+version=0.162.2-sp.6
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/HeaderRight.swift

@@ -102,68 +102,97 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
+
+    private func apiValue(_ value: Any?) -> Any {
+        value ?? NSNull()
+    }
+
+    private var contextMap: [String: Any] {
+        let context = environment.applicationContext
+        return [
+            "appId": apiValue(context?.appId),
+            "code": apiValue(context?.appCode),
+            "name": apiValue(context?.appName),
+            "icon": apiValue(context?.appIcon),
+            "description": apiValue(context?.description),
+            "support": apiValue(context?.support),
+            "toolkitConfig": apiValue(context?.toolkitConfig),
+            "providerId": apiValue(context?.providerId),
+            "permissions": apiValue(context?.permissions)
+        ]
+    }
+
+    private var shouldShowShortcut: Bool {
+        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
+    }
+
+    private func parseResponse(_ response: String) -> Any? {
+        guard let jsonData = response.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
+            return nil
+        }
+        return json["response"]
+    }
     
     // MARK: - Actions
+    private func loadFavoriteState() {
+        environment.composeApi?.request(
+            funcName: "isFavoriteApp",
+            params: ["code": apiValue(environment.applicationContext?.appCode)]
+        ) { response in
+            if let isFavorite = parseResponse(response) as? Bool {
+                self.isFavorite = isFavorite
+            }
+        }
+    }
+
     private func onPressShortcut() {
         environment.composeApi?.request(
             funcName: "onToolAction",
-            params: ["item": ["key": "onFavorite"]]
-        ) { _ in
-            isFavorite.toggle()
+            params: [
+                "item": ["key": "onFavorite"],
+                "context": contextMap
+            ]
+        ) { response in
+            if let result = parseResponse(response) as? [String: Any],
+               result["success"] as? Bool == true {
+                isFavorite.toggle()
+            }
         }
     }
     
     private func onPressHelpCenter() {
-        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
+            params: [
+                "appId": apiValue(environment.applicationContext?.appId),
+                "code": apiValue(environment.applicationContext?.appCode),
+                "name": apiValue(environment.applicationContext?.appName),
+                "icon": apiValue(environment.applicationContext?.appIcon),
+                "description": apiValue(environment.applicationContext?.description)
+            ]
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: ""
+            params: nil
         ) { _ in }
     }
     
     private func onPressMore() {
-        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools,
+            "useSystemTools": headerRight?.useSystemTools ?? true,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": [
-                "appId": context?.appId,
-                "code": context?.appCode,
-                "name": context?.appName,
-                "icon": context?.appIcon,
-                "description": context?.description,
-                "support": context?.support,
-                "toolkitConfig": context?.toolkitConfig,
-                "providerId": context?.providerId,
-                "permissions": context?.permissions
-            ]
+            "context": contextMap
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            do {
-                if let jsonData = response.data(using: .utf8),
-                   let json = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
-                   let toolResponse = json["response"] as? String {
-                    headerRight?.toolCallback?(toolResponse)
-                }
-            } catch {
-                print("Error parsing response:", error)
+            if let toolResponse = parseResponse(response) as? String {
+                headerRight?.toolCallback?(toolResponse)
             }
         }
     }
@@ -195,7 +224,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if headerRight?.useShortcut == true {
+            if shouldShowShortcut {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -206,15 +235,17 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
-                    .padding(4)
-                    .onTapGesture {
-                        onPressHelpCenter()
-                    }
-                
-                Rectangle()
-                    .fill(tintColor ?? Colors.black20)
-                    .frame(width: 0.5, height: 12)
+                if environment.applicationContext != nil {
+                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                        .padding(4)
+                        .onTapGesture {
+                            onPressHelpCenter()
+                        }
+                    
+                    Rectangle()
+                        .fill(tintColor ?? Colors.black20)
+                        .frame(width: 0.5, height: 12)
+                }
                 
                 Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
@@ -231,6 +262,9 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
+        .onAppear {
+            loadFavoriteState()
+        }
     }
 }
 

package/ios/Application/Navigation/BottomTab/BottomTab.swift

@@ -96,7 +96,8 @@ public struct BottomTab: View {
 /// Bottom safe-area inset (home indicator).
 @available(iOS 16.0, *)
 private func safeAreaBottomInset() -> CGFloat {
-    UIApplication.shared.connectedScenes
+    let bottomInset = UIApplication.shared.connectedScenes
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
         .first ?? 0
+    return min(bottomInset, 21)
 }

package/ios/Application/Navigation/NavigationContainer.swift

@@ -15,19 +15,23 @@ public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
 
     private let setNavigator: ((Navigator) -> Void)?
+    private let composeApi: KitComposeApi?
 
     public init(
         initialScreenName: String = "",
         @ViewBuilder initialScreen: @escaping () -> Initial,
         options: NavigationOptions? = nil,
+        composeApi: KitComposeApi? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
         let nav = Navigator(
             initialScreenName: initialScreenName.isEmpty ? (options?.screenName ?? "") : initialScreenName,
             initialContent: { AnyView(initialScreen()) },
-            options: options
+            options: options,
+            composeApi: composeApi
         )
         _navigator = StateObject(wrappedValue: nav)
+        self.composeApi = composeApi
         self.setNavigator = setNavigator
     }
 
@@ -49,7 +53,12 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
             }
         }
-        .onAppear { setNavigator?(navigator) }
+        .onAppear {
+            if navigator.composeApi == nil {
+                navigator.composeApi = composeApi
+            }
+            setNavigator?(navigator)
+        }
     }
 
     @ViewBuilder

package/ios/Application/Navigation/Navigator.swift

@@ -102,12 +102,15 @@ public final class Navigator: ObservableObject {
     private var overplayDismissHandler: (() -> Void)?
 
     public private(set) var rootRoute: DynamicScreenRoute
+    public var composeApi: KitComposeApi?
 
     public init(
         initialScreenName: String = "",
         initialContent: @escaping () -> AnyView,
-        options: NavigationOptions? = nil
+        options: NavigationOptions? = nil,
+        composeApi: KitComposeApi? = nil
     ) {
+        self.composeApi = composeApi
         self.rootRoute = DynamicScreenRegistry.shared.register(
             screenName: initialScreenName,
             content: initialContent,
@@ -198,6 +201,7 @@ public final class Navigator: ObservableObject {
                 let removed = path.removeLast()
                 DynamicScreenRegistry.shared.unregister(id: removed.id)
             } else {
+                composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
                 break
             }
             remaining -= 1

package/ios/Application/Navigation/Overplay/BottomSheet.swift

@@ -54,6 +54,7 @@ struct BottomSheetView<Content: View>: View {
     private let closeThreshold: CGFloat = 100
 
     private var screenHeight: CGFloat { UIScreen.main.bounds.height }
+    private var bottomInset: CGFloat { safeAreaBottomInset() }
 
     private var backgroundColor: Color {
         // Compose uses background.surface (white) for `isSurface`, otherwise
@@ -106,6 +107,9 @@ struct BottomSheetView<Content: View>: View {
                 .frame(height: 1)
 
             content()
+
+            backgroundColor
+                .frame(height: bottomInset)
         }
         .frame(maxWidth: .infinity)
         .frame(maxHeight: screenHeight - safeAreaTopInset() - 90, alignment: .bottom)
@@ -174,3 +178,11 @@ struct BottomSheetView<Content: View>: View {
         }
     }
 }
+
+@available(iOS 16.0, *)
+private func safeAreaBottomInset() -> CGFloat {
+    let bottomInset = UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
+        .first ?? 0
+    return min(bottomInset, 21)
+}

package/ios/Application/Screen.swift

@@ -229,6 +229,7 @@ public struct Screen<Content: View>: View {
 struct Footer: View {
     var footerView: AnyView
     var keyboardSize: CGFloat
+    var bottomInset: CGFloat = 0
 
     var body: some View {
         VStack {
@@ -236,7 +237,7 @@ struct Footer: View {
         }
         .padding(.vertical, Spacing.S)
         .padding(.horizontal, Spacing.M)
-        .padding(.bottom, keyboardSize)
+        .padding(.bottom, keyboardSize + bottomInset)
         .background(Colors.black01)
         .overlay(
             Rectangle()

package/ios/Application/StackScreen.swift

@@ -132,8 +132,10 @@ public struct StackScreen<Content: View>: View {
     // MARK: - Body
 
     public var body: some View {
-        GeometryReader { _ in
+        GeometryReader { geometry in
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
+            let bottomInset = min(geometry.safeAreaInsets.bottom, 21)
+            let contentBottomInset = footer == nil ? bottomInset : 0
 
             ZStack(alignment: .top) {
                 // Background color
@@ -145,6 +147,7 @@ public struct StackScreen<Content: View>: View {
                         VStack(alignment: horizontalAlignment, spacing: 0) {
                             headerAndContent
                         }
+                        .padding(.bottom, contentBottomInset)
 
                         FloatingContent(
                             fabProps: fabProps,
@@ -153,7 +156,7 @@ public struct StackScreen<Content: View>: View {
                         )
                     }
 
-                    FooterContent(footer: footer, keyboardSize: keyboardSize)
+                    FooterContent(footer: footer, keyboardSize: keyboardSize, bottomInset: bottomInset)
                 }
 
                 // Animated search bar overlay (mirrors Compose's SearchAnimated layer).
@@ -440,10 +443,11 @@ private struct HideKeyboardOnTap: ViewModifier {
 private struct FooterContent: View {
     let footer: (() -> AnyView)?
     let keyboardSize: CGFloat
+    let bottomInset: CGFloat
 
     var body: some View {
         if let footerView = footer?() {
-            Footer(footerView: footerView, keyboardSize: keyboardSize)
+            Footer(footerView: footerView, keyboardSize: keyboardSize, bottomInset: bottomInset)
         }
     }
 }

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.162.2-sp.5'
+  s.version          = '0.162.2-sp.6'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.162.2-sp.5'
+  s.version          = '0.162.2-sp.6'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/Sources/MoMoUIKitsDemo/MoMoUIKitsDemoFactory.swift

@@ -6,67 +6,19 @@ public enum MoMoUIKitsDemoViewControllerFactory {
     public static func make(
         context: MoMoUIKitsDemoContext = MoMoUIKitsDemoContext(),
         composeViewController: (() -> UIViewController)? = nil
+    ) -> UIViewController {
+        composeViewController?() ?? makeSwiftUI(context: context)
+    }
+
+    public static func makeSwiftUI(
+        context: MoMoUIKitsDemoContext = MoMoUIKitsDemoContext(),
+        onOpenCompose: @escaping () -> Void = {}
     ) -> UIViewController {
         UIHostingController(
-            rootView: MoMoUIKitsDemoView(
+            rootView: SwiftUIDemoBrowserView(
                 context: context,
-                composeViewController: composeViewController
+                onOpenCompose: onOpenCompose
             )
         )
     }
 }
-
-public struct MoMoUIKitsDemoView: View {
-    private let context: MoMoUIKitsDemoContext
-    private let composeViewController: (() -> UIViewController)?
-    @State private var mode: MoMoUIKitsDemoMode
-
-    public init(
-        context: MoMoUIKitsDemoContext = MoMoUIKitsDemoContext(),
-        composeViewController: (() -> UIViewController)? = nil
-    ) {
-        self.context = context
-        self.composeViewController = composeViewController
-        _mode = State(initialValue: composeViewController == nil ? .swiftUI : .compose)
-    }
-
-    public var body: some View {
-        VStack(spacing: 0) {
-            Picker("", selection: $mode) {
-                if composeViewController != nil {
-                    Text("Compose").tag(MoMoUIKitsDemoMode.compose)
-                }
-                Text("SwiftUI").tag(MoMoUIKitsDemoMode.swiftUI)
-            }
-            .pickerStyle(.segmented)
-            .padding(.horizontal, 16)
-            .padding(.vertical, 12)
-            .background(Color(.systemBackground))
-
-            Group {
-                if mode == .compose, let composeViewController {
-                    ComposeDemoHostView(makeViewController: composeViewController)
-                } else {
-                    SwiftUIDemoBrowserView(context: context)
-                }
-            }
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-        }
-    }
-}
-
-private enum MoMoUIKitsDemoMode: String {
-    case compose
-    case swiftUI
-}
-
-private struct ComposeDemoHostView: UIViewControllerRepresentable {
-    let makeViewController: () -> UIViewController
-
-    func makeUIViewController(context: Context) -> UIViewController {
-        makeViewController()
-    }
-
-    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}
-}
-

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/Home.swift

@@ -96,8 +96,11 @@ public struct HomeView: View {
     // Mirrors Compose's `inputSearch` state: bound into the header search and
     // forwarded into the content for filtering.
     @State private var searchText = ""
+    private let onOpenCompose: () -> Void
 
-    public init() {}
+    public init(onOpenCompose: @escaping () -> Void = {}) {
+        self.onOpenCompose = onOpenCompose
+    }
 
     public var body: some View {
         NavigationContainer(
@@ -124,7 +127,7 @@ public struct HomeView: View {
                     AnyView(
                         MoMoUIKits.Button(
                             title: "Footer Button",
-                            action: { print("Footer Button") },
+                            action: onOpenCompose,
                             type: .primary,
                             size: .large
                         )

package/ios-demo/Sources/MoMoUIKitsDemo/SwiftUIDemoBrowserView.swift

@@ -3,12 +3,13 @@ import MoMoUIKits
 
 struct SwiftUIDemoBrowserView: View {
     let context: MoMoUIKitsDemoContext
+    let onOpenCompose: () -> Void
     @State private var searchText = ""
 
     var body: some View {
         Group {
             if #available(iOS 16.0, *) {
-                HomeView()
+                HomeView(onOpenCompose: onOpenCompose)
             } else {
                 fallbackBrowser
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.2-sp.5-debug",
+  "version": "0.162.2-sp.6-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},