@momo-kits/native-kits 0.112.1-beta.7 → 0.112.1-beta.9

package/compose/src/commonMain/kotlin/vn/momo/kits/{components → application}/HeaderRight.kt

@@ -1,4 +1,4 @@
-package vn.momo.kits.components
+package vn.momo.kits.application
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -23,11 +23,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.ApplicationContext
-import vn.momo.kits.application.ComposeApi
-import vn.momo.kits.application.PlatformApi
+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 vn.momo.kits.utils.ModelConvertUtils
 
 data class HeaderRightData(
     val useOnBoarding: Boolean = false,
@@ -82,19 +81,20 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     val context = ApplicationContext.current
 
     fun onPressShortcut() {
-        isFavorite = !isFavorite
+        api?.request("onToolAction", mapOf("item" to mapOf("key" to "onFavorite"))) {
+            isFavorite = !isFavorite
+        }
     }
 
     fun onPressHelpCenter() {
-        val paramMap: Map<String, Any?> = mapOf(
+        val paramMap = mapOf(
             "appId" to context?.appId,
             "code" to context?.code,
             "name" to context?.name,
             "icon" to context?.icon,
             "description" to context?.description
         )
-        val params = ModelConvertUtils.encodeToJsonFromAny(paramMap).toString()
-        api?.request("showHelpCenter", params, { _ -> })
+        api?.request("showHelpCenter", paramMap, { _ -> })
     }
 
     fun onPressClose() {
@@ -102,7 +102,7 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressMore() {
-        val param = listOf(
+        val params = listOf(
             headerRight?.tools ?: emptyList<ToolGroup>(),
             mapOf(
                 "appId" to context?.appId,
@@ -113,7 +113,6 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
             )
         )
 
-        val params = ModelConvertUtils.encodeToJsonFromAny(param).toString()
         api?.request("showTools", params, { _ -> })
     }
 

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

@@ -23,42 +23,25 @@ import vn.momo.kits.platform.disableOverscroll
 import vn.momo.kits.platform.getStatusBarHeight
 
 interface ComposeApi {
-    fun request(funcName: String, params: String?): String
-    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
-    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
+    fun request(funcName: String, params: Any?): String
+    fun request(funcName: String, params: Any?, onResponse: ((String) -> Unit)?): String
+    fun requestCallback(funcName: String, params: Any?, onResponse: ((String) -> Unit)?)
     fun removeCallback(id: String)
 }
 
 class Navigator {
-    fun push(content: @Composable () -> Unit) {
-    }
-
-    fun present(content: @Composable () -> Unit) {
-
-    }
-
-    fun reset(content: @Composable () -> Unit) {
-
-    }
-
-    fun pop() {
-    }
-
-    fun replace(content: @Composable () -> Unit) {
-    }
-
-    fun popToTop() {
-    }
-
+    fun push(content: @Composable () -> Unit) {}
+    fun present(content: @Composable () -> Unit) {}
+    fun reset(content: @Composable () -> Unit) {}
+    fun pop() {}
+    fun replace(content: @Composable () -> Unit) {}
+    fun popToTop() {}
     fun showModal(
         onClose: () -> Unit = {},
         canBackgroundClose: Boolean = true,
         content: @Composable () -> Unit,
-    ) {
-    }
-
-    fun showBottomSheet(content: @Composable () -> Unit) {
-    }
+    ) {}
+    fun showBottomSheet(content: @Composable () -> Unit) {}
 }
 
 data class MiniAppContext(
@@ -85,7 +68,7 @@ fun ApplicationContainer(
     composeApi: ComposeApi? = null,
     statusBarHeight: Dp? = AppStatusBar.current ?: getStatusBarHeight(),
     applicationContext: MiniAppContext? = null,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     var appTheme by remember { mutableStateOf(theme) }
     val coroutineScope = rememberCoroutineScope()
@@ -121,7 +104,7 @@ fun ApplicationContainer(
         PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
         AppStatusBar provides statusBarHeight,
-        ApplicationContext provides applicationContext
+        ApplicationContext provides applicationContext,
     ) {
         content()
     }

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

@@ -40,7 +40,6 @@ import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getStatusBarHeight
-import vn.momo.kits.components.HeaderRight
 
 enum class HeaderType {
     DEFAULT,

package/package.json

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

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/ModelConverter.kt

@@ -1,82 +0,0 @@
-package vn.momo.kits.utils
-
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-
-
-object ModelConvertUtils {
-    private const val discriminator = "momoClassDiscriminator"
-    val formatter = Json {
-        encodeDefaults = true
-        ignoreUnknownKeys = true
-        classDiscriminator = discriminator
-    }
-
-    fun encodeToJson(data: String?): JsonElement? = try {
-        formatter.parseToJsonElement(data ?: "")
-    } catch (e: Throwable) {
-        null
-    }
-
-    fun encodeToJson(data: Collection<*>): JsonElement {
-        val parsedData = mutableListOf<JsonElement>()
-        data.forEach { value ->
-            when (value) {
-                is Map<*, *> -> parsedData.add(encodeToJson(value))
-                is Collection<*> -> parsedData.add(encodeToJson(value))
-                is Number -> parsedData.add(JsonPrimitive(value))
-                is Boolean -> parsedData.add(JsonPrimitive(value))
-                is String -> parsedData.add(JsonPrimitive(value))
-                is Enum<*> -> encodeToJson(value.name)?.let { parsedData.add(it) }
-                is JsonPrimitive -> parsedData.add(value)
-                is JsonElement -> parsedData.add(value)
-                null -> parsedData.add(JsonNull)
-                else -> throw IllegalStateException("Can't serialize unknown collection type: $value")
-            }
-        }
-        return JsonArray(parsedData)
-    }
-
-    fun encodeToJson(data: Map<*, *>): JsonElement {
-        val parsedData = mutableMapOf<String, JsonElement>()
-        data.forEach { (key, value) ->
-            if (key is String && value != null) {
-                when (value) {
-                    is Map<*, *> -> parsedData[key] = encodeToJson(value)
-                    is Collection<*> -> parsedData[key] = encodeToJson(value)
-                    is Number -> parsedData[key] = JsonPrimitive(value)
-                    is Boolean -> parsedData[key] = JsonPrimitive(value)
-                    is String -> parsedData[key] = JsonPrimitive(value)
-                    is Enum<*> -> encodeToJson(value.name)?.let { parsedData[key] = it }
-                    is Array<*> -> parsedData[key] = encodeToJsonFromArray(value)
-                    is JsonPrimitive -> parsedData[key] = value
-                    is JsonElement -> parsedData[key] = value
-                    else -> throw IllegalStateException("Can't serialize unknown type:  $value")
-                }
-            }
-        }
-        return JsonObject(parsedData)
-    }
-
-    fun encodeToJsonFromAny(data: Any): JsonElement {
-        return when (data) {
-            is Map<*, *> -> encodeToJson(data)
-            is Collection<*> -> encodeToJson(data)
-            is Number -> JsonPrimitive(data)
-            is Boolean -> JsonPrimitive(data)
-            is String -> JsonPrimitive(data)
-            is Enum<*> -> encodeToJson(data.name) ?: JsonNull
-            is Array<*> -> encodeToJsonFromArray(data)
-            is JsonElement -> data
-            else -> JsonNull
-        }
-    }
-
-    private fun encodeToJsonFromArray(data: Array<*>): JsonArray =
-        JsonArray(data.filterNotNull().map { encodeToJsonFromAny(it) })
-
-}