@momo-kits/native-kits 0.162.1-beta.1-debug → 0.162.1-beta.12-debug

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

@@ -18,8 +18,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
+import vn.momo.kits.application.LocalLocalize
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
@@ -68,9 +67,8 @@ fun TrustBanner(
     onPress: ((Map<String, String>) -> Unit)? = null,
     trackEvent: ((String, Map<String, String>) -> Unit)? = null
 ) {
-    val appConfig = AppConfig.current
-    val language = AppLanguage.current ?: "vi"
-    val trustBanner = appConfig?.trustBanner ?: defaultBanner
+    val localize = LocalLocalize.current
+    val trustBanner = defaultBanner
     val trackParams = mapOf(
         "service_name" to serviceName,
         "screen_name" to screenName,
@@ -124,7 +122,7 @@ fun TrustBanner(
                 .padding(start = 10.dp)
         ) {
             Text(
-                text = trustBanner.content[language] ?: "",
+                text = localize.translateData(trustBanner.content),
                 modifier = Modifier.padding(bottom = 8.dp),
                 color = Color(contentColor),
                 style = Typography.descriptionDefaultRegular,
@@ -138,7 +136,7 @@ fun TrustBanner(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
-                        text = trustBanner.subContent[language] ?: "",
+                        text = localize.translateData(trustBanner.subContent),
                         color = Color(subContentColor),
                         style = Typography.actionXsBold,
                         maxLines = 2

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.ScaleSizeMaxRate
+import vn.momo.kits.application.LocalFontScaleConfig
 import vn.momo.kits.platform.getScreenDimensions
 import vn.momo.uikits.resources.*
 import kotlin.math.max
@@ -22,59 +22,58 @@ 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
-    val deviceWidth = getScreenDimensions().width
-    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+fun scaleSize(size: Float, userScaleRate: Float? = null): Float {
+    val fontScaleConfig = LocalFontScaleConfig.current
+    val useOSFontScale = fontScaleConfig.useOSFontScale
+    val customRate = userScaleRate ?: fontScaleConfig.userScaleRate ?: 1f
 
-    val density = LocalDensity.current
-    val fontScale = density.fontScale
+    val deviceScale = getScreenDimensions().width / DEFAULT_SCREEN_SIZE
+    val fontScale = fontScaleConfig.osFontScale ?: LocalDensity.current.fontScale
+
+    if (!useOSFontScale) {
+        return if (customRate > 1f) customRate * size else size
+    }
 
     var fontSizeScaleDevice = size
     var fontSizeScaleOS = size
-
     if (deviceScale > 1) {
         fontSizeScaleDevice =
             min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
-
-    if (fontScale > 1) {
-        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
+    if (fontScale > 1f) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
     }
 
-    return max(
-        fontSizeScaleDevice,
-        fontSizeScaleOS
-    )
+    return max(fontSizeScaleDevice, fontSizeScaleOS)
 }
 
 @Composable
-fun scaleSize(size: TextUnit): TextUnit {
+fun scaleSize(size: TextUnit, userScaleRate: Float? = null): TextUnit {
     if (!size.isSp) return size
 
     val density = LocalDensity.current
 
-    val scaled = scaleSize(size.value)
+    val scaled = scaleSize(size.value, userScaleRate)
     val spValue = scaled / density.fontScale
 
     return TextUnit(value = spValue, type = TextUnitType.Sp)
 }
 
 @Composable
-fun scaleSize(size: Dp): Dp {
-    return scaleSize(size.value).dp
+fun scaleSize(size: Dp, userScaleRate: Float? = null): Dp {
+    return scaleSize(size.value, userScaleRate).dp
 }
 
 @Composable
-fun scaleSize(textStyle: TextStyle): TextStyle {
+fun scaleSize(textStyle: TextStyle, userScaleRate: Float? = null): TextStyle {
     return textStyle.copy(
         fontSize = if (textStyle.fontSize != TextUnit.Unspecified)
-            scaleSize(textStyle.fontSize)
+            scaleSize(textStyle.fontSize, userScaleRate)
         else
             TextUnit.Unspecified,
 
         lineHeight = if (textStyle.lineHeight != TextUnit.Unspecified)
-            scaleSize(textStyle.lineHeight)
+            scaleSize(textStyle.lineHeight, userScaleRate)
         else
             TextUnit.Unspecified,
     )

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

@@ -0,0 +1,104 @@
+package vn.momo.kits.modifier
+
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.clipRect
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.drawText
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.rememberTextMeasurer
+import androidx.compose.ui.unit.sp
+import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.const.Colors
+
+@Suppress("ExperimentalAnnotationRetention")
+@RequiresOptIn(
+    message = "This is internal API of native-kits, become internal in next sprint",
+    level = RequiresOptIn.Level.WARNING,
+)
+@Retention(AnnotationRetention.BINARY)
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY,
+)
+annotation class InternalApi
+
+@Composable
+fun DeprecatedModifier(text: String = "Deprecated component"): Modifier = debugMarker(
+    label = text,
+    background = Colors.red_04.copy(alpha = 0.7f),
+    textColor = Colors.red_01,
+    animationLabel = "deprecatedMarquee",
+)
+
+@Composable
+private fun debugMarker(
+    label: String,
+    background: Color,
+    textColor: Color,
+    animationLabel: String,
+): Modifier {
+    if (!IsShowBaseLineDebug) return Modifier
+
+    val textMeasurer = rememberTextMeasurer()
+    val marquee = rememberInfiniteTransition(label = animationLabel)
+    val progress by marquee.animateFloat(
+        initialValue = 0f,
+        targetValue = 1f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 4000, easing = LinearEasing),
+            repeatMode = RepeatMode.Restart,
+        ),
+        label = "${animationLabel}Progress",
+    )
+
+    return Modifier.drawWithContent {
+        drawContent()
+        drawRect(color = background)
+
+        if (size.width <= 0f || size.height <= 0f) return@drawWithContent
+
+        val fontPx = (size.width * 0.1f).coerceIn(12.sp.toPx(), 20.sp.toPx())
+        val style = TextStyle(
+            color = textColor,
+            fontSize = fontPx.toSp(),
+            fontWeight = FontWeight.Bold,
+        )
+
+        val intrinsic = textMeasurer.measure(
+            text = label,
+            style = style,
+            maxLines = 1,
+            softWrap = false,
+        )
+        val textW = intrinsic.size.width
+        val textH = intrinsic.size.height
+        val y = (size.height - textH) / 2f
+
+        if (textW <= size.width) {
+            drawText(
+                textLayoutResult = intrinsic,
+                topLeft = Offset((size.width - textW) / 2f, y),
+            )
+        } else {
+            clipRect(right = size.width, bottom = size.height) {
+                val gap = textW * 0.5f
+                val travel = textW + gap
+                val x = -progress * travel
+                drawText(textLayoutResult = intrinsic, topLeft = Offset(x, y))
+                drawText(textLayoutResult = intrinsic, topLeft = Offset(x + travel, y))
+            }
+        }
+    }
+}

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

@@ -41,7 +41,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Typography
 import vn.momo.kits.navigation.tracking.ScreenTracker
@@ -73,7 +73,7 @@ internal fun BottomSheet(
     val coroutineScope = rememberCoroutineScope()
 
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     DisposableEffect(Unit) {
         ScreenTracker.trackPopupDisplayed(

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

@@ -18,7 +18,7 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.modifier.conditional
@@ -40,7 +40,7 @@ internal fun ModalScreen(
     val coroutineScope = rememberCoroutineScope()
 
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     DisposableEffect(Unit) {
         ScreenTracker.trackPopupDisplayed(

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

@@ -9,7 +9,8 @@ import vn.momo.kits.navigation.component.*
 class Navigation(
     val id: Int = -1,
     val bottomTabIndex: Int = -1,
-    val initOptions: NavigationOptions? = null
+    val initOptions: NavigationOptions? = null,
+    private val registry: DynamicScreenRegistry? = null
 ) {
     private val _options = mutableStateOf(initOptions ?: NavigationOptions())
     val currentOptions: State<NavigationOptions> get() = _options
@@ -56,7 +57,7 @@ class Navigation(
     private fun updateOptions(updated: NavigationOptions) {
         _options.value = updated
         if (bottomTabIndex != -1) setBottomTabOption(bottomTabIndex, updated)
-        if (id != -1) DynamicScreenRegistry.setOptions(id, updated)
+        if (id != -1) registry?.setOptions(id, updated)
     }
 }
 

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

@@ -22,50 +22,57 @@ fun NavigationContainer(
     initialScreen: @Composable () -> Unit,
     options: NavigationOptions? = null,
     initialTheme: Theme = defaultTheme,
-    applicationContext: MiniAppContext? = null,
-    maxApi: IMaxApi? = null,
+    miniAppContext: MiniAppContext? = null,
+    maxApi: IMaxApi?,
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
-    config: KitConfig? = null,
-    language: String? = null
+    localize: Localize? = null,
 ){
     val navController = rememberNavController()
-    val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
+    val registry = remember { DynamicScreenRegistry() }
+    val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
 
-    val parentContext = ApplicationContext.current
-    val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
+    val parentContext = LocalContext.current
+    val mergedContext = MiniAppContext.merge(parentContext, miniAppContext)
 
     val theme = remember { mutableStateOf(initialTheme) }
+    val fallbackLocalize = remember { Localize() }
 
-    LaunchedEffect(Unit) {
-        val headerBar = config?.headerBar
-        if (headerBar != null && theme.value.assets.headerBackground == null) {
-            theme.value = theme.value.copy(
-                assets = ThemeAssets(
-                    headerBackground = headerBar
-                )
-            )
+    val resolvedLocalize = localize ?: fallbackLocalize
+
+    var observerFontScaleConfig by remember { mutableStateOf(mergedContext?.fontScaleConfig) }
+    LaunchedEffect(maxApi, resolvedLocalize) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) {
+                    resolvedLocalize.changeLanguage(Localize.EN)
+                }
+            })
+            api.observer(FONT_SCALE_OBSERVER_KEY).collect { data ->
+                observerFontScaleConfig = parseFontScaleConfig(data)
+            }
         }
     }
 
-    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
-    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
+    val screenId = rememberSaveable { registry.nextId() }
+    registry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
+            LocalDynamicScreenRegistry provides registry,
             LocalMaxApi provides maxApi,
             AppTheme provides theme.value,
             AppStatusBar provides statusBarHeight,
             AppNavigationBar provides navigationBarHeight,
-            ApplicationContext provides mergedContext,
-            AppConfig provides config,
-            AppLanguage provides language,
-            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
-        ) {
+            LocalContext provides mergedContext,
+            LocalLocalize provides resolvedLocalize,
+            LocalFontScaleConfig provides (observerFontScaleConfig ?: LocalFontScaleConfig.current),
+            ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
             }
@@ -88,7 +95,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -117,7 +124,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -135,7 +142,7 @@ fun NavigationContainer(
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
+            registry.unregisterScreen(screenId)
         }
     }
 }
@@ -143,3 +150,37 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
+
+private const val FONT_SCALE_OBSERVER_KEY = "font_scale_config"
+
+private fun parseLanguage(raw: Map<String, Any?>?): String? {
+    val code = (raw?.get("response") as? String)?.trim()?.lowercase()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}
+
+private fun parseFontScaleConfig(raw: Map<String, Any?>?): FontScaleConfig? {
+    if (raw.isNullOrEmpty()) return null
+    @Suppress("UNCHECKED_CAST")
+    val data = (raw["response"] as? Map<String, Any?>)
+        ?: (raw["data"] as? Map<String, Any?>)
+        ?: raw
+    if (!data.containsKey("useOSFontScale") && !data.containsKey("userScaleRate")) return null
+    val useOS = when (val v = data["useOSFontScale"]) {
+        is Boolean -> v
+        is String -> v.equals("true", ignoreCase = true)
+        is Number -> v.toInt() != 0
+        else -> true
+    }
+    val rate = when (val v = data["userScaleRate"]) {
+        is Number -> v.toFloat()
+        is String -> v.toFloatOrNull()
+        else -> null
+    }
+    val osScale = when (val v = data["osFontScale"]) {
+        is Number -> v.toFloat()
+        is String -> v.toFloatOrNull()
+        else -> null
+    }
+    return FontScaleConfig(useOSFontScale = useOS, userScaleRate = rate, osFontScale = osScale)
+}

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
+import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -25,27 +26,34 @@ import kotlin.time.Duration.Companion.milliseconds
 
 class Navigator(
     private val navController: NavController,
-    private val maxApi: IMaxApi?
+    private val maxApi: IMaxApi?,
+    private val registry: DynamicScreenRegistry
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
+    private fun currentScreen(): DynamicScreen? {
+        val entry = navController.currentBackStackEntry ?: return null
+        val id = runCatching { entry.toRoute<DynamicScreenRoute>().id }.getOrNull()
+            ?: runCatching { entry.toRoute<DynamicDialogRoute>().id }.getOrNull()
+            ?: return null
+        return registry.getScreen(id)
+    }
+
     fun push(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicScreenRoute(route.id))
     }
 
     fun replace(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        if (navController.previousBackStackEntry != null){
-            val latestScreen = DynamicScreenRegistry.getLatestScreen()
-            latestScreen?.let { DynamicScreenRegistry.unregisterScreen(it.id) }
-            navController.popBackStack()
-            push(screenName, content, options)
-        }
+        val replacedScreen = currentScreen()
+        replacedScreen?.let { registry.unregisterScreen(it.id) }
+        navController.popBackStack()
+        push(screenName, content, options)
     }
 
     fun onBackSafe(callBack: (() -> Unit)? = null) {
-        val latestScreen = DynamicScreenRegistry.getLatestScreen()
-        val options = latestScreen?.options
+        val currentScreen = currentScreen()
+        val options = currentScreen?.options
         if (options?.onBackHandler != null) {
             options.onBackHandler.invoke()
             return
@@ -94,25 +102,24 @@ class Navigator(
 
     private suspend fun dismissScreen() {
         if (navController.previousBackStackEntry != null){
+            val dismissing = currentScreen()
             navController.popBackStack()
             delay(300L.milliseconds)
-            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                DynamicScreenRegistry.unregisterScreen(it1.id)
-            }
+            dismissing?.let { registry.unregisterScreen(it.id) }
         } else {
             maxApi?.dismiss {  }
         }
     }
 
     fun present(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicDialogRoute(route.id))
     }
 
     fun reset(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        DynamicScreenRegistry.unregisterAll()
+        registry.unregisterAll()
 
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicScreenRoute(route.id)) {
             popUpTo(0) { inclusive = true }
         }
@@ -123,7 +130,7 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
@@ -134,12 +141,12 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
     }
 
     fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         scope.launch {
             OverplayComponentRegistry.registerOverplay(
                 id = id,
@@ -182,12 +189,11 @@ data class DynamicScreen(
     var options: NavigationOptions? = null
 )
 
-object DynamicScreenRegistry {
+class DynamicScreenRegistry {
     private val screens = mutableMapOf<Int, DynamicScreen>()
-    private var idCounter = 1
 
     fun register(screenName: String, content: @Composable () -> Unit, options: NavigationOptions?): DynamicScreenRoute {
-        val id = idCounter++
+        val id = nextGlobalId()
         screens[id] = DynamicScreen(
             id = id,
             name = screenName,
@@ -197,7 +203,7 @@ object DynamicScreenRegistry {
         return DynamicScreenRoute(id)
     }
 
-    fun nextId(): Int = idCounter++
+    fun nextId(): Int = nextGlobalId()
 
     fun bind(id: Int, screenName: String, content: @Composable () -> Unit, options: NavigationOptions?) {
         screens[id] = DynamicScreen(
@@ -206,17 +212,13 @@ object DynamicScreenRegistry {
             content = content,
             options = options
         )
-        if (id >= idCounter) idCounter = id + 1 // keep counter ahead after process-death restore
+        advanceGlobalIdPast(id) // keep counter ahead after process-death restore
     }
 
     fun unregisterScreen(id: Int) {
         screens.remove(id)
     }
 
-    fun getLatestScreen(): DynamicScreen?{
-        return screens.entries.lastOrNull()?.value
-    }
-
     fun unregisterAll(){
         val ids = screens.keys.toList()
         for (id in ids) {
@@ -229,8 +231,20 @@ object DynamicScreenRegistry {
     fun setOptions(id: Int, options: NavigationOptions){
         screens[id]?.options = options
     }
+
+    companion object {
+        private var globalIdCounter = 1
+
+        private fun nextGlobalId(): Int = globalIdCounter++
+
+        private fun advanceGlobalIdPast(id: Int) {
+            if (id >= globalIdCounter) globalIdCounter = id + 1
+        }
+    }
 }
 
+val LocalDynamicScreenRegistry = staticCompositionLocalOf<DynamicScreenRegistry?> { null }
+
 
 sealed class OverplayComponentParams {
     class Modal(

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

@@ -69,7 +69,7 @@ import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime
@@ -89,10 +89,11 @@ internal fun StackScreen(
 ) {
     val navigator = LocalNavigator.current
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
     val statusBar = AppStatusBar.current
     val density = LocalDensity.current
-    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions) }
+    val screenRegistry = LocalDynamicScreenRegistry.current
+    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions, registry = screenRegistry) }
 
     val options by navigation.currentOptions