@momo-kits/native-kits 0.162.2-beta.26-debug → 0.162.2-beta.27-debug

package/CLAUDE.md

@@ -40,7 +40,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 ## Architecture essentials
 
 - **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. **Do not use** `ApplicationContainer` (`application/NavigationContainer.kt`) — deprecated and does **not** wire `LocalLocalize` / `LocalNavigator` / `LocalMaxApi`.
-- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
+- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize`, `ScaleSizeMaxRate` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
 - **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
 - **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.

package/compose/build.gradle.kts

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

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.2-beta.26-debug'
+    spec.version                  = '0.162.2-beta.19'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -29,8 +29,6 @@ data class MiniAppContext(
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
     val scaleSizeMaxRate: Float? = null,
-    val userScaleRate: Float? = null,
-    val useOSScaleRate: Boolean? = null,
 ) {
     companion object {
 
@@ -63,8 +61,6 @@ data class MiniAppContext(
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
                 scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
-                userScaleRate = parent.userScaleRate ?: child.userScaleRate,
-                useOSScaleRate = parent.useOSScaleRate ?: child.useOSScaleRate,
             )
         }
 
@@ -102,5 +98,4 @@ val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?>
     null
 }
 
-@Deprecated("Max font scale is fixed at MAX_FONT_SCALE (1.5); this CompositionLocal is no longer read.")
 val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }

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

@@ -139,7 +139,7 @@ private fun ToolkitHeaderRight(
     }
 
     fun onPressClose() {
-        api?.request("dismissAll", "")
+        api?.request("dismissAll", "", { _ -> })
     }
 
     fun onPressMore() {

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

@@ -7,7 +7,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import vn.momo.kits.const.*
 import vn.momo.kits.modifier.DeprecatedModifier
-import vn.momo.kits.platform.ProvideOsFontScale
 import vn.momo.kits.platform.getStatusBarHeight
 
 @Deprecated("Use IMaxApi instead", ReplaceWith("IMaxApi"))
@@ -94,7 +93,6 @@ fun ApplicationContainer(
 
     val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
 
-    ProvideOsFontScale {
     CompositionLocalProvider(
         AppTheme provides appTheme,
         PlatformApi provides composeApi,
@@ -105,6 +103,5 @@ fun ApplicationContainer(
             content()
         }
     }
-    }
 
 }

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

@@ -5,7 +5,6 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -13,7 +12,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.graphics.Shape
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
@@ -23,58 +21,69 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.modifier.conditional
 
 data class IconSpecs(
-    val box: Dp,
-    val icon: Dp,
+    val width: Dp,
+    val height: Dp,
+    val radius: Dp,
+    val size: Dp
 )
 
 enum class IconSize(val value: IconSpecs) {
-    LARGE(IconSpecs(box = 48.dp, icon = 24.dp)),
-    MEDIUM(IconSpecs(box = 36.dp, icon = 16.dp)),
-    SMALL(IconSpecs(box = 28.dp, icon = 16.dp)),
-}
-
-enum class IconShape {
-    CIRCLE,
-    SQUARE,
+    LARGE(
+        IconSpecs(
+            height = 48.dp,
+            radius = Radius.XL,
+            width = 48.dp,
+            size = 48.dp
+        )
+    ),
+    SMALL(
+        IconSpecs(
+            height = 40.dp,
+            radius = Radius.XL,
+            width = 40.dp,
+            size = 40.dp
+        )
+    )
 }
 
-// Square keeps an 8dp rounded corner; circle is fully rounded regardless of size.
-private val squareShape = RoundedCornerShape(Radius.S)
+// Pre-computed shape to avoid repeated creation
+private val iconButtonShape = RoundedCornerShape(Radius.XL)
 
-private fun IconShape.toShape(): Shape = when (this) {
-    IconShape.CIRCLE -> CircleShape
-    IconShape.SQUARE -> squareShape
-}
+// Cache for icon sizes to avoid repeated calculations
+private val iconSizeMap = mapOf(
+    IconSize.SMALL to 16.dp,
+    IconSize.LARGE to 24.dp
+)
 
 @Composable
-internal fun getIconStyle(type: ButtonType, shape: Shape, color: Color? = null): Modifier {
+internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
     val theme = AppTheme.current
 
-    return remember(type, shape, color, theme) {
+    return remember(type, color, theme) {
         when (type) {
             ButtonType.DISABLED -> Modifier
-                .background(theme.colors.background.disable, shape)
-                .border(0.dp, Color.Unspecified, shape)
+                .background(theme.colors.background.disable, iconButtonShape)
+                .border(0.dp, Color.Unspecified, iconButtonShape)
 
             ButtonType.PRIMARY -> Modifier
-                .background(theme.colors.primary, shape)
-                .border(0.dp, Color.Unspecified, shape)
+                .background(theme.colors.primary, iconButtonShape)
+                .border(0.dp, Color.Unspecified, iconButtonShape)
 
             ButtonType.SECONDARY -> Modifier
-                .background(theme.colors.background.surface, shape)
-                .border(1.dp, theme.colors.border.default, shape)
+                .background(theme.colors.background.surface, iconButtonShape)
+                .border(1.dp, theme.colors.border.default, iconButtonShape)
 
             ButtonType.OUTLINE -> Modifier
-                .background(theme.colors.background.surface, shape)
-                .border(1.dp, color ?: theme.colors.primary, shape)
+                .background(theme.colors.background.surface, iconButtonShape)
+                .border(1.dp, color ?: theme.colors.primary, iconButtonShape)
 
             ButtonType.TONAL -> Modifier
-                .background(theme.colors.background.tonal, shape)
-                .border(0.dp, Color.Unspecified, shape)
+                .background(theme.colors.background.tonal, iconButtonShape)
+                .border(0.dp, Color.Unspecified, iconButtonShape)
 
             ButtonType.DANGER -> Modifier
-                .background(theme.colors.error.primary, shape)
-                .border(0.dp, Color.Unspecified, shape)
+                .background(theme.colors.error.primary, iconButtonShape)
+                .border(0.dp, Color.Unspecified, iconButtonShape)
 
             ButtonType.TEXT -> Modifier
         }
@@ -94,32 +103,38 @@ fun IconButton(
     onClick: () -> Unit,
     type: ButtonType = ButtonType.PRIMARY,
     size: IconSize = IconSize.SMALL,
-    shape: IconShape = IconShape.CIRCLE,
     icon: String = "",
 ) {
-    val specs = size.value
+    // Memoize icon size calculation
+    val iconSize = remember(size) {
+        iconSizeMap[size] ?: 16.dp
+    }
 
+    // Memoize enabled state
     val isEnabled = remember(type) {
         type != ButtonType.DISABLED
     }
 
-    val boxShape = remember(shape) { shape.toShape() }
+    // Memoize radius for clipping
+    val radius = remember(size) {
+        size.value.radius
+    }
 
     Box(
         modifier = Modifier
-            .size(specs.box)
-            .then(getIconStyle(type, boxShape))
+            .size(size.value.size)
+            .then(getIconStyle(type))
             .conditional(IsShowBaseLineDebug) {
                 border(1.dp, Colors.blue_03)
             }
-            .clip(boxShape)
+            .clip(RoundedCornerShape(radius))
             .clickable(enabled = isEnabled, onClick = onClick),
         contentAlignment = Alignment.Center
     ) {
         Icon(
             source = icon,
             color = getIconColor(type),
-            size = specs.icon,
+            size = iconSize,
         )
     }
-}
+}

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

@@ -4,10 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import vn.momo.kits.application.ScaleSizeMaxRate
 
-@Deprecated(
-    "Max font scale is fixed at MAX_FONT_SCALE (1.5); this override is no longer applied. Remove the wrapper.",
-    ReplaceWith("content()"),
-)
 @Composable
 fun ScaleSizeScope(
     scaleSizeMaxRate: Float? = null,

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

@@ -11,7 +11,7 @@ import androidx.compose.ui.unit.*
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.application.LocalContext
+import vn.momo.kits.application.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.*
 import kotlin.math.max
@@ -23,13 +23,7 @@ const val MAX_DEVICE_SCALE = 5
 
 @Composable
 fun scaleSize(size: Float): Float {
-    val context = LocalContext.current
-    // Host-pushed context wins; otherwise fall back to the app-wide KitFontScale holder.
-    val useOsScale = context?.useOSScaleRate ?: KitFontScale.useOSScaleRate
-    if (!useOsScale) {
-        return size * (context?.userScaleRate ?: KitFontScale.userScaleRate)
-    }
-    val scaleSizeMaxRate: Float = MAX_FONT_SCALE
+    val scaleSizeMaxRate: Float = 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

@@ -1,35 +1,17 @@
 package vn.momo.kits.navigation
 
+import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import vn.momo.kits.application.LocalContext
-import vn.momo.kits.application.LocalLocalize
-import vn.momo.kits.application.Localize
-import vn.momo.kits.application.MiniAppContext
-import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.AppStatusBar
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Theme
-import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.application.*
+import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
-import vn.momo.kits.platform.ProvideOsFontScale
 import vn.momo.kits.utils.getAppStatusBarHeight
 import vn.momo.kits.utils.getNavigationBarHeight
 import vn.momo.maxapi.IMaxApi
@@ -45,7 +27,7 @@ fun NavigationContainer(
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
     localize: Localize? = null,
-) {
+){
     val navController = rememberNavController()
     val registry = remember { DynamicScreenRegistry() }
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
@@ -75,79 +57,77 @@ fun NavigationContainer(
     registry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
-    ProvideOsFontScale {
-        ProvideNavigationEventDispatcherOwner {
-            CompositionLocalProvider(
-                LocalNavigator provides navigator,
-                LocalDynamicScreenRegistry provides registry,
-                LocalMaxApi provides maxApi,
-                AppTheme provides theme.value,
-                AppStatusBar provides statusBarHeight,
-                AppNavigationBar provides navigationBarHeight,
-                LocalContext provides mergedContext,
-                LocalLocalize provides resolvedLocalize,
+    ProvideNavigationEventDispatcherOwner {
+        CompositionLocalProvider(
+            LocalNavigator provides navigator,
+            LocalDynamicScreenRegistry provides registry,
+            LocalMaxApi provides maxApi,
+            AppTheme provides theme.value,
+            AppStatusBar provides statusBarHeight,
+            AppNavigationBar provides navigationBarHeight,
+            LocalContext provides mergedContext,
+            LocalLocalize provides resolvedLocalize,
             ) {
-                LaunchedEffect(Unit) {
-                    setNavigator?.invoke(navigator)
-                }
+            LaunchedEffect(Unit) {
+                setNavigator?.invoke(navigator)
+            }
 
-                NavHost(navController, startDestination = startDestination) {
-                    composable<DynamicScreenRoute>(
-                        enterTransition = {
-                            slideInHorizontally(
-                                animationSpec = tween(300),
-                                initialOffsetX = { it }
-                            )
-                        },
-                        exitTransition = null,
-                        popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                        popExitTransition = {
-                            slideOutHorizontally(
-                                animationSpec = tween(300),
-                                targetOffsetX = { it }
-                            )
-                        }
-                    ) { backStackEntry ->
-                        val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                        val screen = registry.getScreen(route.id)
-
-                        if (screen != null) {
-                            StackScreen(
-                                id = route.id,
-                                name = screen.name,
-                                content = screen.content,
-                                navigationOptions = screen.options
-                            )
-                        }
+            NavHost(navController, startDestination = startDestination) {
+                composable<DynamicScreenRoute>(
+                    enterTransition = {
+                        slideInHorizontally(
+                            animationSpec = tween(300),
+                            initialOffsetX = { it }
+                        )
+                    },
+                    exitTransition = null,
+                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                    popExitTransition = {
+                        slideOutHorizontally(
+                            animationSpec = tween(300),
+                            targetOffsetX = { it }
+                        )
+                    }
+                ) { backStackEntry ->
+                    val route = backStackEntry.toRoute<DynamicScreenRoute>()
+                    val screen = registry.getScreen(route.id)
+
+                    if (screen != null) {
+                        StackScreen(
+                            id = route.id,
+                            name = screen.name,
+                            content = screen.content,
+                            navigationOptions = screen.options
+                        )
                     }
+                }
 
-                    composable<DynamicDialogRoute>(
-                        enterTransition = {
-                            slideInVertically(
-                                animationSpec = tween(300),
-                                initialOffsetY = { it }
-                            )
-                        },
-                        exitTransition = null,
-                        popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                        popExitTransition = {
-                            slideOutVertically(
-                                animationSpec = tween(300),
-                                targetOffsetY = { it }
-                            )
-                        }
-                    ) { backStackEntry ->
-                        val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                        val screen = registry.getScreen(route.id)
-
-                        if (screen != null) {
-                            StackScreen(
-                                id = route.id,
-                                name = screen.name,
-                                content = screen.content,
-                                navigationOptions = screen.options
-                            )
-                        }
+                composable<DynamicDialogRoute>(
+                    enterTransition = {
+                        slideInVertically(
+                            animationSpec = tween(300),
+                            initialOffsetY = { it }
+                        )
+                    },
+                    exitTransition = null,
+                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                    popExitTransition = {
+                        slideOutVertically(
+                            animationSpec = tween(300),
+                            targetOffsetY = { it }
+                        )
+                    }
+                ) { backStackEntry ->
+                    val route = backStackEntry.toRoute<DynamicDialogRoute>()
+                    val screen = registry.getScreen(route.id)
+
+                    if (screen != null) {
+                        StackScreen(
+                            id = route.id,
+                            name = screen.name,
+                            content = screen.content,
+                            navigationOptions = screen.options
+                        )
                     }
                 }
             }
@@ -162,7 +142,9 @@ fun NavigationContainer(
     }
 }
 
-val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> { null }
+val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
+    error("No MaxApi provided")
+}
 
 private fun parseLanguage(raw: Map<String, Any?>?): String? {
     val code = (raw?.get("response") as? String)?.trim()?.lowercase()

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -48,14 +48,3 @@ public class ApplicationEnvironment: ObservableObject {
         self.config = config
     }
 }
-
-private struct ApplicationEnvironmentKey: EnvironmentKey {
-    static let defaultValue = ApplicationEnvironment()
-}
-
-public extension EnvironmentValues {
-    var applicationEnvironment: ApplicationEnvironment {
-        get { self[ApplicationEnvironmentKey.self] }
-        set { self[ApplicationEnvironmentKey.self] = newValue }
-    }
-}