@momo-kits/native-kits 0.162.2-debug → 0.162.2-lottie.1-debug

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

@@ -45,8 +45,8 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
+import kotlinx.coroutines.flow.Flow
 import vn.momo.kits.components.InputSearch
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
@@ -56,6 +56,7 @@ import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.hideKeyboardOnTap
+import vn.momo.kits.navigation.bottomtab.BOTTOM_TAB_BAR_HEIGHT
 import vn.momo.kits.navigation.component.FABPosition
 import vn.momo.kits.navigation.component.FloatingButton
 import vn.momo.kits.navigation.component.HEADER_HEIGHT
@@ -69,13 +70,21 @@ 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
 
 internal val LocalFooterHeightPx = staticCompositionLocalOf { mutableIntStateOf(0) }
 internal val LocalHeaderRightWidthPx = staticCompositionLocalOf { mutableIntStateOf(0) }
 
+@Composable
+private fun bottomTabBarInset(): Dp {
+    if (LocalNavigation.current.bottomTabIndex == -1) return 0.dp
+    val keyboard = keyboardSizeState().value
+    return (BOTTOM_TAB_BAR_HEIGHT.dp + Spacing.S - keyboard).coerceAtLeast(0.dp)
+}
+
 @OptIn(ExperimentalMaterialApi::class, ExperimentalTime::class)
 @Composable
 internal fun StackScreen(
@@ -88,17 +97,20 @@ 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
+    val isBottomTabChild = bottomTabIndex != -1
+    val isBottomTabRoot = navigation.isBottomTabRoot
 
     // Auto tracking state
     val trackingState = remember {
         ScreenTrackingState().apply {
-            startTime = Clock.System.now().toEpochMilliseconds()
+            time = Clock.System.now().toEpochMilliseconds()
         }
     }
 
@@ -119,8 +131,8 @@ internal fun StackScreen(
         )
 
         // Track screen displayed after 2 seconds (debounce)
-        delay(2000)
-        val loadTime = Clock.System.now().toEpochMilliseconds() - trackingState.startTime
+        delay(2000.milliseconds)
+        val loadTime = Clock.System.now().toEpochMilliseconds() - trackingState.time
         ScreenTracker.trackScreenDisplayed(
             maxApi = maxApi,
             context = context,
@@ -130,7 +142,7 @@ internal fun StackScreen(
         )
 
         // Track screen interacted after displayed
-        val interactionTime = Clock.System.now().toEpochMilliseconds() - trackingState.startTime
+        val interactionTime = Clock.System.now().toEpochMilliseconds() - trackingState.time
         ScreenTracker.trackScreenInteracted(
             maxApi = maxApi,
             context = context,
@@ -191,29 +203,35 @@ internal fun StackScreen(
             }
 
             Column(Modifier.zIndex(2f).fillMaxSize()) {
-                MainContent(content = content)
+                MainContent(content = content, isBottomTabRoot = isBottomTabRoot, isBottomTabChild = isBottomTabChild)
                 FooterContent()
             }
 
             Box(Modifier.zIndex(6f)) {
-                FloatingContent()
+                FloatingContent(isBottomTabChild = isBottomTabChild)
             }
 
-            OverplayView(bottomTabIndex = bottomTabIndex, id = id)
+            OverplayView(isBottomTabChild = isBottomTabChild, id = id)
         }
     }
 }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun FloatingContent() {
+internal fun FloatingContent(isBottomTabChild: Boolean) {
     val options = LocalOptions.current
     val density = LocalDensity.current
     val footerHeightPx = LocalFooterHeightPx.current
     val scrollState = LocalScrollState.current
+    val navigationBar = AppNavigationBar.current
 
     val fabProps = options.floatingButtonProps ?: return
     val bottomPadding = fabProps.bottom
-        ?: (Spacing.M + if (options.footerComponent != null) with(density) { footerHeightPx.intValue.toDp() } else 0.dp)
+        ?: (Spacing.M + when {
+            options.hasFooter() -> with(density) { footerHeightPx.intValue.toDp() }
+            isBottomTabChild -> bottomTabBarInset() + (navigationBar - keyboardSizeState().value).coerceAtLeast(0.dp)
+            else -> navigationBar
+        })
 
     FloatingButton(
         scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
@@ -229,11 +247,12 @@ fun FloatingContent() {
 }
 
 @Composable
-fun ColumnScope.MainContent(content: @Composable () -> Unit) {
+internal fun ColumnScope.MainContent(content: @Composable () -> Unit, isBottomTabRoot: Boolean, isBottomTabChild: Boolean) {
     val options = LocalOptions.current
     val inputSearchType = getInputSearchType(options)
     val density = LocalDensity.current
     val scrollState = LocalScrollState.current
+    val navigationBar = AppNavigationBar.current
 
     Spacer(
         Modifier.height(
@@ -257,6 +276,13 @@ fun ColumnScope.MainContent(content: @Composable () -> Unit) {
             .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
                 verticalScroll(scrollState)
             }
+            .padding(
+                bottom = when {
+                    options.hasFooter() || isBottomTabRoot -> 0.dp
+                    isBottomTabChild -> bottomTabBarInset() + (navigationBar - keyboardSizeState().value).coerceAtLeast(0.dp)
+                    else -> navigationBar
+                }
+            )
     ) {
         ScreenContent(content = content)
     }
@@ -264,7 +290,7 @@ fun ColumnScope.MainContent(content: @Composable () -> Unit) {
 }
 
 @Composable
-fun ScreenContent(content: @Composable () -> Unit) {
+internal fun ScreenContent(content: @Composable () -> Unit) {
     val scrollState = LocalScrollState.current
     val options = LocalOptions.current
 
@@ -284,28 +310,28 @@ fun ScreenContent(content: @Composable () -> Unit) {
 }
 
 @Composable
-fun FooterContent() {
+internal fun FooterContent() {
     val options = LocalOptions.current
-    if (options.footerComponent != null) {
+    if (options.hasFooter()) {
         val keyboardSize = keyboardSizeState()
-        val bottomPadding = (AppNavigationBar.current - keyboardSize.value).coerceAtLeast(0.dp)
+        val bottomPadding = (AppNavigationBar.current + bottomTabBarInset() - keyboardSize.value).coerceAtLeast(0.dp)
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }
 
 @Composable
-fun keyboardSizeState(): State<Dp> {
+internal fun keyboardSizeState(): State<Dp> {
     val bottom = WindowInsets.ime.asPaddingValues()
     return rememberUpdatedState(bottom.calculateBottomPadding())
 }
 
 @Composable
-fun OverplayView(bottomTabIndex: Int, id: Int) {
+internal fun OverplayView(isBottomTabChild: Boolean, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
         Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 7f).fillMaxSize()) {
-            if (bottomTabIndex != -1) return@Box
+            if (isBottomTabChild) return@Box
             if (OverplayComponentRegistry.currentRootId() != id) return@Box
             OverplayComponentRegistry.OverlayComponent()
         }
@@ -355,8 +381,9 @@ data class InputSearchLayoutParams(
     val endPadding: Dp
 )
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun SearchAnimated(
+internal fun SearchAnimated(
     isScrollInProgress: Boolean
 ) {
     val scrollState = LocalScrollState.current
@@ -469,64 +496,61 @@ private fun quantize(value: Int, stepPx: Int): Int {
 }
 
 @Composable
-fun LazyListState.proxyScrollState(
+internal fun LazyListState.proxyScrollState(
     thresholdPx: Int = 200,
     stepPx: Int = 4
-): Pair<ScrollState, Boolean> {
-    val scrollState = rememberScrollState()
-    val locked = remember { mutableStateOf(false) }
-
-    LaunchedEffect(this, scrollState, thresholdPx, stepPx) {
-        snapshotFlow { firstVisibleItemIndex to firstVisibleItemScrollOffset }
-            .collect { (index, offset) ->
-                val rawTarget = if (index == 0) offset else SCROLLED_PAST_FIRST_ITEM_THRESHOLD
-                val shouldLock = rawTarget > thresholdPx
-                if (locked.value != shouldLock) locked.value = shouldLock
-
-                val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
-
-                if (scrollState.value != desired) {
-                    scrollState.scrollTo(desired.coerceAtLeast(0))
-                }
-            }
-    }
-
-    val inProgress = remember { mutableStateOf(false) }
-    LaunchedEffect(this, thresholdPx) {
-        snapshotFlow { isScrollInProgress }
-            .collect { progressing ->
-                inProgress.value = if (locked.value) false else progressing
-            }
-    }
-
-    return scrollState to inProgress.value
-}
+): Pair<ScrollState, Boolean> = proxyScroll(
+    source = this,
+    thresholdPx = thresholdPx,
+    stepPx = stepPx,
+    isScrollInProgress = { isScrollInProgress },
+    rawTargetFlow = {
+        snapshotFlow {
+            if (firstVisibleItemIndex == 0) firstVisibleItemScrollOffset
+            else SCROLLED_PAST_FIRST_ITEM_THRESHOLD
+        }
+    },
+)
 
 @Composable
-fun ScrollState.proxyLimitedScrollState(
+internal fun ScrollState.proxyLimitedScrollState(
     thresholdPx: Int = 200,
     stepPx: Int = 4
+): Pair<ScrollState, Boolean> = proxyScroll(
+    source = this,
+    thresholdPx = thresholdPx,
+    stepPx = stepPx,
+    isScrollInProgress = { isScrollInProgress },
+    rawTargetFlow = { snapshotFlow { value } },
+)
+
+@Composable
+private fun proxyScroll(
+    source: Any,
+    thresholdPx: Int,
+    stepPx: Int,
+    isScrollInProgress: () -> Boolean,
+    rawTargetFlow: () -> Flow<Int>,
 ): Pair<ScrollState, Boolean> {
     val proxy = rememberScrollState()
     val locked = remember { mutableStateOf(false) }
 
-    LaunchedEffect(this, proxy, thresholdPx, stepPx) {
-        snapshotFlow { value }
-            .collect { rawTarget ->
-                val shouldLock = rawTarget > thresholdPx
-                if (locked.value != shouldLock) locked.value = shouldLock
+    LaunchedEffect(source, proxy, thresholdPx, stepPx) {
+        rawTargetFlow().collect { rawTarget ->
+            val shouldLock = rawTarget > thresholdPx
+            if (locked.value != shouldLock) locked.value = shouldLock
 
-                val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
+            val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
 
-                if (proxy.value != desired) {
-                    proxy.scrollTo(desired.coerceAtLeast(0))
-                }
+            if (proxy.value != desired) {
+                proxy.scrollTo(desired.coerceAtLeast(0))
             }
+        }
     }
 
     val inProgress = remember { mutableStateOf(false) }
-    LaunchedEffect(this, thresholdPx) {
-        snapshotFlow { isScrollInProgress }
+    LaunchedEffect(source, thresholdPx) {
+        snapshotFlow { isScrollInProgress() }
             .collect { progressing ->
                 inProgress.value = if (locked.value) false else progressing
             }

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

@@ -6,13 +6,7 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -24,20 +18,20 @@ import androidx.navigation.compose.rememberNavController
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.navigation.KeyboardOptions
 import vn.momo.kits.navigation.LocalNavigation
 import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.NavigationOptions
 import vn.momo.kits.navigation.StackScreen
 import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.platform.getScreenHeight
 
 private var bottomTabOptionItems : MutableList<NavigationOptions?> = mutableListOf()
-fun setBottomTabOption(index: Int, options: NavigationOptions){
+internal fun setBottomTabOption(index: Int, options: NavigationOptions){
     if (index in bottomTabOptionItems.indices) {
         bottomTabOptionItems[index] = options
     }
 }
-fun getBottomTabOption(index: Int): NavigationOptions? {
+internal fun getBottomTabOption(index: Int): NavigationOptions? {
     return if (index in bottomTabOptionItems.indices) {
         bottomTabOptionItems[index]
     } else null
@@ -58,15 +52,16 @@ fun BottomTab(
 
 
     LaunchedEffect(Unit){
+        navigation.markAsBottomTabRoot()
         navigation.setOptions(
-            headerType = HeaderType.None
+            headerType = HeaderType.None,
+            keyboardOptions = KeyboardOptions(useAvoidKeyboard = false)
         )
     }
 
-    Box(modifier = Modifier.fillMaxWidth().height(getScreenHeight()), contentAlignment = Alignment.BottomCenter) {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
         Box(modifier = Modifier
             .fillMaxSize()
-            .padding(bottom = BOTTOM_TAB_BAR_HEIGHT.dp + AppNavigationBar.current)
         ) {
             NavHost(
                 navController = navController,
@@ -133,7 +128,7 @@ fun BottomTab(
                 onTabSelected = {
                     val currentRoute = navController.currentBackStackEntry?.destination?.route
                     val targetRoute = "option$it"
-                    if (currentRoute != targetRoute){
+                    if (currentRoute != targetRoute) {
                         navController.navigate(targetRoute)
                     }
                 }

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

@@ -5,19 +5,7 @@ import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -32,26 +20,20 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import vn.momo.kits.components.Badge
-import vn.momo.kits.components.Icon
-import vn.momo.kits.components.Text
-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.IsShowBaseLineDebug
-import vn.momo.kits.components.BadgeDot
-import vn.momo.kits.components.DotSize
-import vn.momo.kits.const.Typography
+import vn.momo.kits.components.*
+import vn.momo.kits.const.*
+import vn.momo.kits.modifier.InternalApi
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.platform.getScreenDimensions
 
-val floatingButtonWidth = 75.dp
+internal val floatingButtonWidth = 75.dp
+@InternalApi
 const val BOTTOM_TAB_BAR_HEIGHT = 64
 
 @Composable
-fun BottomTabBar(
+internal fun BottomTabBar(
     items: List<BottomTabItem>,
     floatingButton: BottomTabFloatingButton? = null,
     navController: NavController,
@@ -91,11 +73,11 @@ fun BottomTabBar(
             horizontalArrangement = Arrangement.SpaceAround,
         ) {
             if (floatingButton == null) {
-                renderTabBarItem(items, 0, items.size, selectedIndex, onTabSelected)
+                RenderTabBarItem(items, 0, items.size, selectedIndex, onTabSelected)
             } else {
-                renderTabBarItem(items, 0, mid, selectedIndex, onTabSelected)
+                RenderTabBarItem(items, 0, mid, selectedIndex, onTabSelected)
                 Spacer(modifier = Modifier.width(floatingButtonWidth).padding(horizontal = Spacing.XXS))
-                renderTabBarItem(items, mid, items.size, selectedIndex, onTabSelected)
+                RenderTabBarItem(items, mid, items.size, selectedIndex, onTabSelected)
             }
         }
 
@@ -124,7 +106,7 @@ fun BottomTabBar(
 }
 
 @Composable
-fun RowScope.renderTabBarItem(
+internal fun RowScope.RenderTabBarItem(
     items: List<BottomTabItem>,
     fromIndex: Int,
     toIndex: Int,
@@ -143,7 +125,7 @@ fun RowScope.renderTabBarItem(
 }
 
 @Composable
-fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> Unit) {
+internal fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> Unit) {
     fun isNumber(label: String): Boolean {
         val numberRegex = "^\\d+$".toRegex()
         return numberRegex.matches(label)
@@ -203,7 +185,7 @@ fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> Unit) {
 }
 
 @Composable
-fun FloatingButton(data: BottomTabFloatingButton) {
+internal fun FloatingButton(data: BottomTabFloatingButton) {
     Column(
         modifier = Modifier
             .width(floatingButtonWidth)

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

@@ -17,7 +17,7 @@ import androidx.compose.ui.zIndex
 import vn.momo.kits.const.AppTheme
 
 @Composable
-fun CurvedContainer(
+internal fun CurvedContainer(
     circleSize: Dp = 48.dp,
     tabBarItemIconSize: Dp = 28.dp,
     circleOverSize: Dp = 2.dp,

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

@@ -1,40 +1,21 @@
 package vn.momo.kits.navigation.component
 
-import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.*
 import androidx.compose.animation.core.CubicBezierEasing
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.expandHorizontally
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.FloatingActionButtonElevation
-import androidx.compose.runtime.Composable
-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.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -50,6 +31,7 @@ import vn.momo.kits.components.Text
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.conditional
+import kotlin.time.Duration.Companion.milliseconds
 
 enum class FABSize { SMALL, DEFAULT }
 enum class FABPosition { END, CENTER }
@@ -73,7 +55,7 @@ private val FabIconSizeDefault = 24.dp
 private val FabPaddingHorizontal = 12.dp
 
 @Composable
-fun FloatingButton(
+internal fun FloatingButton(
     scrollPosition: Int,
     bottom: Dp,
     onClick: () -> Unit,
@@ -106,7 +88,7 @@ fun FloatingButton(
             coroutineScope.launch {
                 scrollStateFlow.collectLatest { newScroll ->
                     isExpanded = newScroll <= lastScrollPosition
-                    delay(100)
+                    delay(100.milliseconds)
                     lastScrollPosition = newScroll
                 }
             }

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

@@ -1,5 +1,7 @@
 package vn.momo.kits.navigation.component
 
+import vn.momo.kits.modifier.InternalApi
+
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -42,12 +44,14 @@ import vn.momo.kits.navigation.LocalOptions
 import vn.momo.kits.navigation.LocalScrollState
 import vn.momo.kits.navigation.getInputSearchType
 
+@InternalApi
 const val HEADER_HEIGHT = 52
-enum class InputSearchType { None, Header, Animated }
+internal enum class InputSearchType { None, Header, Animated }
 enum class TitlePosition { LEFT, CENTER }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun Header(onBackHandler: (() -> Unit)? = null) {
+internal fun Header(onBackHandler: (() -> Unit)? = null) {
     val options = LocalOptions.current
     val navigator = LocalNavigator.current
     val scrollState = LocalScrollState.current
@@ -106,7 +110,7 @@ fun Header(onBackHandler: (() -> Unit)? = null) {
                     backgroundButton = headerColor.backgroundButton,
                     tintIconColor = headerColor.tintIconColor,
                     onBackHandler = {
-                        onBackHandler?.invoke() ?: navigator.onBackSafe {  }
+                        navigator.onBackSafe {  }
                     }
                 )
                 Spacer(Modifier.width(Spacing.S))
@@ -168,7 +172,7 @@ private fun BackButton(borderColor: Color, backgroundButton: Color, tintIconColo
 }
 
 @Composable
-fun HeaderContent(
+internal fun HeaderContent(
     headerTitle: HeaderTitle,
     tintIconColor: Color,
     titlePosition: TitlePosition = TitlePosition.LEFT,
@@ -199,7 +203,7 @@ fun HeaderContent(
 }
 
 @Composable
-fun VerticalShadow(opacity: Float){
+internal fun VerticalShadow(opacity: Float){
     if(opacity == 1f){
         Box(modifier = Modifier
             .fillMaxWidth()
@@ -282,8 +286,9 @@ data class HeaderBackProps(
     val preventBack: PopupNotifyProps? = null,
 )
 
+@InternalApi
 data class HeaderColor(val tintIconColor: Color, val backgroundButton: Color, val borderColor: Color)
-fun getHeaderColor(headerType: HeaderType, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
+internal fun getHeaderColor(headerType: HeaderType, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
     return if(headerType is HeaderType.Animated) {
         if (opacity == 1f || !headerType.isSurface)
             HeaderColor(

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

@@ -27,8 +27,9 @@ enum class AnimatedHeaderRatio(val value: Float){
     RATIO_3_2(3f / 2f)
 }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun HeaderBackground() {
+internal fun HeaderBackground() {
     val density = LocalDensity.current
     val theme = AppTheme.current
     val options = LocalOptions.current

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

@@ -1,5 +1,7 @@
 package vn.momo.kits.navigation.component
 
+import vn.momo.kits.modifier.InternalApi
+
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -24,7 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.components.BadgeDot
 import vn.momo.kits.components.DotSize
@@ -35,6 +37,7 @@ import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.navigation.LocalMaxApi
 
 @Composable
+@InternalApi
 fun HeaderRight(
     headerRight: HeaderRight,
     tintColor: Color? = null,
@@ -57,13 +60,13 @@ fun HeaderRight(
 }
 
 @Composable
-fun Toolkit(
+internal fun Toolkit(
     headerRight: HeaderRight.Toolkit,
     tintColor: Color? = null,
     headerColor: HeaderColor
 ) {
     val api = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     var isFavorite by remember { mutableStateOf(false) }
     val isLoading by remember { mutableStateOf(false) }
@@ -186,7 +189,7 @@ fun Toolkit(
 
 
 @Composable
-fun NavigationButton(
+internal fun NavigationButton(
     disabled: Boolean,
     icon: String,
     showBadge: Boolean? = false,
@@ -300,7 +303,7 @@ data class Tool(
     }
 }
 
-data class NavigationButtonConfig(
+private data class NavigationButtonConfig(
     val icon: String,
     val onPress: () -> Unit
-)
+)