@momo-kits/native-kits 0.151.2-test.1 → 0.151.2-test.2

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

@@ -67,6 +67,7 @@ data class FabProps(
     val position: FABPosition? = FABPosition.END,
 )
 
+@Deprecated("Use vn.momo.kits.navigation.FloatingButton instead", ReplaceWith("vn.momo.kits.navigation.FloatingButton"))
 @Composable
 fun FloatingButton(
     scrollPosition: Int,

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

@@ -9,13 +9,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -38,13 +35,12 @@ import kotlinx.coroutines.flow.map
 import vn.momo.kits.components.Icon
 import vn.momo.kits.components.InputSearch
 import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.const.AppStatusBar
 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.setAutomationId
-import vn.momo.kits.platform.getStatusBarHeight
+import vn.momo.kits.utils.getAppStatusBarHeight
 
 data class HeaderColor(val tintIconColor: Color, val backgroundButton: Color, val borderColor: Color)
 fun getHeaderColor(animatedHeader: AnimatedHeader?, opacity: Float, tintColor: Color?, defaultColor: Color): HeaderColor{
@@ -76,6 +72,7 @@ fun getHeaderColor(animatedHeader: AnimatedHeader?, opacity: Float, tintColor: C
             )
 }
 
+@Deprecated("Use vn.momo.kits.navigation.component.Header instead", ReplaceWith("vn.momo.kits.navigation.component.Header"))
 @Composable
 fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
@@ -222,13 +219,4 @@ fun Header(
             }
         }
     }
-}
-
-@Composable
-fun getAppStatusBarHeight(): Dp {
-    return if (AppStatusBar.current == 0.dp) {
-        WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
-    } else {
-        AppStatusBar.current
-    }
 }

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

@@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.components.Image
 
