@momo-kits/native-kits 0.89.33-beta.27 → 0.89.33-beta.32

package/compose/build.gradle.kts

@@ -39,6 +39,8 @@ kotlin {
                 implementation(libs.coil.multiplatform.compose)
                 implementation(libs.coil.multiplatform.core)
                 implementation(libs.coil.multiplatform.network.ktor)
+                implementation("com.google.code.gson:gson:2.10")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
             }
         }
         val androidMain by getting {

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

@@ -66,6 +66,7 @@ data class AnimatedHeader(
 @Composable
 fun HeaderBackground(
     headerType: HeaderType = HeaderType.DEFAULT,
+    headerBanner: String? = null,
     scrollState: Int
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -101,7 +102,7 @@ fun HeaderBackground(
                 )
                 if (AppTheme.current.assets.headerBackground != null) {
                     Image(
-                        source = AppTheme.current.assets.headerBackground!!,
+                        source = headerBanner ?: AppTheme.current.assets.headerBackground!!,
                         modifier = Modifier.fillMaxWidth().height(height),
                         options = Options(
                             contentScale = ContentScale.FillWidth
@@ -129,7 +130,7 @@ fun HeaderBackground(
             ) {
                 if (AppTheme.current.assets.headerBackground != null) {
                     Image(
-                        source = AppTheme.current.assets.headerBackground!!,
+                        source = headerBanner ?: AppTheme.current.assets.headerBackground!!,
                         modifier = Modifier.fillMaxWidth().height(154.dp),
                         options = Options(
                             contentScale = ContentScale.FillWidth

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

@@ -1,8 +1,5 @@
 package vn.momo.kits.application
 
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
@@ -17,6 +14,10 @@ val AppNavigator = staticCompositionLocalOf<Navigator> {
     error("no navigator provided!")
 }
 
+val PlatformApi = staticCompositionLocalOf<ComposeApi> {
+    error("no api provided!")
+}
+
 class Navigator {
     fun push(content: @Composable () -> Unit) {
     }
@@ -49,14 +50,23 @@ class Navigator {
     }
 }
 
+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 removeCallback(id: String)
+}
+
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
+    composeApi: ComposeApi,
     content: @Composable () -> Unit,
 ) {
     disableOverscroll()
     CompositionLocalProvider(
         AppTheme provides theme,
+        PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
         AppStatusBar provides getStatusBarHeight(),
     ) {

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

@@ -32,6 +32,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
+import kotlinx.serialization.json.Json
 import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -47,6 +48,8 @@ enum class HeaderType {
     NONE
 }
 
+data class ConfigData(val headerBanner: String)
+
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
@@ -79,6 +82,11 @@ fun Screen(
         else -> 0.dp
     }
 
+    val platformApi = PlatformApi.current
+    val rawData = platformApi.request("GetConfig", "DESIGN_SYSTEM")
+    val json = Json {ignoreUnknownKeys = true}
+    val headerBanner = json.decodeFromString<ConfigData>(rawData).headerBanner
+
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
     val bottomPadding = min(indicator, 21.dp)
 
@@ -95,7 +103,7 @@ fun Screen(
     ) {
 
         if (animatedHeader === null) {
-            HeaderBackground(headerType = headerType, scrollState = scrollState.value)
+            HeaderBackground(headerType = headerType, scrollState = scrollState.value, headerBanner=headerBanner)
         } else {
             Box(
                 Modifier.zIndex(2f)

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

@@ -98,7 +98,6 @@ data class InputSearchProps(
     val keyboardActions: KeyboardActions = KeyboardActions.Default,
     val modifier: Modifier = Modifier,
     val iconModifier: Modifier = Modifier,
-    val onClearPress: () -> Unit = {}
 )
 
 @Composable
@@ -196,10 +195,7 @@ fun InputSearch(
                                         size = 16.dp,
                                         color = AppTheme.current.colors.text.hint,
                                         modifier = Modifier.clickable(
-                                            onClick = {
-                                                inputSearchProps.text.value = ""
-                                                inputSearchProps.onClearPress.invoke()
-                                            },
+                                            onClick = { inputSearchProps.text.value = "" },
                                             interactionSource = remember { MutableInteractionSource() },
                                             indication = null
                                         )

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt

@@ -106,7 +106,7 @@ val defaultTheme = Theme(
     ),
     font = "SFProText",
     assets = ThemeAssets(
-        headerBackground = null
+        headerBackground = "https://static.momocdn.net/app/img/kits/background/header/header_Tet_2024_transparent.png"
     )
 )
 
@@ -162,7 +162,7 @@ val darkTheme = Theme(
     ),
     font = "SFProText",
     assets = ThemeAssets(
-        headerBackground = "https://static.momocdn.net/app/img/app/img/header-background.png"
+        headerBackground = "https://static.momocdn.net/app/img/kits/background/header/header_Tet_2024_transparent.png"
     )
 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.33-beta.27",
+  "version": "0.89.33-beta.32",
   "private": false,
   "dependencies": {},
   "devDependencies": {},