@momo-kits/native-kits 0.112.1-beta.13 → 0.112.1-beta.15

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

@@ -27,6 +27,9 @@ import vn.momo.kits.components.BadgeDot
 import vn.momo.kits.components.DotSize
 import vn.momo.kits.components.Icon
 import vn.momo.kits.const.Colors
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 
 data class HeaderRightData(
     val useShortcut: Boolean = false,
@@ -127,8 +130,16 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
                     "description" to context?.description
                 )
             )
-        ) {
-
+        ) { response ->
+            try {
+                val json = Json.parseToJsonElement(response).jsonObject
+                val toolResponse = json["response"]?.jsonPrimitive?.content
+                if (toolResponse != null) {
+                    headerRight?.toolCallback?.invoke(toolResponse)
+                }
+            } catch (e: Exception) {
+                println("Error parsing response: $e")
+            }
         }
     }
 
@@ -238,7 +249,7 @@ fun NavigationButton(
             )
         }
 
-        if (showBadge != true) {
+        if (showBadge == true) {
             BadgeDot(
                 size = DotSize.Small,
                 modifier = Modifier

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

@@ -68,7 +68,7 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
     composeApi: ComposeApi? = null,
-    statusBarHeight: Dp? = AppStatusBar.current ?: getStatusBarHeight(),
+    statusBarHeight: Dp? = null,
     applicationContext: MiniAppContext? = null,
     content: @Composable () -> Unit,
 ) {
@@ -100,12 +100,14 @@ fun ApplicationContainer(
         }
     }
 
+    val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
+
     disableOverscroll()
     CompositionLocalProvider(
         AppTheme provides appTheme,
         PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
-        AppStatusBar provides statusBarHeight,
+        AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
     ) {
         content()

package/ios/Application/HeaderRight.swift

@@ -29,8 +29,8 @@ public struct Tool {
     public init(
         key: String,
         icon: String,
-        showBadge: Bool = false,
-        name: [String: String] = [:]
+        name: [String: String] = [:],
+        showBadge: Bool = false
     ) {
         self.key = key
         self.icon = icon
@@ -116,8 +116,6 @@ struct ToolkitHeaderRight: View {
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
-        
-        print("Press help center")
     }
     
     private func onPressClose() {
@@ -142,7 +140,17 @@ struct ToolkitHeaderRight: View {
         environment.composeApi.request(
             funcName: "showTools",
             params: params
-        ) { _ in }
+        ) { 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)
+            }
+        }
     }
     
     private func getNavigationButtonConfig() -> NavigationButtonConfig {
@@ -190,7 +198,7 @@ struct ToolkitHeaderRight: View {
                     .fill(Colors.black20)
                     .frame(width: 0.5, height: 12)
                 
-                Icon(source: "16_navigation_close_circle", size: 20)
+                Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressClose()

package/ios/Badge/BadgeDot.swift

@@ -28,15 +28,4 @@ public struct BadgeDot: View {
                     .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(source)
+        if let uri = iconSources[source]?.uri {
+            ImageView(uri)
                 .frame(width: size, height: size)
                 .foregroundColor(color)
-//        }
+        }
     }
 }
 

package/package.json

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

package/ios/Application/Badge.swift

@@ -1 +0,0 @@
-