@momo-kits/native-kits 0.89.1-rc.1 → 0.89.3

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

@@ -32,6 +32,7 @@ import vn.momo.kits.components.Icon
 import vn.momo.kits.components.Image
 import vn.momo.kits.components.Options
 import vn.momo.kits.components.Text
+import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
@@ -47,10 +48,9 @@ fun HeaderImage(
     headerType: HeaderType = HeaderType.DEFAULT,
     headerBackground: String?,
 ) {
-    val systemBarsPadding = WindowInsets.systemBars.asPaddingValues()
     when (headerType) {
         HeaderType.DEFAULT -> {
-            val height = systemBarsPadding.calculateTopPadding() + 52.dp
+            val height = AppStatusBar.current + 52.dp
             Image(
                 source = headerBackground ?: "",
                 modifier = Modifier.fillMaxWidth().height(height),
@@ -86,7 +86,6 @@ fun Header(
     headerRight: @Composable (() -> Unit)? = null,
     goBack: (() -> Unit) = { },
 ) {
-    val systemBarsPadding = WindowInsets.systemBars.asPaddingValues()
     var tintIconColor = Colors.black_01
     var backgroundButton = Colors.black_20.copy(alpha = 0.4f)
     if (headerType == HeaderType.SURFACE) {
@@ -96,7 +95,7 @@ fun Header(
 
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
-            Modifier.height(systemBarsPadding.calculateTopPadding() + 52.dp)
+            Modifier.height(AppStatusBar.current + 52.dp)
                 .background(backgroundColor)
                 .fillMaxWidth()
                 .bottomBorder(

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

@@ -4,8 +4,11 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -14,6 +17,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.LocalNavigator
@@ -21,6 +25,7 @@ import cafe.adriel.voyager.navigator.bottomSheet.BottomSheetNavigator
 import cafe.adriel.voyager.navigator.bottomSheet.LocalBottomSheetNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import cafe.adriel.voyager.transitions.SlideTransition
+import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Theme
@@ -87,10 +92,12 @@ class Navigator(
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
+    statusBarHeight: Dp = WindowInsets.systemBars.asPaddingValues().calculateTopPadding(),
     content: @Composable () -> Unit,
 ) {
     CompositionLocalProvider(
         AppTheme provides theme,
+        AppStatusBar provides statusBarHeight,
     ) {
         BottomSheetNavigator(sheetBackgroundColor = Color.Transparent, sheetElevation = 0.dp) {
             cafe.adriel.voyager.navigator.Navigator(MainScreen {

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

@@ -46,6 +46,7 @@ fun Screen(
     title: String = "Stack",
     titlePosition: TitlePosition = TitlePosition.LEFT,
     goBack: (() -> Unit) = { },
+    scrollable: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = null,
     content: @Composable () -> Unit,
@@ -80,8 +81,9 @@ fun Screen(
             )
 
             Column(
-                Modifier.weight(1f).padding(bottom = avoidKeyboard)
-                    .verticalScroll(rememberScrollState()),
+                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = avoidKeyboard)
+                    .verticalScroll(rememberScrollState()) else
+                    Modifier.padding(bottom = avoidKeyboard),
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt

@@ -2,6 +2,7 @@ package vn.momo.kits.const
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
 
 data class Background(
     val default: Color,
@@ -166,4 +167,7 @@ val darkTheme = Theme(
 )
 
 
-val AppTheme = staticCompositionLocalOf { defaultTheme }
+val AppTheme = staticCompositionLocalOf { defaultTheme }
+val AppStatusBar = staticCompositionLocalOf {
+    0.dp
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.1-rc.1",
+  "version": "0.89.3",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Layout.kt

@@ -1,2 +0,0 @@
-package vn.momo.kits.utils
-