@momo-kits/native-kits 0.89.33-beta.30 → 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

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,
@@ -70,7 +73,6 @@ fun Screen(
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val platformApi = PlatformApi.current
     val keyboardController = LocalSoftwareKeyboardController.current
     val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
     val keyboardSize = when {
@@ -80,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)
 
@@ -96,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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
@@ -29,6 +30,7 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.const.AppTheme
@@ -44,6 +46,7 @@ fun RenderRightIconSearch(
     icon: String,
     color: Color,
     onClick: () -> Unit,
+    iconModifier: Modifier = Modifier
 ) {
     if (loading) {
         Box(Modifier.padding(horizontal = Spacing.S)) {
@@ -64,7 +67,7 @@ fun RenderRightIconSearch(
             source = icon,
             color = color,
             size = 24.dp,
-            modifier = Modifier.padding(start = Spacing.S, end = 0.dp).clickable(
+            modifier = iconModifier.padding(start = Spacing.S, end = 0.dp).clickable(
                 onClick = onClick,
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null
@@ -90,6 +93,11 @@ data class InputSearchProps(
     val fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     val keyboardType: KeyboardType = KeyboardType.Text,
     val backgroundColor: Color = Colors.black_01,
+    val clearCondition: (() -> Boolean)? = null,
+    val keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    val keyboardActions: KeyboardActions = KeyboardActions.Default,
+    val modifier: Modifier = Modifier,
+    val iconModifier: Modifier = Modifier,
 )
 
 @Composable
@@ -98,7 +106,6 @@ fun InputSearch(
         text = remember { mutableStateOf("") },
         iconColor = AppTheme.current.colors.text.default
     ),
-
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -124,8 +131,9 @@ fun InputSearch(
                 lineHeight = 20.sp,
                 fontWeight = inputSearchProps.fontWeight.value
             ),
-            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = inputSearchProps.keyboardType),
-            modifier = Modifier.height(36.dp).onFocusChanged {
+            keyboardOptions = inputSearchProps.keyboardOptions.copy(keyboardType = inputSearchProps.keyboardType),
+            keyboardActions = inputSearchProps.keyboardActions,
+            modifier = inputSearchProps.modifier.height(36.dp).onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
                     inputSearchProps.onFocus()
@@ -137,7 +145,12 @@ fun InputSearch(
             decorationBox = { innerTextField ->
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Row(
-                        modifier = Modifier.weight(inputSearchProps.showButtonText.ifTrue(8f, 1f))
+                        modifier = Modifier.weight(
+                            inputSearchProps.showButtonText.ifTrue(
+                                8f,
+                                1f
+                            )
+                        )
                             .background(
                                 inputSearchProps.backgroundColor,
                                 RoundedCornerShape(Radius.XL)
@@ -152,7 +165,6 @@ fun InputSearch(
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            //leading icon
                             Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
@@ -168,12 +180,14 @@ fun InputSearch(
                                             lineHeight = 24.sp,
                                             fontWeight = inputSearchProps.fontWeight.value
                                         ),
-                                        color = placeholderColor
+                                        maxLines = 1,
+                                        color = placeholderColor,
+                                        overflow = TextOverflow.Ellipsis
                                     )
                                 }
                                 innerTextField()
                             }
-                            if (isFocused && inputSearchProps.text.value.isNotEmpty()) {
+                            if (inputSearchProps.clearCondition?.invoke() == true || (isFocused && inputSearchProps.text.value.isNotEmpty())) {
                                 Row {
                                     Spacer(Modifier.width(Spacing.XS))
                                     Icon(
@@ -192,7 +206,8 @@ fun InputSearch(
                                 inputSearchProps.loading,
                                 inputSearchProps.icon,
                                 iconTintColor,
-                                inputSearchProps.onRightIconPressed
+                                inputSearchProps.onRightIconPressed,
+                                iconModifier = inputSearchProps.iconModifier
                             )
                         }
                     }

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.30",
+  "version": "0.89.33-beta.32",
   "private": false,
   "dependencies": {},
   "devDependencies": {},