@momo-kits/native-kits 0.89.30-beta.1 → 0.89.30-beta.10

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

@@ -4,6 +4,7 @@ import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -15,6 +16,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -24,12 +26,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
@@ -61,76 +60,45 @@ data class AnimatedHeader(
 )
 
 @Composable
-fun HeaderBackground(
-    headerType: HeaderType = HeaderType.DEFAULT
+fun HeaderImage(
+    headerType: HeaderType = HeaderType.DEFAULT,
+    headerBackground: String?,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     when (headerType) {
         HeaderType.DEFAULT -> {
             val height = statusBarHeight + 52.dp
-            Box(
-                modifier = Modifier.fillMaxWidth().height(height)
-                    .bottomBorder(
-                        strokeWidth = 1.dp,
-                        color = AppTheme.current.colors.border.default
-                    )
-            ) {
-                Box(
-                    modifier = Modifier
-                        .height(height)
-                        .fillMaxWidth()
-                        .background(
-                            Brush.linearGradient(
-                                colors = listOf(
-                                    Color(0xFFFDCACE),
-                                    Color(0x00FDCACE)
-                                ),
-                                start = Offset(0f, 0f),
-                                end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
-                            )
-                        )
+            Image(
+                source = headerBackground ?: "",
+                loading = false,
+                modifier = Modifier.fillMaxWidth().height(height),
+                options = Options(
+                    contentScale = ContentScale.FillWidth
                 )
-                if (AppTheme.current.assets.headerBackground != null) {
-                    Image(
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(height),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
-
+            )
         }
 
         HeaderType.EXTENDED -> {
+            Image(
+                source = headerBackground ?: "",
+                loading = false,
+                modifier = Modifier.fillMaxWidth(),
+                options = Options(
+                    contentScale = ContentScale.FillWidth
+                )
+            )
+        }
+
+        HeaderType.SURFACE -> {
+            val height = statusBarHeight + 52.dp
             Box(
-                modifier = Modifier.fillMaxWidth().height(154.dp)
-                    .background(
-                        Brush.linearGradient(
-                            colors = listOf(
-                                Color(0xFFFDCACE),
-                                Color(0x00FDCACE)
-                            ),
-                            start = Offset(0f, 0f),
-                            end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
-                        )
-                    )
+                modifier = Modifier.fillMaxWidth().height(height)
+                    .background(AppTheme.current.colors.background.surface)
                     .bottomBorder(
-                        strokeWidth = 1.dp,
+                        strokeWidth = 2.dp,
                         color = AppTheme.current.colors.border.default
                     )
-            ) {
-                if (AppTheme.current.assets.headerBackground != null) {
-                    Image(
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(154.dp),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
+            )
         }
 
         else -> {
@@ -152,16 +120,22 @@ fun Header(
     scrollState: Int = 0
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
-    val tintIconColor = AppTheme.current.colors.text.default
-    val backgroundButton = Colors.black_01.copy(alpha = 0.2f)
+    var tintIconColor = Colors.black_01
+    var backgroundButton = Colors.black_20.copy(alpha = 0.4f)
+    if (headerType == HeaderType.SURFACE) {
+        tintIconColor = AppTheme.current.colors.text.default
+        backgroundButton = Color.Transparent
+    }
 
     var colorFraction by remember { mutableStateOf(0f) }
 
     LaunchedEffect(scrollState) {
-        snapshotFlow { scrollState }
-            .map { (it / 50f).coerceIn(0f, 1f) }
-            .distinctUntilChanged()
-            .collect { fraction -> colorFraction = fraction }
+        if (headerType == HeaderType.SURFACE) {
+            snapshotFlow { scrollState }
+                .map { (it / 50f).coerceIn(0f, 1f) }
+                .distinctUntilChanged()
+                .collect { fraction -> colorFraction = fraction }
+        }
     }
 
     val tintIconColorAnim by animateColorAsState(
@@ -192,11 +166,15 @@ fun Header(
                             modifier = Modifier
                                 .size(28.dp)
                                 .then(
-                                    Modifier.border(
-                                        0.5.dp,
-                                        Colors.black_20.copy(alpha = 0.4f),
-                                        RoundedCornerShape(100)
-                                    )
+                                    if (headerType == HeaderType.SURFACE) {
+                                        Modifier.border(
+                                            0.5.dp,
+                                            Colors.black_20.copy(alpha = 0.4f),
+                                            RoundedCornerShape(100)
+                                        )
+                                    } else {
+                                        Modifier
+                                    }
                                 )
                                 .background(
                                     backgroundButton,
@@ -214,7 +192,7 @@ fun Header(
                         ) {
                             Icon(
                                 source = "ic_back_ios",
-                                color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                                color = if (headerType == HeaderType.SURFACE && animatedHeader !== null) tintIconColorAnim else tintIconColor,
                                 size = 20.dp,
                             )
                         }
@@ -245,7 +223,7 @@ fun Header(
                 ) {
                     HeaderTitle(
                         title = title,
-                        color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                        color = if (headerType == HeaderType.SURFACE && animatedHeader !== null) tintIconColorAnim else tintIconColor,
                         modifier = Modifier.semantics {
                             contentDescription = "title_navigation_header"
                             testTag = "title_navigation_header"

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

@@ -38,6 +38,7 @@ import vn.momo.kits.platform.getStatusBarHeight
 
 enum class HeaderType {
     DEFAULT,
+    SURFACE,
     EXTENDED,
     NONE
 }
@@ -45,6 +46,7 @@ enum class HeaderType {
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
+    headerBackground: String? = null,
     isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
@@ -88,14 +90,18 @@ fun Screen(
     ) {
 
         if (animatedHeader === null) {
-            HeaderBackground(headerType)
+            HeaderImage(
+                headerType,
+                headerBackground ?: AppTheme.current.assets.headerBackground
+            )
         } else {
             Box(
-                Modifier.zIndex(5f)
-                    .background(Color.White.copy(alpha = opacity))
-                    .graphicsLayer { alpha = opacity }
-            ) {
-                HeaderBackground(headerType)
+                Modifier.zIndex(5f).background(Color.White.copy(alpha = opacity))
+                    .graphicsLayer { alpha = opacity }) {
+                HeaderImage(
+                    headerType,
+                    headerBackground ?: AppTheme.current.assets.headerBackground
+                )
             }
         }
 
@@ -123,7 +129,9 @@ fun Screen(
         ) {
 
             Column(
-                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize).verticalScroll(scrollState) else Modifier.padding(bottom = keyboardSize),
+                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize)
+                    .verticalScroll(scrollState) else
+                    Modifier.padding(bottom = keyboardSize),
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
@@ -148,7 +156,8 @@ fun Screen(
                 scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
                 onClick = fabProps.onClick,
                 containerColor = AppTheme.current.colors.primary,
-                bottom = fabProps.bottom ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
+                bottom = fabProps.bottom
+                    ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
                 icon = fabProps.icon,
                 iconColor = fabProps.iconColor,
                 text = fabProps.label,
@@ -177,8 +186,11 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
             .background(AppTheme.current.colors.background.surface)
     ) {
         Box(
-            Modifier.fillMaxWidth().padding(vertical = Spacing.S, horizontal = Spacing.M)
-        ) {
+            Modifier
+                .fillMaxWidth()
+                .padding(vertical = Spacing.S, horizontal = Spacing.M)
+        )
+        {
             footer?.invoke()
         }
     }

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

@@ -3,7 +3,6 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -13,10 +12,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -221,9 +218,6 @@ fun getTypeStyle(
  * @param iconLeft [String] the icon at the left of title
  * @param title [String] title of button
  * @param loading [Boolean] used when you want to use loading animation
- * @param enabled controls the enabled state of this button. When `false`,
- *     this component will not respond to user input, and it will appear
- *     visually disabled and disabled to accessibility services.
  * @param useTintColor [Boolean] controls color of the icon.
  */
 @Composable
@@ -235,7 +229,6 @@ fun Button(
     iconLeft: String = "",
     title: String = "Button",
     loading: Boolean = false,
-    enabled: Boolean = true,
     useTintColor: Boolean = true,
     isFull: Boolean = true,
     modifier: Modifier = Modifier,
@@ -244,14 +237,14 @@ fun Button(
         modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(size.value.radius)).clickable(
-                enabled = enabled,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             )
 
     } else {
         modifier
             .clip(RoundedCornerShape(size.value.radius)).clickable(
-                enabled = enabled,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             )
     }

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

@@ -33,7 +33,6 @@ fun CheckBox(
     var backgroundColor = AppTheme.current.colors.background.surface
     val iconSource = if (indeterminate) "minus" else "ic_checked"
 
-
     if (checked) {
         borderColor = AppTheme.current.colors.primary
         backgroundColor = AppTheme.current.colors.primary

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

@@ -1,17 +1,13 @@
 package vn.momo.kits.components
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.utils.Icons
 
@@ -25,16 +21,16 @@ fun Icon(
     val icon = if (source.contains("https")) {
         source
     } else {
-        Icons[source]
+        Icons[source] ?: ""
     }
-    Box(modifier.size(size), contentAlignment = Alignment.Center) {
-        AsyncImage(
-            modifier = Modifier.fillMaxSize(),
-            model = icon,
-            contentDescription = null,
+    Image(
+        modifier = modifier.size(size),
+        source = icon,
+        loading = false,
+        options = Options(
             contentScale = ContentScale.Fit,
             colorFilter = color?.let { ColorFilter.tint(it) }
-        )
-    }
+        ),
+    )
 }
 

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

@@ -110,7 +110,7 @@ fun IconButton(
             .then(getIconStyle(type))
             .clip(RoundedCornerShape(size.value.radius))
             .clickable(
-                enabled = type == ButtonType.DISABLED,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             ),
         contentAlignment = Alignment.Center

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

@@ -15,7 +15,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
-import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import vn.momo.kits.const.AppTheme
 
@@ -37,7 +36,6 @@ fun Image(
     options: Options? = null,
     loading: Boolean = true,
 ) {
-    modifier.semantics {contentDescription = "img|$source"; testTag = "img|$source"}
     var imageOptions = Options()
     var imageState by remember { mutableStateOf(ImageState.Loading) }
 
@@ -52,7 +50,7 @@ fun Image(
 
     Box(modifier = modifier) {
         AsyncImage(
-            modifier = modifier,
+            modifier = modifier.semantics {contentDescription = "img|$source"; testTag = "img|$source"},
             model = source,
             contentDescription = null,
             contentScale = imageOptions.contentScale,

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

@@ -51,7 +51,7 @@ fun InputDropDown(
     loading: Boolean = false,
     required: Boolean = false,
 ) {
-    var isFocused by remember { mutableStateOf(false) }
+    val isFocused by remember { mutableStateOf(false) }
 
     val disabledColor = AppTheme.current.colors.text.disable
     var textColor = AppTheme.current.colors.text.default

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

@@ -123,7 +123,10 @@ fun TrustBanner(
             modifier = Modifier
                 .width(64.dp)
                 .height(64.dp)
-                .padding(end = 8.dp)
+                .padding(end = 8.dp),
+            options = Options(
+                contentScale = ContentScale.Fit,
+            )
         )
         Column {
             Text(
@@ -141,11 +144,17 @@ fun TrustBanner(
                             .padding(end = 4.dp)
                             .width(52.dp)
                             .height(20.dp)
+                        ,options = Options(
+                            contentScale = ContentScale.Fit,
+                        )
                     )
                     Image(
                         source = trustBanner.sslImage, modifier = Modifier
                             .width(52.dp)
-                            .height(20.dp)
+                            .height(20.dp),
+                        options = Options(
+                            contentScale = ContentScale.Fit,
+                        )
                     )
                 }
                 Row(

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/app/img/header-background.png"
     )
 )
 
@@ -168,5 +168,6 @@ val darkTheme = Theme(
 
 
 val AppTheme = staticCompositionLocalOf { defaultTheme }
-
-val AppStatusBar = staticCompositionLocalOf<Dp?> { null }
+val AppStatusBar = staticCompositionLocalOf<Dp?> {
+   null
+}

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Aug 21 14:20:12 ICT 2024
-sdk.dir=/Users/huynhdung/Library/Android/sdk
+#Tue Apr 23 16:40:15 ICT 2024
+sdk.dir=/Users/hung.dao1/Library/Android/sdk

package/package.json

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