@momo-kits/native-kits 0.162.2-sp.1-debug → 0.162.2-sp.10-debug

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) {

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,14 @@ 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)
+                    !options.scrollData.scrollable -> 0.dp
+                    else -> navigationBar
+                }
+            )
     ) {
         ScreenContent(content = content)
     }
@@ -264,7 +291,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,9 +311,9 @@ 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)
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
@@ -294,18 +321,18 @@ fun FooterContent() {
 }
 
 @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 +382,9 @@ data class InputSearchLayoutParams(
     val endPadding: Dp
 )
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun SearchAnimated(
+internal fun SearchAnimated(
     isScrollInProgress: Boolean
 ) {
     val scrollState = LocalScrollState.current
@@ -469,64 +497,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)