@momo-kits/native-kits 0.157.8-debug → 0.157.9-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.8-debug"
+        version = "0.157.9-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -108,10 +108,4 @@ actual fun LottieAnimation(
 
 actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
-}
-
-actual fun Modifier.semantics(accessibilityId: String): Modifier {
-    return semantics {
-        contentDescription = accessibilityId
-    }
 }

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

@@ -28,6 +28,7 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
+    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -58,7 +59,8 @@ data class MiniAppContext(
                 toolkitConfig = mergeMaps(parent.toolkitConfig, child.toolkitConfig),
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
-                features = mergeFeatureFlags(parent.features, child.features)
+                features = mergeFeatureFlags(parent.features, child.features),
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -104,4 +106,4 @@ val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?>
     null
 }
 
-internal val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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

@@ -305,7 +305,7 @@ fun Input(
             visualTransformation = visualTransformation,
             keyboardOptions = keyboardOptionsConfig,
             modifier = inputModifier
-                .height(scaleSize(size.values.height.value, 1.1f).dp)
+                .height(scaleSize(size.values.height.value).dp)
                 .onFocusChanged { focusState ->
                     val wasFocused = inputState.isFocused
                     inputState = inputState.copy(
@@ -445,4 +445,4 @@ fun Input(
         // Error/hint display
         ErrorView(error, errorSpacing, hintText)
     }
-}
+}

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

@@ -128,7 +128,7 @@ fun InputPhoneNumber(
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number),
             cursorBrush = SolidColor(AppTheme.current.colors.primary),
             modifier = inputModifier
-                .height(scaleSize(size.values.height.value, 1.1f).dp)
+                .height(scaleSize(size.values.height.value).dp)
                 .onFocusChanged { focusState ->
                     val wasFocused = inputState.isFocused
                     inputState = inputState.copy(
@@ -230,4 +230,4 @@ fun InputPhoneNumber(
         // Error/hint display
         ErrorView(error, errorSpacing, hintText)
     }
-}
+}

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

@@ -37,8 +37,8 @@ const val MAX_FONT_SCALE = 1.5f
 const val MAX_DEVICE_SCALE = 5
 
 @Composable
-fun scaleSize(size: Float, scaleRate: Float? = null): Float {
-    val scaleSizeMaxRate: Float = scaleRate ?: ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
+fun scaleSize(size: Float): Float {
+    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
     val deviceWidth = getScreenDimensions().width
     val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 
@@ -77,7 +77,7 @@ fun scaleSize(size: TextUnit): TextUnit {
 
 @Composable
 fun scaleSize(size: Dp): Dp {
-    return scaleSize(size.value).toInt().dp
+    return scaleSize(size.value).dp
 }
 
 @Composable

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt

@@ -5,13 +5,20 @@ import androidx.compose.ui.node.ModifierNodeElement
 import androidx.compose.ui.node.SemanticsModifierNode
 import androidx.compose.ui.semantics.SemanticsPropertyReceiver
 import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import vn.momo.kits.platform.getPlatformName
-import vn.momo.kits.platform.semantics
 
-fun Modifier.setAutomationId(accessibilityId: String, label: String? = null): Modifier {
-    return this.semantics(accessibilityId)
-}
+fun Modifier.setAutomationId(accessibilityId: String, mergeDescendants: Boolean = false): Modifier {
+    return if (getPlatformName() == "Android") {
+        semantics {
+            contentDescription = accessibilityId
+        }
+    } else {
+        semantics(mergeDescendants = mergeDescendants) {
+            testTag = accessibilityId
+        }
+    }}
 
 /**
  * Alternative for [setAutomationId]

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt

@@ -27,6 +27,7 @@ import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.application.KitConfig
 import vn.momo.kits.application.MiniAppContext
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -85,6 +86,7 @@ fun NavigationContainer(
         ApplicationContext provides mergedContext,
         AppConfig provides config,
         AppLanguage provides language,
+        ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
     ) {
         LaunchedEffect(Unit) {
             setNavigator?.invoke(navigator)

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -39,8 +39,4 @@ expect fun LottieAnimation(
 
 expect fun NativePaint.setColor(
     color: Color = Color.Black
-)
-
-expect fun Modifier.semantics(
-    accessibilityId: String
-) : Modifier
+)

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -148,14 +148,4 @@ fun Color.toUIColor(): UIColor {
 
 actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
-}
-
-private val TestAutomationId = SemanticsPropertyKey<String>(
-    name = "TestAutomationId"
-)
-
-actual fun Modifier.semantics(accessibilityId: String): Modifier {
-    return this.semantics(mergeDescendants = false) {
-        this[TestAutomationId] = accessibilityId
-    }
 }

package/gradle/libs.versions.toml

@@ -1,24 +1,24 @@
 [versions]
-android-compileSdk = "35"
+android-compileSdk = "36"
 android-minSdk = "24"
-android-targetSdk = "35"
+android-targetSdk = "36"
 ktor-version = "3.0.0-rc-1"
-coroutines = "1.8.1"
-kotlin = "2.1.21"
+coroutines = "1.9.0"
+kotlin = "2.3.10"
 kSerialize = "1.7.1"
-compose = "1.8.1"
-navigation-multiplatform = "2.9.0-beta02"
+compose = "1.10.3"
+navigation-multiplatform = "2.9.2"
 coil3-multiplatform = "3.0.0-alpha10"
-androidGradlePlugin = "8.6.0"
+androidGradlePlugin = "8.13.2"
 r8 = "8.9.35"
 kotlinx-datetime = "0.7.1"
 airbnb-lottie = "5.2.0"
 androidx-activity = "1.9.1"
-androidx-appcompat = "1.7.1"
+androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.1.9"
+kits = "0.158.1-beta.1"
 nativemaxapi = "0.0.6"
 
 [libraries]

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.157.8
+version=0.157.9
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

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