@momo-kits/native-kits 0.162.2-sp.7-debug → 0.162.2-sp.8-debug

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

@@ -1,14 +1,104 @@
 package vn.momo.kits.modifier
 
-import androidx.compose.foundation.background
+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
-fun DeprecatedModifier(): Modifier {
-    return Modifier.conditional(IsShowBaseLineDebug) {
-        background(Colors.red_01.copy(alpha = 0.5f))
+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/modifier/Shadow.kt

@@ -9,8 +9,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.platform.setColor
 import vn.momo.kits.platform.setMaskFilter
-
-
 fun Modifier.shadow(
     color: Color = Color.Black,
     borderRadius: Dp = 0.dp,

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

@@ -10,11 +10,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -22,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
@@ -44,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

@@ -1,29 +1,25 @@
 package vn.momo.kits.navigation
 
 import androidx.compose.foundation.gestures.ScrollableState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
 import vn.momo.kits.navigation.bottomtab.setBottomTabOption
-import vn.momo.kits.navigation.component.FloatingButtonProps
-import vn.momo.kits.navigation.component.HeaderBackProps
-import vn.momo.kits.navigation.component.HeaderRight
-import vn.momo.kits.navigation.component.HeaderTitle
-import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.navigation.component.TitlePosition
+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
     val options: NavigationOptions get() = _options.value
 
+    private val _isBottomTabRoot = mutableStateOf(false)
+    internal val isBottomTabRoot: Boolean get() = _isBottomTabRoot.value
+    internal fun markAsBottomTabRoot() { _isBottomTabRoot.value = true }
+
     fun setOptions(
         onBackHandler: (() -> Unit)? = null,
         hiddenBack: Boolean? = null,
@@ -65,7 +61,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)
     }
 }
 
@@ -95,8 +91,6 @@ data class KeyboardOptions(
     val keyboardShouldPersistTaps: Boolean = false,
     val useAvoidKeyboard: Boolean = true
 )
-
-
 data class ScrollData(
     val scrollable: Boolean = true,
     val scrollState: ScrollableState? = null,

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

@@ -12,6 +12,7 @@ import androidx.navigation.toRoute
 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
@@ -22,50 +23,53 @@ fun NavigationContainer(
     initialScreen: @Composable () -> Unit,
     options: NavigationOptions? = null,
     initialTheme: Theme = defaultTheme,
-    applicationContext: MiniAppContext? = null,
+    miniAppContext: MiniAppContext? = null,
     maxApi: IMaxApi? = null,
     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
+
+    LaunchedEffect(maxApi, resolvedLocalize) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) {
+                    resolvedLocalize.changeLanguage(Localize.EN)
+                }
+            })
         }
     }
 
-    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) }
 
+    ProvideOsFontScale {
     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,
+            ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
             }
@@ -88,7 +92,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 +121,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(
@@ -131,11 +135,12 @@ fun NavigationContainer(
             }
         }
     }
+    }
 
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
+            registry.unregisterScreen(screenId)
         }
     }
 }
@@ -143,3 +148,10 @@ fun NavigationContainer(
 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()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}
+

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
@@ -21,30 +22,38 @@ import vn.momo.kits.components.PopupNotify
 import vn.momo.kits.navigation.BottomHeader.*
 import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
+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
@@ -87,31 +96,30 @@ class Navigator(
     }
     private suspend fun dismissOverplay(isDelay: Boolean = true) {
         OverplayComponentRegistry.clear()
-        if (isDelay) delay(300L)
+        if (isDelay) delay(300L.milliseconds)
         OverplayComponentRegistry.hardClearAfterDismiss()
     }
 
     private suspend fun dismissScreen() {
         if (navController.previousBackStackEntry != null){
+            val dismissing = currentScreen()
             navController.popBackStack()
-            delay(300L)
-            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                DynamicScreenRegistry.unregisterScreen(it1.id)
-            }
+            delay(300L.milliseconds)
+            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 }
         }
@@ -122,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)
     }
 
@@ -133,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,
@@ -154,7 +162,7 @@ class Navigator(
     fun hideSnackBar() {
         scope.launch {
             OverplayComponentRegistry.clear()
-            delay(250L)
+            delay(250L.milliseconds)
             OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
@@ -181,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,
@@ -196,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(
@@ -205,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) {
@@ -228,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(
@@ -244,7 +259,7 @@ sealed class OverplayComponentParams {
         val bottomSheetHeader: BottomHeader? = null,
     ) : OverplayComponentParams()
 
-    class SnackBar() : OverplayComponentParams()
+    class SnackBar : OverplayComponentParams()
 }
 
 data class OverplayComponent(
@@ -308,7 +323,7 @@ object OverplayComponentRegistry {
     }
 
     @Composable
-    fun OverlayComponent(){
+    internal fun OverlayComponent(){
         val overplay = currentOverlayComponent.value ?: return
 
         when (val params = overplay.params) {