+@Deprecated("Use vn.momo.kits.navigation.component.Header instead", ReplaceWith("vn.momo.kits.navigation.component.Header"))
 @Composable
 fun HeaderAnimated(image: String, scrollState: Int = 0) {
     // Scale animation

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

@@ -8,9 +8,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.platform.getStatusBarHeight
+import vn.momo.kits.utils.getAppStatusBarHeight
 
 enum class TitlePosition {
     LEFT, CENTER,
@@ -37,6 +36,7 @@ fun animateColor(start: Color, stop: Color, fraction: Float): Color {
     )
 }
 
+@Deprecated("Use vn.momo.kits.navigation.component.HeaderBackground instead", ReplaceWith("vn.momo.kits.navigation.component.HeaderBackground"))
 @Composable
 fun HeaderBackground(
     headerType: HeaderType = HeaderType.DEFAULT,

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

@@ -19,6 +19,7 @@ import vn.momo.kits.components.Options
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.utils.bottomBorder
 
+@Deprecated("Use vn.momo.kits.navigation.component.Header instead", ReplaceWith("vn.momo.kits.navigation.component.Header"))
 @Composable
 fun HeaderDefault(
     opacityAni: Float,

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

@@ -19,6 +19,7 @@ import vn.momo.kits.components.Options
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.utils.bottomBorder
 
+@Deprecated("Use vn.momo.kits.navigation.component.Header instead", ReplaceWith("vn.momo.kits.navigation.component.Header"))
 @Composable
 fun HeaderExtended(
     opacityAni: Float,

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

@@ -81,6 +81,7 @@ object Spacing {
     val XXS = 2.dp
 }
 
+@Deprecated("Use vn.momo.kits.navigation.component.HeaderRight instead", ReplaceWith("vn.momo.kits.navigation.component.HeaderRight"))
 @Composable
 fun HeaderRight(
     headerRight: HeaderRightData? = null,
@@ -258,6 +259,7 @@ private fun ToolkitHeaderRight(
     }
 }
 
+@Deprecated("Use vn.momo.kits.navigation.component instead", ReplaceWith("vn.momo.kits.navigation.component"))
 @Composable
 fun NavigationButton(
     disabled: Boolean,

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

@@ -10,6 +10,7 @@ import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
 import vn.momo.kits.const.Typography
 
+@Deprecated("Use vn.momo.kits.navigation.component instead", ReplaceWith("vn.momo.kits.navigation.component"))
 @Composable
 fun HeaderTitle(
     title: String = "",

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

@@ -68,7 +68,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.max
 import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.mapNotNull
@@ -83,8 +82,10 @@ import vn.momo.kits.modifier.kitsAutomationId
 import vn.momo.kits.modifier.noFeedbackClickable
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.modifier.shadow
+import vn.momo.kits.utils.getAppStatusBarHeight
 import kotlin.math.max
 
+@Deprecated("Use NavigationContainer(StackScreen) instead", ReplaceWith("NavigationContainer(StackScreen)"))
 @Composable
 fun LiteScreen(
     scrollable: Boolean = true,

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

@@ -17,6 +17,7 @@ import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.getStatusBarHeight
 
+@Deprecated("Use IMaxApi instead", ReplaceWith("IMaxApi"))
 interface ComposeApi {
     fun request(funcName: String, params: Any?): String
     fun request(funcName: String, params: Any?, onResponse: ((String) -> Unit)?): String
@@ -135,9 +136,10 @@ private fun Map<String, Any?>?.mapStringAny(key: String): Map<String, Any?> =
 private fun Map<String, Any?>?.listOfMapStringAny(key: String): List<Map<String, Any>> =
     (this?.get(key) as? List<Map<String, Any>>) ?: emptyList()
 
-
+@Deprecated("Use LocalApi instead", ReplaceWith("LocalApi"))
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
+@Deprecated("Use LocalNavigator instead", ReplaceWith("LocalNavigator"))
 val AppNavigator = staticCompositionLocalOf<Navigator?> {
     null
 }
@@ -162,6 +164,7 @@ data class KitConfig(
 
 internal var DesignSystemWhiteList: Boolean? = null
 
+@Deprecated("Use NavigationContainer instead", ReplaceWith("NavigationContainer"))
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,

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

@@ -40,6 +40,7 @@ import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getAndroidBuildVersion
+import vn.momo.kits.utils.getAppStatusBarHeight
 
 enum class HeaderType {
     DEFAULT,
@@ -49,6 +50,7 @@ enum class HeaderType {
 
 const val HEADER_HEIGHT = 52
 
+@Deprecated("Use NavigationContainer(StackScreen) instead", ReplaceWith("NavigationContainer(StackScreen)"))
 @Composable
 fun Screen(
     backgroundColor: Color? = null,

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

@@ -22,6 +22,7 @@ data class HeaderAnimations(
 private const val SCREEN_PADDING = 12
 private const val BACK_WIDTH = 28
 
+@Deprecated("Use vn.momo.kits.navigation.component.Header instead", ReplaceWith("vn.momo.kits.navigation.component.Header"))
 @Composable
 fun useHeaderSearchAnimation(
     opacityAni: Float,

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

@@ -72,7 +72,7 @@ private fun getHostFromUrl(url: String): String? {
 private fun appendSizeQueryParam(url: String, value: String): String {
     val fragmentIndex = url.indexOf('#')
     val (baseUrl, fragment) = if (fragmentIndex != -1) {
-        url.substring(0, fragmentIndex) to url.substring(fragmentIndex)
+        url.take(fragmentIndex) to url.substring(fragmentIndex)
     } else {
         url to ""
     }

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

@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -36,6 +35,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import vn.momo.kits.components.Divider
 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

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

@@ -67,7 +67,7 @@ val LocalNavigation = staticCompositionLocalOf<Navigation> {
 }
 
 data class NavigationOptions(
-    var onBackHandler: (() -> Unit)? = null,
+    val onBackHandler: (() -> Unit)? = null,
     val hiddenBack: Boolean = false,
     val headerTitle: HeaderTitle = HeaderTitle.Default("Stack"),
     val headerRight: HeaderRight = HeaderRight.Toolkit(),

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

@@ -16,19 +16,25 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import vn.momo.kits.application.AppConfig
+import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.KitConfig
 import vn.momo.kits.application.MiniAppContext
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.AppThemeController
 import vn.momo.kits.const.Theme
+import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.utils.getAppStatusBarHeight
 import vn.momo.maxapi.IMaxApi
 
 @Composable
@@ -39,14 +45,13 @@ fun NavigationContainer(
     applicationContext: MiniAppContext? = null,
     maxApi: IMaxApi? = null,
     setNavigator: ((Navigator) -> Unit)? = null,
+    statusBarHeight: Dp? = null,
+    config: KitConfig? = null,
+    language: String? = null,
 ){
     val navController = rememberNavController()
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
-    val statusBarHeight = if (AppStatusBar.current == 0.dp) {
-        WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
-    } else {
-        AppStatusBar.current
-    }
+    val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = if (AppNavigationBar.current == 0.dp) {
         WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
     } else {
@@ -55,6 +60,17 @@ fun NavigationContainer(
 
     val theme = remember { mutableStateOf(initialTheme) }
 
+    LaunchedEffect(Unit) {
+        val headerBar = config?.headerBar
+        if (headerBar != null && theme.value.assets.headerBackground == null) {
+            theme.value = theme.value.copy(
+                assets = ThemeAssets(
+                    headerBackground = headerBar
+                )
+            )
+        }
+    }
+
     val startDestination = DynamicScreenRegistry.register(initialScreen, options)
 
     CompositionLocalProvider(
@@ -65,6 +81,8 @@ fun NavigationContainer(
         AppStatusBar provides statusBarHeight,
         AppNavigationBar provides navigationBarHeight,
         ApplicationContext provides applicationContext,
+        AppConfig provides config,
+        AppLanguage provides language
     ) {
         LaunchedEffect(Unit) {
             setNavigator?.invoke(navigator)

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

@@ -208,9 +208,8 @@ object OverplayComponentRegistry {
     }
 
     @Composable
-    fun showOverlayComponent(){
-        val overplay = currentOverlayComponent.value
-        if (overplay == null) return
+    fun OverlayComponent(){
+        val overplay = currentOverlayComponent.value ?: return
 
         if (overplay.params is OverplayComponentParams.BottomSheet) {
             val param = overplay.params
@@ -218,14 +217,14 @@ object OverplayComponentRegistry {
                 content = overplay.content,
                 header = param.bottomSheetHeader ?: BottomHeader.Title(),
                 isSurface = param.isSurface,
-                barrierDismissible = param.barrierDismissible == true,
+                barrierDismissible = param.barrierDismissible,
                 onDismiss = param.onDismiss
             )
         } else if (overplay.params is OverplayComponentParams.Modal) {
             val param = overplay.params
             ModalScreen(
                 content = overplay.content,
-                barrierDismissible = param.barrierDismissible == true,
+                barrierDismissible = param.barrierDismissible,
                 onDismiss = param.onDismiss
             )
         }