@momo-kits/native-kits 0.89.32-nav.16 → 0.89.32-nav.3

package/compose/build.gradle.kts

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

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

@@ -32,6 +32,7 @@ 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
@@ -89,11 +90,12 @@ fun HeaderBackground(
                     modifier = Modifier
                         .height(height)
                         .fillMaxWidth()
+                        .alpha(opacityAni)
                         .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() })
@@ -120,8 +122,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() })
@@ -138,23 +140,22 @@ 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())
         }
     }
+    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
+                )
+            )
+    )
 }
 
 @Composable
@@ -162,8 +163,9 @@ fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
     titlePosition: TitlePosition,
     title: String,
+    isBack: Boolean,
     headerRight: @Composable (() -> Unit)? = null,
-    goBack: (() -> Unit)?,
+    goBack: (() -> Unit) = { },
     opacity: Float? = null,
     animatedHeader: AnimatedHeader? = null,
     useSearchInput: Boolean? = false,
@@ -172,7 +174,7 @@ fun Header(
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     val tintIconColor = AppTheme.current.colors.text.default
-    val backgroundButton = Colors.black_01.copy(alpha = 0.2f)
+    val backgroundButton = Colors.black_01.copy(alpha = 0.6f)
 
     var colorFraction by remember { mutableStateOf(0f) }
 
@@ -183,14 +185,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,
@@ -214,14 +208,14 @@ fun Header(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Box {
-                    if (goBack !== null) {
+                    if (isBack) {
                         Box(
                             modifier = Modifier
                                 .size(28.dp)
                                 .then(
                                     Modifier.border(
-                                        0.5.dp,
-                                        Colors.black_20.copy(alpha = 0.4f),
+                                        0.2.dp,
+                                        Colors.black_20.copy(alpha = 0.2f),
                                         RoundedCornerShape(100)
                                     )
                                 )
@@ -239,8 +233,8 @@ fun Header(
                             contentAlignment = Alignment.Center
                         ) {
                             Icon(
-                                source = "ic_back_ios",
-                                color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                                source = "arrow-back",
+                                color = Colors.black_20,
                                 size = 20.dp,
                             )
                         }
@@ -262,7 +256,7 @@ fun Header(
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                if (goBack !== null) {
+                if (isBack) {
                     Spacer(Modifier.width(40.dp))
                 }
                 if (useSearchInput == true && inputSearchProps != null) {
@@ -277,8 +271,9 @@ fun Header(
                     ) {
                         HeaderTitle(
                             title = title,
-                            color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                            color = tintIconColor,
                             modifier = Modifier.semantics {
+                                contentDescription = title
                                 testTag = "title_navigation_header"
                             }
                         )

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

@@ -117,6 +117,7 @@ fun Screen(
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            isBack = isBack,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,

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

@@ -18,6 +18,9 @@ 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
@@ -233,6 +236,7 @@ fun Button(
     isFull: Boolean = true,
     modifier: Modifier = Modifier,
 ) {
+    val testId = "btn_${type.toString().lowercase()}_$title"
     val customModifier = if (isFull) {
         modifier
             .fillMaxWidth()
@@ -254,7 +258,10 @@ fun Button(
             .padding(horizontal = size.value.padding)
             .defaultMinSize(
                 minWidth = size.value.width
-            ).height(size.value.height),
+            ).height(size.value.height)
+            .semantics {
+                contentDescription = title; testTag = testId
+            },
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,
     ) {

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

@@ -14,6 +14,7 @@ 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
 
@@ -47,9 +48,9 @@ fun Image(
         )
     }
 
-    Box(modifier = modifier.semantics {contentDescription = "img|$source"}) {
+    Box(modifier = modifier) {
         AsyncImage(
-            modifier = Modifier.matchParentSize(),
+            modifier = Modifier.matchParentSize().semantics {contentDescription = "img|$source"; testTag = "img|$source"},
             model = source,
             contentDescription = null,
             contentScale = imageOptions.contentScale,

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

@@ -27,6 +27,7 @@ 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
@@ -96,7 +97,7 @@ fun PopupNotify(
     }
 
     Box(Modifier.semantics {
-        testTag = "popup_notify"
+        contentDescription = title; testTag = "popup_notify"
     }, contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
@@ -234,7 +235,7 @@ fun renderRow(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }
@@ -249,7 +250,7 @@ fun renderRow(
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
-                    testTag = "btn_popup_allow"
+                    contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
                 }
             )
         }
@@ -272,7 +273,7 @@ fun renderColumn(
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {
-                testTag = "btn_popup_allow"
+                contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
             }
         )
         secondary?.let {
@@ -287,7 +288,7 @@ fun renderColumn(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }

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

@@ -3,8 +3,6 @@ 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
@@ -33,7 +31,7 @@ fun Text(
     val font = getFontFamily(fontFamily, style.fontWeight)
 
     androidx.compose.material3.Text(
-        modifier = modifier.semantics { contentDescription = text },
+        modifier = modifier,
         text = text,
         color = color ?: AppTheme.current.colors.text.default,
         style = style,

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

@@ -4,6 +4,7 @@ val Icons = mapOf(
     "01.MoMo Copy" to "https://img.mservice.com.vn/app/img/kits/01.MoMo%20Copy.png",
     "01.MoMo" to "https://img.mservice.com.vn/app/img/kits/01.MoMo.png",
     "Phonebook" to "https://img.mservice.com.vn/app/img/kits/Phonebook.png",
+    "arrow-back" to "https://static.momocdn.net/app/img/kits/arrow-back.png",
     "arrow_arrow-back" to "https://img.mservice.com.vn/app/img/kits/arrow_arrow-back.png",
     "arrow_arrow-down" to "https://img.mservice.com.vn/app/img/kits/arrow_arrow-down.png",
     "arrow_arrow-next" to "https://img.mservice.com.vn/app/img/kits/arrow_arrow-next.png",

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.32-nav.16",
+  "version": "0.89.32-nav.3",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish.sh

@@ -3,7 +3,7 @@ rm -rf dist
 mkdir dist
 
 cp . ./dist
-
+mpo
 # GET VERSION from mck_package.json
 VERSIONSTRING=( v$(jq .version package.json) )
 VERSION=(${VERSIONSTRING//[\"]/})