@momo-kits/native-kits 0.112.1-beta.14 → 0.112.1-beta.16

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

@@ -6,14 +6,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
-import kotlinx.coroutines.launch
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
@@ -68,35 +63,25 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
     composeApi: ComposeApi? = null,
-    statusBarHeight: Dp?,
+    statusBarHeight: Dp? = null,
     applicationContext: MiniAppContext? = null,
+    config: Map<String, Any?>? = null,
     content: @Composable () -> Unit,
 ) {
     var appTheme by remember { mutableStateOf(theme) }
-    val coroutineScope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         try {
-            composeApi?.request("getConfig", "DESIGN_SYSTEM") {
-                val json = Json { ignoreUnknownKeys = true }
-                val response = json.parseToJsonElement(it).jsonObject["response"]
-                val headerBar = response
-                    ?.jsonObject
-                    ?.get("headerBar")
-                    ?.jsonPrimitive
-                    ?.content
-                if (headerBar != null && appTheme.assets.headerBackground == null) {
-                    coroutineScope.launch {
-                        appTheme = appTheme.copy(
-                            assets = ThemeAssets(
-                                headerBackground = headerBar
-                            )
-                        )
-                    }
-                }
+            val headerBar = config?.get("headerBar")?.toString()
+            if (headerBar != null && appTheme.assets.headerBackground == null) {
+                appTheme = appTheme.copy(
+                    assets = ThemeAssets(
+                        headerBackground = headerBar
+                    )
+                )
             }
         } catch (e: Exception) {
-            print("@@ == NavigationContainer fetch config error $e")
+            print("@@ == NavigationContainer get config error $e")
         }
     }
 

package/compose/src/commonMain/kotlin/vn/momo/kits/components/TrustBanner.kt

@@ -23,8 +23,8 @@ import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
     content = mapOf(
-        "vi" to "Bảo mật thông tin & An toàn tài sản của bạn là ưu tiên hàng đầu của MoMo.",
-        "en" to "Your data security and money safety are MoMo's top priorities."
+        "vi" to "An toàn tài sản & Bảo mật thông tin của bạn là ưu tiên hàng đầu của MoMo.",
+        "en" to "Ensuring financial security and data privacy is MoMo's highest priority."
     ),
     subContent = mapOf(
         "vi" to "Tìm hiểu thêm",

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
@@ -140,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 {
@@ -188,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

@@ -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/package.json

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

package/ios/Application/Badge.swift

@@ -1 +0,0 @@
-