@momo-kits/native-kits 0.89.17 → 0.89.19

package/android/android.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/android/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
 }
 

package/compose/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 val libGroup = "vn.momo.kits"
-val libVersion = "0.0.2"
+val libVersion = "0.0.1"
 
 kotlin {
     androidTarget {
@@ -37,6 +37,7 @@ kotlin {
                 implementation(libs.ktor.client.core)
                 implementation("com.github.skydoves:landscapist-coil3:2.3.2")
                 implementation(compose.components.resources)
+                implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha07")
 
                 implementation("cafe.adriel.voyager:voyager-navigator:$voyagerVersion")
                 implementation("cafe.adriel.voyager:voyager-screenmodel:$voyagerVersion")

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

@@ -25,6 +25,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 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.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
@@ -145,7 +148,8 @@ fun Header(
                                 indication = rememberRipple(),
                                 onClick = goBack
                             )
-                            .padding(Spacing.XS),
+                            .padding(Spacing.XS)
+                            .semantics { contentDescription = "btn_navigation_back"; testTag = "btn_navigation_back" },
                         contentAlignment = Alignment.Center
                     ) {
                         Icon(
@@ -175,6 +179,10 @@ fun Header(
                     HeaderTitle(
                         title = title,
                         color = tintIconColor,
+                        modifier = Modifier.semantics {
+                            contentDescription = "title_navigation_header"
+                            testTag = "title_navigation_header"
+                        }
                     )
                 }
                 if (isBack) {
@@ -200,5 +208,4 @@ fun HeaderTitle(
         color = color,
         maxLines = 1
     )
-
 }

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

@@ -241,9 +241,10 @@ fun Button(
     isRipple: Boolean = true,
     useTintColor: Boolean = true,
     isFull: Boolean = true,
+    modifier: Modifier = Modifier,
 ) {
     val customModifier = if (isFull) {
-        Modifier
+        modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(size.value.radius)).clickable(
                 interactionSource = remember { MutableInteractionSource() },
@@ -253,7 +254,7 @@ fun Button(
             )
 
     } else {
-        Modifier
+        modifier
             .clip(RoundedCornerShape(size.value.radius)).clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = if (isRipple) rememberRipple() else null,
@@ -286,4 +287,4 @@ fun Button(
             iconRight = iconRight
         )
     }
-}
+}

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

@@ -7,6 +7,9 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.DefaultAlpha
 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 com.skydoves.landscapist.ImageOptions
 import com.skydoves.landscapist.coil3.CoilImage
 import org.jetbrains.compose.resources.ExperimentalResourceApi
@@ -27,6 +30,7 @@ fun Image(
     options: Options? = null,
     loading: Boolean = true,
 ) {
+    modifier.semantics {contentDescription = "img|$source"; testTag = "img|$source"}
     var imageOptions = ImageOptions()
     options?.let {
         imageOptions = ImageOptions(

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

@@ -27,6 +27,9 @@ 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
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.AppNavigator
@@ -96,7 +99,9 @@ fun PopupNotify(
         callback?.invoke()
     }
 
-    Box(contentAlignment = Alignment.TopEnd) {
+    Box(Modifier.semantics {
+        contentDescription = "popup_notify"; testTag = "popup_notify"
+    }, contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -163,6 +168,9 @@ fun PopupNotify(
                 source = "navigation_close",
                 color = AppTheme.current.colors.background.surface,
                 size = 14.dp,
+                modifier = Modifier.semantics {
+                    contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                }
             )
         }
     }
@@ -229,6 +237,9 @@ fun renderRow(
                     },
                     title = it.title,
                     type = ButtonType.TEXT,
+                    modifier = Modifier.semantics {
+                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                    }
                 )
             }
             Spacer(modifier = Modifier.width(Spacing.S))
@@ -241,6 +252,9 @@ fun renderRow(
                     onAction(primary?.onPress)
                 },
                 title = primary?.title ?: "",
+                modifier = Modifier.semantics {
+                    contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+                }
             )
         }
     }
@@ -260,7 +274,10 @@ fun renderColumn(
                 closeAction.value = "button_action"
                 onAction(primary?.onPress)
             },
-            title = primary?.title ?: ""
+            title = primary?.title ?: "",
+            modifier = Modifier.semantics {
+                contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+            }
         )
         secondary?.let {
             Spacer(modifier = Modifier.height(Spacing.S))
@@ -272,7 +289,10 @@ fun renderColumn(
                         onAction(it.onPress)
                     },
                     title = it.title,
-                    type = ButtonType.TEXT
+                    type = ButtonType.TEXT,
+                    modifier = Modifier.semantics {
+                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                    }
                 )
             }
         }

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

@@ -17,6 +17,9 @@ import androidx.compose.runtime.remember
 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.unit.dp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
@@ -27,7 +30,7 @@ fun PromotionPopup(
     source: String = "",
     onClose: (() -> Unit) = {},
 ) {
-    Column {
+    Column(Modifier.semantics { contentDescription = "popup_notify"; testTag = "popup_notify" }) {
         if (source.isNotEmpty()) {
             Image(
                 source = source,
@@ -65,8 +68,11 @@ fun PromotionPopup(
                     source = "navigation_close",
                     color = AppTheme.current.colors.background.surface,
                     size = 14.dp,
+                    modifier = Modifier.semantics {
+                        contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                    }
                 )
             }
         }
     }
-}
+}

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

@@ -7,7 +7,6 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
@@ -26,12 +25,12 @@ fun scaleSize(size: Float): Float {
     return size
 }
 
-@OptIn(InternalResourceApi::class, ExperimentalResourceApi::class)
+@OptIn(InternalResourceApi::class)
 @Composable
 fun getFont(font: String): FontFamily {
     val fontResource = FontResource(
         "font:${font}",
-        setOf(ResourceItem(setOf(), "font/${font}.ttf"))
+        setOf(ResourceItem(setOf(), "font/${font}.ttf", -1, -1))
     )
     return FontFamily(Font(fontResource))
 }

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

@@ -2,15 +2,14 @@ package vn.momo.kits.utils
 
 import androidx.compose.runtime.Composable
 import org.jetbrains.compose.resources.DrawableResource
-import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
 
-@OptIn(InternalResourceApi::class, ExperimentalResourceApi::class)
+@OptIn(InternalResourceApi::class)
 @Composable
 fun getResource(name: String): DrawableResource {
     return DrawableResource(
         "drawable:$name",
-        setOf(ResourceItem(setOf(), "drawable/$name"))
+        setOf(ResourceItem(setOf(), "drawable/$name", -1, -1))
     )
 }

package/gradle.properties

@@ -12,8 +12,8 @@ android.compileSdk=34
 android.targetSdk=34
 android.minSdk=24
 #Versions
-kotlin.version=1.9.23
+kotlin.version=1.9.24
 agp.version=8.1.1
-compose.version=1.6.2
-composeCompilerVersion = 1.5.11
+compose.version=1.6.11
+composeCompilerVersion = 1.5.14
 maven-publish.version=0.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.17",
+  "version": "0.89.19",
   "private": false,
   "dependencies": {},
   "devDependencies": {},