@momo-kits/native-kits 0.89.32-nav.2 → 0.89.33-beta.20

package/compose/build.gradle.kts

@@ -61,8 +61,6 @@ kotlin {
 
 publishing {
     repositories {
-        google()
-        mavenCentral()
         maven {
             group = libGroup
             version = libVersion

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

@@ -32,7 +32,6 @@ 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
 import androidx.compose.ui.text.style.TextAlign
@@ -51,7 +50,6 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
-import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getStatusBarHeight
 import vn.momo.kits.utils.bottomBorder
 
@@ -68,7 +66,6 @@ data class AnimatedHeader(
 @Composable
 fun HeaderBackground(
     headerType: HeaderType = HeaderType.DEFAULT,
-    useShadow: Boolean? = true,
     scrollState: Int
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -90,6 +87,7 @@ fun HeaderBackground(
                     modifier = Modifier
                         .height(height)
                         .fillMaxWidth()
+                        .alpha(opacityAni)
                         .background(
                             Brush.linearGradient(
                                 colors = listOf(
@@ -121,8 +119,8 @@ fun HeaderBackground(
                     .background(
                         Brush.linearGradient(
                             colors = listOf(
-                                Color(0xFFFDCACE),
-                                Color(0x00FDCACE)
+                                Color(0xFFFDCADE),
+                                Color(0x00FDCADE)
                             ),
                             start = Offset(0f, 0f),
                             end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
@@ -139,23 +137,13 @@ fun HeaderBackground(
                     )
                 }
             }
-            Box(
-                modifier = Modifier.fillMaxWidth().height(statusBarHeight + 52.dp)
-                    .alpha(1 - opacityAni)
-                    .background(Colors.black_01)
-                    .then(
-                        if (useShadow == true) Modifier.shadow() else Modifier.bottomBorder(
-                            1.dp,
-                            Colors.black_04
-                        )
-                    )
-            )
         }
 
         else -> {
             Box(modifier = Modifier.fillMaxWidth())
         }
     }
+
 }
 
 @Composable
@@ -163,12 +151,10 @@ fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
     titlePosition: TitlePosition,
     title: String,
-    isBack: Boolean,
     headerRight: @Composable (() -> Unit)? = null,
-    goBack: (() -> Unit) = { },
+    goBack: (() -> Unit)? = null,
     opacity: Float? = null,
     animatedHeader: AnimatedHeader? = null,
-    useSearchInput: Boolean? = false,
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps?
 ) {
@@ -185,14 +171,6 @@ fun Header(
             .collect { fraction -> colorFraction = fraction }
     }
 
-    val tintIconColorAnim by animateColorAsState(
-        targetValue = animateColor(
-            Colors.black_01,
-            AppTheme.current.colors.text.default,
-            colorFraction
-        )
-    )
-
     val backgroundSearch by animateColorAsState(
         targetValue = animateColor(
             Colors.black_01,
@@ -216,7 +194,7 @@ fun Header(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Box {
-                    if (isBack) {
+                    if (goBack != null) {
                         Box(
                             modifier = Modifier
                                 .size(28.dp)
@@ -242,18 +220,17 @@ fun Header(
                         ) {
                             Icon(
                                 source = "arrow-back",
-                                color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                                color = Colors.black_20,
                                 size = 20.dp,
                             )
                         }
                     }
                 }
-                if (useSearchInput == false) {
-                    Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
-                    }) {
-                        headerRight?.invoke()
-                    }
+
+                Box(Modifier.graphicsLayer {
+                    alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                }) {
+                    headerRight?.invoke()
                 }
             }
 
@@ -264,13 +241,12 @@ fun Header(
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                if (isBack) {
+                if (goBack != null && titlePosition == TitlePosition.LEFT) {
                     Spacer(Modifier.width(40.dp))
                 }
-                if (useSearchInput == true && inputSearchProps != null) {
+                if (inputSearchProps != null) {
                     InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
-                }
-                else{
+                } else{
                     Box(
                         Modifier.weight(1f).graphicsLayer {
                             alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
@@ -279,9 +255,8 @@ fun Header(
                     ) {
                         HeaderTitle(
                             title = title,
-                            color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                            color = tintIconColor,
                             modifier = Modifier.semantics {
-                                contentDescription = title
                                 testTag = "title_navigation_header"
                             }
                         )
@@ -303,7 +278,7 @@ fun HeaderTitle(
         modifier = Modifier.then(modifier).zIndex(1f),
         text = title,
         textAlign = textAlign,
-        style = Typography.headerDefault,
+        style = Typography.actionS,
         color = color,
         maxLines = 1
     )

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

@@ -56,7 +56,7 @@ fun Screen(
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     title: String = "Stack",
     titlePosition: TitlePosition = TitlePosition.LEFT,
-    goBack: (() -> Unit) = { },
+    goBack: (() -> Unit)? = null,
     scrollable: Boolean = true,
     scrollState: ScrollState = rememberScrollState(),
     onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
@@ -66,8 +66,6 @@ fun Screen(
     fabProps: FabProps? = null,
     animatedHeader: AnimatedHeader? = null,
     layoutOffset: Dp = 56.dp,
-    useShadow: Boolean? = true,
-    useSearchInput: Boolean? = false,
     inputSearchProps: InputSearchProps? = null,
     content: @Composable () -> Unit,
 ) {
@@ -100,13 +98,12 @@ fun Screen(
             HeaderBackground(headerType = headerType, scrollState = scrollState.value)
         } else {
             Box(
-                Modifier.zIndex(5f)
+                Modifier.zIndex(2f)
                     .background(Color.White.copy(alpha = opacity))
                     .graphicsLayer { alpha = opacity }
             ) {
                 HeaderBackground(
                     headerType = headerType,
-                    useShadow = useShadow,
                     scrollState = scrollState.value
                 )
             }
@@ -117,11 +114,9 @@ fun Screen(
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
-            isBack = isBack,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
-            useSearchInput = useSearchInput,
             inputSearchProps = inputSearchProps,
             scrollState = scrollState.value
         )

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

@@ -18,9 +18,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
@@ -236,7 +233,6 @@ fun Button(
     isFull: Boolean = true,
     modifier: Modifier = Modifier,
 ) {
-    val testId = "btn_${type.toString().lowercase()}_$title"
     val customModifier = if (isFull) {
         modifier
             .fillMaxWidth()
@@ -258,10 +254,7 @@ fun Button(
             .padding(horizontal = size.value.padding)
             .defaultMinSize(
                 minWidth = size.value.width
-            ).height(size.value.height)
-            .semantics {
-                contentDescription = title; testTag = testId
-            },
+            ).height(size.value.height),
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,
     ) {

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

@@ -1,13 +1,17 @@
 package vn.momo.kits.components
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 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.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 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
 
@@ -23,14 +27,14 @@ fun Icon(
     } else {
         Icons[source] ?: ""
     }
-    Image(
-        modifier = modifier.size(size),
-        source = icon,
-        loading = false,
-        options = Options(
+    Box(modifier = modifier.size(size).semantics {contentDescription = "img|$icon"}) {
+        AsyncImage(
+            modifier = Modifier.matchParentSize(),
+            model = icon,
+            contentDescription = null,
             contentScale = ContentScale.Fit,
-            colorFilter = color?.let { ColorFilter.tint(it) }
-        ),
-    )
+            colorFilter = color?.let { ColorFilter.tint(it) },
+        )
+    }
 }
 

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

@@ -14,7 +14,6 @@ import androidx.compose.ui.graphics.painter.Painter
 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 coil3.compose.AsyncImage
 import vn.momo.kits.const.AppTheme
 
@@ -48,9 +47,9 @@ fun Image(
         )
     }
 
-    Box(modifier = modifier) {
+    Box(modifier = modifier.semantics {contentDescription = "img|$source"}) {
         AsyncImage(
-            modifier = Modifier.matchParentSize().semantics {contentDescription = "img|$source"; testTag = "img|$source"},
+            modifier = Modifier.matchParentSize(),
             model = source,
             contentDescription = null,
             contentScale = imageOptions.contentScale,

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
@@ -90,6 +91,9 @@ data class InputSearchProps(
     val fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     val keyboardType: KeyboardType = KeyboardType.Text,
     val backgroundColor: Color = Colors.black_01,
+    val keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    val keyboardActions: KeyboardActions = KeyboardActions.Default,
+    val modifier: Modifier = Modifier
 )
 
 @Composable
@@ -98,7 +102,7 @@ fun InputSearch(
         text = remember { mutableStateOf("") },
         iconColor = AppTheme.current.colors.text.default
     ),
-
+    clearCondition: (() -> Boolean)? = null
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -124,7 +128,8 @@ fun InputSearch(
                 lineHeight = 20.sp,
                 fontWeight = inputSearchProps.fontWeight.value
             ),
-            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = inputSearchProps.keyboardType),
+            keyboardOptions = inputSearchProps.keyboardOptions.copy(keyboardType = inputSearchProps.keyboardType),
+            keyboardActions = inputSearchProps.keyboardActions,
             modifier = Modifier.height(36.dp).onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
@@ -137,7 +142,7 @@ fun InputSearch(
             decorationBox = { innerTextField ->
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Row(
-                        modifier = Modifier.weight(inputSearchProps.showButtonText.ifTrue(8f, 1f))
+                        modifier = inputSearchProps.modifier.weight(inputSearchProps.showButtonText.ifTrue(8f, 1f))
                             .background(
                                 inputSearchProps.backgroundColor,
                                 RoundedCornerShape(Radius.XL)
@@ -152,7 +157,6 @@ fun InputSearch(
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            //leading icon
                             Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
@@ -188,12 +192,14 @@ fun InputSearch(
                                     )
                                 }
                             }
-                            RenderRightIconSearch(
-                                inputSearchProps.loading,
-                                inputSearchProps.icon,
-                                iconTintColor,
-                                inputSearchProps.onRightIconPressed
-                            )
+                            if (clearCondition?.invoke() == true) {
+                                RenderRightIconSearch(
+                                    inputSearchProps.loading,
+                                    inputSearchProps.icon,
+                                    iconTintColor,
+                                    inputSearchProps.onRightIconPressed
+                                )
+                            }
                         }
                     }
                     if (inputSearchProps.showButtonText) {

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

@@ -27,7 +27,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextLayoutResult
@@ -97,7 +96,7 @@ fun PopupNotify(
     }
 
     Box(Modifier.semantics {
-        contentDescription = title; testTag = "popup_notify"
+        testTag = "popup_notify"
     }, contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
@@ -235,7 +234,7 @@ fun renderRow(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = it.title; testTag = "btn_popup_cancel"
+                        testTag = "btn_popup_cancel"
                     }
                 )
             }
@@ -250,7 +249,7 @@ fun renderRow(
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
-                    contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
+                    testTag = "btn_popup_allow"
                 }
             )
         }
@@ -273,7 +272,7 @@ fun renderColumn(
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {
-                contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
+                testTag = "btn_popup_allow"
             }
         )
         secondary?.let {
@@ -288,7 +287,7 @@ fun renderColumn(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = it.title; testTag = "btn_popup_cancel"
+                        testTag = "btn_popup_cancel"
                     }
                 )
             }

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

@@ -3,6 +3,8 @@ package vn.momo.kits.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
@@ -31,7 +33,7 @@ fun Text(
     val font = getFontFamily(fontFamily, style.fontWeight)
 
     androidx.compose.material3.Text(
-        modifier = modifier,
+        modifier = modifier.semantics { contentDescription = text },
         text = text,
         color = color ?: AppTheme.current.colors.text.default,
         style = style,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.32-nav.2",
+  "version": "0.89.33-beta.20",
   "private": false,
   "dependencies": {},
   "devDependencies": {},