@momo-kits/native-kits 0.152.4-beta.7 → 0.152.4-maxapi

package/compose/MoMoComposeKits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'MoMoComposeKits'
-    spec.version                  = '0.152.4'
+    spec.version                  = '0.0.1'
     spec.homepage                 = 'MoMoComposeKits'
     spec.source                   = { :http=> ''}
     spec.authors                  = 'M_SERVICE'

package/compose/build.gradle.kts

@@ -76,7 +76,7 @@ kotlin {
                 implementation(libs.coil.multiplatform.network.ktor)
                 implementation(libs.jetbrains.serialization.json)
                 implementation(libs.kotlinx.datetime)
-                api(project(":NativeMaxApi"))
+                api(libs.native.max.api)
             }
         }
         val androidMain by getting {

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

@@ -1,8 +1,6 @@
 package vn.momo.kits.application
 
-import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -15,23 +13,14 @@ import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -41,24 +30,15 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
-import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.kits.platform.getAndroidBuildVersion
 import vn.momo.kits.utils.getAppStatusBarHeight
 
@@ -122,134 +102,97 @@ fun Screen(
                 animatedHeader?.composable?.invoke(scrollState.value)
             }
         }
-    val helper = remember { ScreenHelper() }
 
-    DisposableEffect(Unit) {
-        onDispose { helper.dispose() }
-    }
-
-    CompositionLocalProvider(
-        LocalScreenHelper provides helper
+    Box(
+        Modifier.fillMaxSize()
+            .background(backgroundColor ?: AppTheme.current.colors.background.default)
+            .conditional(useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+                imePadding()
+            }
     ) {
-        Box(
-            Modifier.fillMaxSize()
-                .background(backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(useAvoidKeyboard && getAndroidBuildVersion() > 29) {
-                    imePadding()
-                }
-        ) {
-            val footerHeightPx = remember { mutableStateOf(0) }
 
-            Box(Modifier.zIndex(1f)) {
-                if (animatedHeader === null) {
-                    HeaderBackground(
-                        headerType = headerType,
-                        scrollState = scrollState.value,
-                        headerTransparent = headerTransparent
-                    )
-                }
-            }
+        if (animatedHeader === null) {
+            HeaderBackground(
+                headerType = headerType,
+                scrollState = scrollState.value,
+                headerTransparent = headerTransparent
+            )
+        }
 
-            Box(Modifier.zIndex(5f)) {
-                Header(
-                    headerType = headerType,
-                    title = title,
-                    titlePosition = titlePosition,
-                    headerRight = headerRight,
-                    headerRightWidth = headerRightWidth,
-                    goBack = goBack,
-                    opacity = opacity,
-                    animatedHeader = animatedHeader,
-                    inputSearchProps = inputSearchProps,
-                    scrollState = scrollState.value,
-                    useAnimationSearch = useAnimationSearch,
-                    tintColor = tintColor
-                )
-            }
+        Header(
+            headerType = headerType,
+            title = title,
+            titlePosition = titlePosition,
+            headerRight = headerRight,
+            headerRightWidth = headerRightWidth,
+            goBack = goBack,
+            opacity = opacity,
+            animatedHeader = animatedHeader,
+            inputSearchProps = inputSearchProps,
+            scrollState = scrollState.value,
+            useAnimationSearch = useAnimationSearch,
+            tintColor = tintColor
+        )
+
+        Column(
+            modifier = Modifier.fillMaxSize()
+                .padding( top = when {
+                    animatedHeader != null -> 0.dp
+                    headerType == HeaderType.NONE -> 0.dp
+                    fullScreenContent -> 0.dp
+                    else -> statusBarHeight + HEADER_HEIGHT.dp
+                })
+                .pointerInput(Unit) {
+                    detectTapGestures(onTap = {
+                        keyboardController?.hide()
+                    })
+                }
+                .zIndex(1f),
+        ) {
 
-            Box(Modifier.zIndex(2f).fillMaxSize()){
-                Column(
-                    modifier = Modifier.fillMaxSize()
-                        .padding( top = when {
-                            animatedHeader != null -> 0.dp
-                            headerType == HeaderType.NONE -> 0.dp
-                            fullScreenContent -> 0.dp
-                            else -> statusBarHeight + HEADER_HEIGHT.dp
-                        })
-                        .pointerInput(Unit) {
-                            detectTapGestures(onTap = {
-                                keyboardController?.hide()
-                            })
+            Column(
+                modifier = Modifier
+                    .conditional(scrollable) { weight(1f) }
+                    .conditional(onContentLayout != null) {
+                        onGloballyPositioned(onContentLayout ?: {})
+                    }
+                    .conditional(scrollable) { verticalScroll(scrollState) },
+                verticalArrangement = verticalArrangement,
+                horizontalAlignment = horizontalAlignment
+            ) {
+                Box {
+                    if (animatedHeader !== null) headerAnimated()
+                    Column {
+                        if (animatedHeader !== null) {
+                            Spacer(modifier = Modifier.padding(top = statusBarHeight + HEADER_HEIGHT.dp + layoutOffset))
                         }
-                        .zIndex(1f),
-                ) {
 
-                    Column(
-                        modifier = Modifier
-                            .conditional(scrollable) { weight(1f) }
-                            .conditional(onContentLayout != null) {
-                                onGloballyPositioned(onContentLayout ?: {})
-                            }
-                            .conditional(scrollable) { verticalScroll(scrollState) },
-                        verticalArrangement = verticalArrangement,
-                        horizontalAlignment = horizontalAlignment
-                    ) {
-                        Box {
-                            if (animatedHeader !== null) headerAnimated()
-                            Column {
-                                if (animatedHeader !== null) {
-                                    Spacer(modifier = Modifier.padding(top = statusBarHeight + HEADER_HEIGHT.dp + layoutOffset))
-                                }
-
-                                if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
-                                    Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.S)))
-                                }
-                                content()
-                            }
+                        if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
+                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.S)))
                         }
-                    }
-
-                    footer?.let {
-                        val footerHeight = with(LocalDensity.current) { footerHeightPx.value.toDp() }
-                        Spacer(Modifier.height(footerHeight))
+                        content()
                     }
                 }
             }
 
-            Box(Modifier.zIndex(4f).align(Alignment.BottomCenter)) {
-                footer?.let {
-                    Footer(
-                        footer = footer,
-                        bottom = bottomPadding,
-                        onFooterMeasured = { footerHeightPx.value = it }
-                    )
-                }
-            }
-
-            Column (Modifier.zIndex(6f)) {
-                if (fabProps != null) {
-                    FloatingButton(
-                        scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
-                        onClick = fabProps.onClick,
-                        containerColor = AppTheme.current.colors.primary,
-                        bottom = fabProps.bottom
-                            ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
-                        icon = fabProps.icon,
-                        iconColor = fabProps.iconColor,
-                        text = fabProps.label,
-                        size = fabProps.size,
-                        position = fabProps.position ?: FABPosition.END,
-                    )
-                }
+            footer?.let {
+                Footer(footer, bottomPadding)
             }
+        }
 
-            Box(
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .zIndex(3f)
-            ) {
-                ScreenSnackBarHost(footerHeightPx.value)
-            }
+        if (fabProps != null) {
+            FloatingButton(
+                scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
+                onClick = fabProps.onClick,
+                containerColor = AppTheme.current.colors.primary,
+                bottom = fabProps.bottom
+                    ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
+                icon = fabProps.icon,
+                iconColor = fabProps.iconColor,
+                text = fabProps.label,
+                size = fabProps.size,
+                position = fabProps.position ?: FABPosition.END,
+            )
         }
     }
 }
