@momo-kits/native-kits 0.89.25 → 0.89.26

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -26,6 +26,7 @@ actual fun NativePaint.setMaskFilter(blurRadius: Float) {
 }
 
 @SuppressLint("InternalInsetResource")
+@Composable
 actual fun getStatusBarHeight(): Dp {
     val resourceId = Resources.getSystem().getIdentifier(
         "status_bar_height",

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

@@ -46,6 +46,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.platform.getStatusBarHeight
 import vn.momo.kits.utils.bottomBorder
 
 enum class TitlePosition {
@@ -63,9 +64,10 @@ fun HeaderImage(
     headerType: HeaderType = HeaderType.DEFAULT,
     headerBackground: String?,
 ) {
+    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     when (headerType) {
         HeaderType.DEFAULT -> {
-            val height = AppStatusBar.current + 52.dp
+            val height = statusBarHeight + 52.dp
             Image(
                 source = headerBackground ?: "",
                 modifier = Modifier.fillMaxWidth().height(height),
@@ -86,7 +88,7 @@ fun HeaderImage(
         }
 
         HeaderType.SURFACE -> {
-            val height = AppStatusBar.current + 52.dp
+            val height =statusBarHeight + 52.dp
             Box(
                 modifier = Modifier.fillMaxWidth().height(height)
                     .background(AppTheme.current.colors.background.surface)
@@ -115,6 +117,7 @@ fun Header(
     animatedHeader: AnimatedHeader? = null,
     scrollState: Int = 0
 ) {
+    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     var tintIconColor = Colors.black_01
     var backgroundButton = Colors.black_20.copy(alpha = 0.4f)
     if (headerType == HeaderType.SURFACE) {
@@ -143,7 +146,7 @@ fun Header(
 
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
-            Modifier.height(AppStatusBar.current + 52.dp)
+            Modifier.height(statusBarHeight + 52.dp)
                 .fillMaxWidth()
                 .zIndex(10f),
             contentAlignment = Alignment.BottomCenter

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

@@ -34,6 +34,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.shadow
+import vn.momo.kits.platform.getStatusBarHeight
 
 enum class HeaderType {
     DEFAULT,
@@ -62,6 +63,7 @@ fun Screen(
     layoutOffset: Dp = 56.dp,
     content: @Composable () -> Unit,
 ) {
+    val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     val keyboardController = LocalSoftwareKeyboardController.current
     val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
     val keyboardSize = when {
@@ -117,7 +119,7 @@ fun Screen(
 
         Column(
             modifier = Modifier.fillMaxSize()
-                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) AppStatusBar.current + 52.dp else 0.dp)
+                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = {
                         keyboardController?.hide()
@@ -137,7 +139,7 @@ fun Screen(
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {
-                            Spacer(modifier = Modifier.padding(top = AppStatusBar.current + 52.dp + layoutOffset))
+                            Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
                         }
                         content()
                     }

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

@@ -2,7 +2,7 @@ package vn.momo.kits.const
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.Dp
 
 data class Background(
     val default: Color,
@@ -168,6 +168,6 @@ val darkTheme = Theme(
 
 
 val AppTheme = staticCompositionLocalOf { defaultTheme }
-val AppStatusBar = staticCompositionLocalOf {
-    0.dp
+val AppStatusBar = staticCompositionLocalOf<Dp?> {
+   null
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -18,4 +18,5 @@ expect fun getScreenDimensions(): ScreenDimension
 
 expect fun NativePaint.setMaskFilter(blurRadius: Float)
 
+@Composable
 expect fun getStatusBarHeight(): Dp

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -2,6 +2,9 @@ package vn.momo.kits.platform
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.optOutOfCupertinoOverscroll
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.unit.Dp
@@ -36,8 +39,7 @@ actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)
 }
 
-@OptIn(ExperimentalForeignApi::class)
+@Composable
 actual fun getStatusBarHeight(): Dp {
-    val size = UIApplication.sharedApplication.statusBarFrame.size
-    return size.dp
+    return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.25",
+  "version": "0.89.26",
   "private": false,
   "dependencies": {},
   "devDependencies": {},