@momo-kits/native-kits 0.154.1-beta.3 → 0.154.1-beta.5

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

@@ -16,6 +16,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
 import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.navigation.IsBaselineViewEnabled
 import vn.momo.kits.platform.getStatusBarHeight
 
 @Deprecated("Use IMaxApi instead", ReplaceWith("IMaxApi"))
@@ -74,7 +75,8 @@ data class MiniAppContext(
     val support: Map<String, Any?> = emptyMap(),
     val toolkitConfig: Map<String, Any?> = emptyMap(),
     val providerId: String = "",
-    val permissions: List<Map<String, Any>>? = emptyList()
+    val permissions: List<Map<String, Any>>? = emptyList(),
+    val isBaselineEnabled: Boolean = false
 ) {
     companion object {
         private const val KEY_ICON        = "icon"
@@ -86,6 +88,7 @@ data class MiniAppContext(
         private const val KEY_TOOLKIT_CFG = "toolkitConfig"
         private const val KEY_PERMISSIONS = "permissions"
         private const val KEY_ORIGIN_APP  = "originAppId"
+        private const val KEY_BASELINE_ENABLED  = "isBaselineEnabled"
 
         fun toMap(context: MiniAppContext?): Map<String, Any?> = mapOf(
             "icon"          to (context?.appIcon ?: ""),
@@ -96,7 +99,8 @@ data class MiniAppContext(
             "support"       to (context?.support ?: emptyMap<String, Any?>()),
             "toolkitConfig" to (context?.toolkitConfig ?: emptyMap<String, Any?>()),
             "providerId"    to (context?.providerId ?: ""),
-            "permissions"   to (context?.permissions ?: emptyList<Map<String, Any>>())
+            "permissions"   to (context?.permissions ?: emptyList<Map<String, Any>>()),
+            "isBaselineEnabled"   to (context?.isBaselineEnabled ?: false)
         )
 
         fun fromMap(data: Map<String, Any?>?): MiniAppContext = MiniAppContext(
@@ -111,7 +115,8 @@ data class MiniAppContext(
                 originAppId = data.string(KEY_ORIGIN_APP),
                 appId       = data.string(KEY_APP_ID)
             ),
-            permissions   = data.listOfMapStringAny(KEY_PERMISSIONS)
+            permissions   = data.listOfMapStringAny(KEY_PERMISSIONS),
+            isBaselineEnabled = data?.get(KEY_BASELINE_ENABLED) as Boolean
         )
 
         private fun computeProviderId(originAppId: String?, appId: String?): String {
@@ -198,6 +203,7 @@ fun ApplicationContainer(
     }
 
     val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
+    val isBaselineEnabled = applicationContext?.isBaselineEnabled ?: false
 
     CompositionLocalProvider(
         AppTheme provides appTheme,
@@ -207,6 +213,7 @@ fun ApplicationContainer(
         ApplicationContext provides applicationContext,
         AppConfig provides config,
         AppLanguage provides language,
+        IsBaselineViewEnabled provides isBaselineEnabled
     ) {
         content()
     }

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

@@ -261,7 +261,7 @@ fun Input(
             visualTransformation = visualTransformation,
             keyboardOptions = keyboardOptionsConfig,
             modifier = Modifier
-                .height(size.values.height)
+                .height(scaleSize(size.values.height.value, 1.1f).dp)
                 .onFocusChanged { focusState ->
                     val wasFocused = inputState.isFocused
                     inputState = inputState.copy(

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

@@ -124,7 +124,7 @@ fun InputPhoneNumber(
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number),
             cursorBrush = SolidColor(AppTheme.current.colors.primary),
             modifier = Modifier
-                .height(size.values.height)
+                .height(scaleSize(size.values.height.value, 1.1f).dp)
                 .onFocusChanged { focusState ->
                     val wasFocused = inputState.isFocused
                     inputState = inputState.copy(

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

@@ -13,8 +13,6 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.ComposeApi
-import vn.momo.kits.application.PlatformApi
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
@@ -22,6 +20,7 @@ import vn.momo.kits.const.getFontFamily
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
+import vn.momo.kits.navigation.IsBaselineViewEnabled
 
 @Composable
 fun Text(
@@ -72,7 +71,7 @@ fun Text(
     }
 
     // on/off baseline config value, default will be false
-    val isBaselineViewEnabled = true
+    val isBaselineViewEnabled = IsBaselineViewEnabled.current
 
     androidx.compose.material3.Text(
         modifier = modifier.conditional(isBaselineViewEnabled){

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): Float {
-    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
+fun scaleSize(size: Float, scaleRate: Float? = null): Float {
+    val scaleSizeMaxRate: Float = scaleRate ?: ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
     val deviceWidth = getScreenDimensions().width
     val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
 

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

@@ -72,6 +72,7 @@ fun NavigationContainer(
     }
 
     val startDestination = DynamicScreenRegistry.register(initialScreen, options)
+    val isBaselineEnabled = applicationContext?.isBaselineEnabled ?: false
 
     CompositionLocalProvider(
         LocalNavigator provides navigator,
@@ -82,7 +83,8 @@ fun NavigationContainer(
         AppNavigationBar provides navigationBarHeight,
         ApplicationContext provides applicationContext,
         AppConfig provides config,
-        AppLanguage provides language
+        AppLanguage provides language,
+        IsBaselineViewEnabled provides isBaselineEnabled
     ) {
         LaunchedEffect(Unit) {
             setNavigator?.invoke(navigator)
@@ -157,3 +159,5 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
+
+val IsBaselineViewEnabled  = staticCompositionLocalOf<Boolean> { false }

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
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.154.1-beta.3",
+  "version": "0.154.1-beta.5",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"