@@ -263,11 +206,7 @@ internal fun isKeyboardVisible(): Boolean {
 }
 
 @Composable
-fun Footer(
-    footer: @Composable (() -> Unit)? = null,
-    bottom: Dp = 0.dp,
-    onFooterMeasured: ((Int) -> Unit)? = null
-) {
+fun Footer(footer: @Composable (() -> Unit)? = null, bottom: Dp = 0.dp) {
     Box(
         Modifier
             .shadow(
@@ -277,9 +216,6 @@ fun Footer(
                 offsetY = (-4).dp
             )
             .background(AppTheme.current.colors.background.surface)
-            .onGloballyPositioned {
-                onFooterMeasured?.invoke(it.size.height)
-            }
     ) {
         Box(
             Modifier.fillMaxWidth()
@@ -292,98 +228,6 @@ fun Footer(
 }
 
 
-class ScreenHelper {
-
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
-
-    internal var snackBarState by mutableStateOf<SnackBarData?>(null)
-
-    internal var requestHide by mutableStateOf(false)
-
-    fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
-        scope.launch {
-            requestHide = false
-            snackBarState = SnackBarData(snackBar, onDismiss)
-        }
-    }
-
-    fun hideSnackBar() {
-        scope.launch {
-            requestHide = true
-        }
-    }
-
-    internal fun removeSnackBarNow() {
-        snackBarState = null
-        requestHide = false
-    }
-
-    fun dispose() {
-        scope.cancel()
-    }
-}
-data class SnackBarData(
-    val type: SnackBar,
-    val onDismiss: (() -> Unit)?
-)
-
-val LocalScreenHelper = staticCompositionLocalOf<ScreenHelper> {
-    error("No Screen helper provided")
-}
-
-@Composable
-fun ScreenSnackBarHost(footerHeightPx: Int) {
-    val helper = LocalScreenHelper.current
-    val snackBarData = helper.snackBarState ?: return
-
-
-    val snackBarHeight = when (snackBarData.type) {
-        is SnackBar.Custom -> snackBarData.type.heightContent
-        is SnackBar.Toast -> 300f
-    }
-
-    val startPosition = if (footerHeightPx > 0) 0f else snackBarHeight
-    val targetPosition = if (footerHeightPx > 0) -footerHeightPx.toFloat() else -with(LocalDensity.current) { AppNavigationBar.current.toPx() }
-
-    val offsetY = remember { Animatable(startPosition) }
-
-    LaunchedEffect(snackBarData, footerHeightPx) {
-        offsetY.snapTo(startPosition)
-        offsetY.animateTo(targetPosition, tween(350))
-    }
-
-    LaunchedEffect(helper.requestHide) {
-        if (helper.requestHide) {
-            offsetY.animateTo(startPosition, tween(200))
-            helper.removeSnackBarNow()
-            snackBarData.onDismiss?.invoke()
-        }
-    }
-
-    LaunchedEffect(snackBarData.type.duration) {
-        val duration = snackBarData.type.duration
-        if (duration != null) {
-            delay(duration)
-            helper.hideSnackBar()
-        }
-    }
-
-    DisposableEffect(Unit) {
-        onDispose { snackBarData.onDismiss?.invoke() }
-    }
-
-    Box(
-        modifier = Modifier
-            .offset { IntOffset(0, offsetY.value.toInt()) }
-            .fillMaxWidth()
-    ) {
-        when (val type = snackBarData.type) {
-            is SnackBar.Custom -> type.content()
-            is SnackBar.Toast -> {}
-        }
-    }
-}
-
 
 
 

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

@@ -1,13 +1,9 @@
 package vn.momo.kits.navigation
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -16,8 +12,6 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import vn.momo.kits.navigation.BottomHeader.*
-import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
 
 class Navigator(
@@ -43,36 +37,25 @@ class Navigator(
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
         scope.launch {
             repeat(count) {
-                if (OverplayComponentRegistry.getOverplayType() == OverplayComponentType.SNACK_BAR){
-                    dismissScreen()
+                if (OverplayComponentRegistry.isOverplayShowing()){
+                    OverplayComponentRegistry.clear()
+                    delay(300L)
                     OverplayComponentRegistry.hardClearAfterDismiss()
-                }
-                else if (OverplayComponentRegistry.isOverplayShowing()){
-                    dismissOverplay()
                 } else {
-                    dismissScreen()
+                    if (navController.previousBackStackEntry != null){
+                        navController.popBackStack()
+                        delay(300L)
+                        DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
+                            DynamicScreenRegistry.unregisterScreen(it1.id)
+                        }
+                    } else {
+                        maxApi?.dismiss {  }
+                    }
                 }
             }
             callBack?.invoke()
         }
     }
-    private suspend fun CoroutineScope.dismissOverplay(isDelay: Boolean = true) {
-        OverplayComponentRegistry.clear()
-        if (isDelay) delay(300L)
-        OverplayComponentRegistry.hardClearAfterDismiss()
-    }
-
-    private suspend fun CoroutineScope.dismissScreen() {
-        if (navController.previousBackStackEntry != null){
-            navController.popBackStack()
-            delay(300L)
-            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                DynamicScreenRegistry.unregisterScreen(it1.id)
-            }
-        } else {
-            maxApi?.dismiss {  }
-        }
-    }
 
     fun present(content: @Composable () -> Unit, options: NavigationOptions? = null) {
         val route = DynamicScreenRegistry.register(content, options)
@@ -93,8 +76,7 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
-        OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
+        OverplayComponentRegistry.registerModal(content, false, barrierDismissible, onDismiss, false)
     }
 
     fun showBottomSheet(
@@ -104,30 +86,7 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.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
-        scope.launch {
-            OverplayComponentRegistry.registerOverplay(
-                id = id,
-                content = {
-                    SnackBar(snackBar, onDismiss)
-                },
-                type = OverplayComponentType.SNACK_BAR,
-                onDismiss = onDismiss
-            )
-        }
-    }
-
-    fun hideSnackBar() {
-        scope.launch {
-            OverplayComponentRegistry.clear()
-            delay(250L)
-            OverplayComponentRegistry.hardClearAfterDismiss()
-        }
+        OverplayComponentRegistry.registerModal(content, isSurface, barrierDismissible, onDismiss, true, bottomSheetHeader)
     }
 
     fun dispose(){
@@ -200,21 +159,13 @@ sealed class OverplayComponentParams {
         val barrierDismissible: Boolean = true,
         val bottomSheetHeader: BottomHeader? = null,
     ) : OverplayComponentParams()
-
-    class SnackBar() : OverplayComponentParams()
 }
 
 data class OverplayComponent(
-    val id: Int,
-    val type: OverplayComponentType? = null,
     val content: @Composable () -> Unit,
     val params: OverplayComponentParams? = null
 )
 
-enum class OverplayComponentType {
-    MODAL, BOTTOM_SHEET, SNACK_BAR
-}
-
 object OverplayComponentRegistry {
     private var currentOverlayComponent : MutableState<OverplayComponent?> = mutableStateOf(null)
     private var requestClose: (() -> Unit)? = null
@@ -222,24 +173,20 @@ object OverplayComponentRegistry {
         requestClose = handler
     }
 
-    fun registerOverplay(
-        id: Int,
+    fun registerModal(
         content: @Composable () -> Unit,
-        type: OverplayComponentType,
         isSurface: Boolean = false,
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)?,
+        isBottomSheet: Boolean = false,
         bottomSheetHeader: BottomHeader? = null,
     ){
-        val params = when(type){
-            OverplayComponentType.MODAL -> OverplayComponentParams.Modal(onDismiss, barrierDismissible)
-            OverplayComponentType.BOTTOM_SHEET -> OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
-            OverplayComponentType.SNACK_BAR -> OverplayComponentParams.SnackBar()
+        val params = if (isBottomSheet) {
+            OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
+        } else {
+            OverplayComponentParams.Modal(onDismiss, barrierDismissible)
         }
-
         currentOverlayComponent.value = OverplayComponent(
-            id = id,
-            type = type,
             content = content,
             params = params
         )
@@ -247,10 +194,6 @@ object OverplayComponentRegistry {
 
     fun isOverplayShowing(): Boolean = currentOverlayComponent.value != null
 
-    fun getOverplayType(): OverplayComponentType? = currentOverlayComponent.value?.type
-
-    fun currentRootId(): Int? = currentOverlayComponent.value?.id
-
     fun clear(){
         if (requestClose != null) {
             requestClose?.invoke()
@@ -268,35 +211,22 @@ object OverplayComponentRegistry {
     fun OverlayComponent(){
         val overplay = currentOverlayComponent.value ?: return
 
-        when (val params = overplay.params) {
-            is OverplayComponentParams.BottomSheet -> {
-                BottomSheet(
-                    content = overplay.content,
-                    header = params.bottomSheetHeader ?: Title(),
-                    isSurface = params.isSurface,
-                    barrierDismissible = params.barrierDismissible,
-                    onDismiss = params.onDismiss
-                )
-            }
-
-            is OverplayComponentParams.Modal -> {
-                ModalScreen(
-                    content = overplay.content,
-                    barrierDismissible = params.barrierDismissible,
-                    onDismiss = params.onDismiss
-                )
-            }
-
-            is OverplayComponentParams.SnackBar -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.BottomCenter
-                ) {
-                    overplay.content()
-                }
-            }
-
-            null -> {}
+        if (overplay.params is OverplayComponentParams.BottomSheet) {
+            val param = overplay.params
+            BottomSheet(
+                content = overplay.content,
+                header = param.bottomSheetHeader ?: BottomHeader.Title(),
+                isSurface = param.isSurface,
+                barrierDismissible = param.barrierDismissible,
+                onDismiss = param.onDismiss
+            )
+        } else if (overplay.params is OverplayComponentParams.Modal) {
+            val param = overplay.params
+            ModalScreen(
+                content = overplay.content,
+                barrierDismissible = param.barrierDismissible,
+                onDismiss = param.onDismiss
+            )
         }
     }
 }

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

@@ -6,7 +6,6 @@ import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.ScrollableState
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
@@ -116,11 +115,11 @@ internal fun StackScreen(
                 HeaderBackground()
             }
 
-            Box(Modifier.zIndex(5f)) {
+            Box(Modifier.zIndex(4f)) {
                 Header()
             }
 
-            Column (Modifier.zIndex(6f)) {
+            Column (Modifier.zIndex(5f)) {
                 SearchAnimated(isScrollInProgress = scrollInProcess)
             }
 
@@ -128,15 +127,14 @@ internal fun StackScreen(
                 MainContent(content = content)
             }
 
-            Box(Modifier.zIndex(4f).align(Alignment.BottomCenter)) {
-                FooterContent()
-            }
-
-            Box(Modifier.zIndex(7f)){
+            Box(Modifier.zIndex(5f)){
                 FloatingContent()
             }
 
-            OverplayView(bottomTabIndex = bottomTabIndex, id = id)
+            Box(Modifier.zIndex(6f).fillMaxSize()){
+                if (bottomTabIndex != -1) return@Box
+                OverplayComponentRegistry.OverlayComponent()
+            }
         }
     }
 }
@@ -193,9 +191,9 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
     }
 
     if (options.footerComponent != null){
-        val footerHeight = LocalFooterHeightPx.current
-        val footerHeightDp = with(density) { footerHeight.value.toDp() }
-        Spacer(Modifier.height(footerHeightDp))
+        val isKeyboardVisible = isKeyboardVisible()
+        val bottomPadding = min(AppNavigationBar.current, if (isKeyboardVisible) 0.dp else 21.dp)
+        Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }
 
@@ -219,29 +217,6 @@ fun ScreenContent(content: @Composable () -> Unit){
     }
 }
 
-@Composable
-fun FooterContent(){
-    val options = LocalOptions.current
-    if (options.footerComponent != null){
-        val isKeyboardVisible = isKeyboardVisible()
-        val bottomPadding = min(AppNavigationBar.current, if (isKeyboardVisible) 0.dp else 21.dp)
-        Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
-    }
-}
-
-@Composable
-fun OverplayView(bottomTabIndex: Int, id: Int){
-    val overplayType = OverplayComponentRegistry.getOverplayType()
-
-    if (overplayType != null) {
-        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 8f).fillMaxSize()){
-            if (bottomTabIndex != -1) return@Box
-            if (OverplayComponentRegistry.currentRootId() != id) return@Box
-            OverplayComponentRegistry.OverlayComponent()
-        }
-    }
-}
-
 @Composable
 fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp) {
     if (footerComponent == null) return

package/package.json

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

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

@@ -1,123 +0,0 @@
-package vn.momo.kits.navigation.component
-
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.Spacing
-import vn.momo.kits.navigation.LocalFooterHeightPx
-import vn.momo.kits.navigation.LocalNavigator
-import vn.momo.kits.navigation.LocalOptions
-import vn.momo.kits.navigation.OverplayComponentRegistry
-
-sealed class SnackBar(open val duration: Long? = null) {
-    data class Custom(
-        val content: @Composable () -> Unit,
-        val heightContent: Float = 300f,
-        override val duration: Long? = 3000L
-    ) : SnackBar(duration)
-
-    data class Toast(
-        override val duration: Long? = 3000L
-    ) : SnackBar(duration)
-}
-
-@Composable
-fun SnackBar(
-    data: SnackBar,
-    onDismiss: (() -> Unit)?
-) {
-    val navigator = LocalNavigator.current
-    val options = LocalOptions.current
-    val footerHeightPxState = LocalFooterHeightPx.current
-
-    val snackBarHeight = when (data) {
-        is SnackBar.Custom -> -data.heightContent
-        is SnackBar.Toast -> -300f
-    }
-
-    val startPosition = if (options.footerComponent != null) 0f else -snackBarHeight
-    val targetPosition = if (options.footerComponent != null) {
-        footerHeightPxState.intValue.toFloat()
-    } else {
-        with(LocalDensity.current) { min(AppNavigationBar.current, 21.dp).toPx() }
-    }
-
-    val offsetY by remember { mutableStateOf(Animatable(startPosition)) }
-    val coroutineScope = rememberCoroutineScope()
-
-    suspend fun openEvent() {
-        offsetY.snapTo(startPosition)
-        offsetY.animateTo(
-            targetValue = -targetPosition,
-            animationSpec = tween(
-                durationMillis = 350,
-            )
-        )
-    }
-
-    fun closeEvent() {
-        coroutineScope.launch {
-            offsetY.animateTo(
-                targetValue = startPosition,
-                animationSpec = tween(
-                    durationMillis = 200,
-                )
-            )
-            navigator.hideSnackBar()
-        }
-    }
-
-    LaunchedEffect(targetPosition) {
-        openEvent()
-    }
-
-    LaunchedEffect(data.duration) {
-        val duration = data.duration
-        if (duration != null) {
-            delay(duration)
-            navigator.hideSnackBar()
-        }
-    }
-
-    DisposableEffect(Unit) {
-        OverplayComponentRegistry.bindClose {
-            closeEvent()
-        }
-        onDispose {
-            onDismiss?.invoke()
-        }
-    }
-
-    Box(
-        modifier = Modifier
-            .offset { IntOffset(0, offsetY.value.toInt()) }
-            .padding(bottom = Spacing.S)
-            .fillMaxWidth()
-    ) {
-        when (data) {
-            is SnackBar.Custom -> data.content()
-            is SnackBar.Toast -> {}
-        }
-    }
-}
-
-
-