@momo-kits/native-kits 0.89.21 → 0.89.23-payment.1

package/compose/build.gradle.kts

@@ -31,17 +31,13 @@ kotlin {
                 implementation(compose.foundation)
                 implementation(compose.material)
                 implementation(compose.material3)
+                implementation(compose.components.resources)
                 implementation(libs.ktor.client.core)
                 implementation(libs.jetbrains.coroutines.core)
-                implementation(libs.ktor.client.core)
-                implementation(compose.components.resources)
-                implementation(libs.navigation.compose)
-                implementation(libs.kotlinx.serialization.json)
-                implementation(libs.navigation.compose)
-                implementation(libs.coil.compose)
-                implementation(libs.coil.compose.core)
-                implementation(libs.coil.network.ktor)
-                implementation(libs.coil.mp)
+                implementation(libs.navigation.multiplatform)
+                implementation(libs.coil.multiplatform.compose)
+                implementation(libs.coil.multiplatform.core)
+                implementation(libs.coil.multiplatform.network.ktor)
             }
         }
         val androidMain by getting {

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

@@ -1,9 +1,13 @@
 package vn.momo.kits.platform
 
+import android.annotation.SuppressLint
+import android.content.res.Resources
 import android.graphics.BlurMaskFilter
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 
 actual fun getPlatformName(): String = "Android"
 
@@ -19,4 +23,15 @@ actual fun getScreenDimensions(): ScreenDimension {
 
 actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = BlurMaskFilter(blurRadius, BlurMaskFilter.Blur.NORMAL)
+}
+
+@SuppressLint("InternalInsetResource")
+@Composable
+actual fun getStatusBarHeight(): Dp {
+    val resourceId = Resources.getSystem().getIdentifier(
+        "status_bar_height",
+        "dimen",
+        "android"
+    )
+    return if(resourceId > 0) Resources.getSystem().getDimensionPixelSize(resourceId).dp else 0.dp
 }

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/NavigationContainer.kt

@@ -11,6 +11,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
 import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.disableOverscroll
+import vn.momo.kits.platform.getStatusBarHeight
 
 val AppNavigator = staticCompositionLocalOf<Navigator> {
     error("no navigator provided!")
@@ -57,7 +58,7 @@ fun ApplicationContainer(
     CompositionLocalProvider(
         AppTheme provides theme,
         AppNavigator provides Navigator(),
-        AppStatusBar provides WindowInsets.systemBars.asPaddingValues().calculateTopPadding(),
+        AppStatusBar provides getStatusBarHeight(),
     ) {
         content()
     }

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

@@ -2,6 +2,7 @@ package vn.momo.kits.platform
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
+import androidx.compose.ui.unit.Dp
 
 data class ScreenDimension(
     val width: Int,
@@ -15,4 +16,7 @@ expect fun disableOverscroll(): Unit
 @Composable
 expect fun getScreenDimensions(): ScreenDimension
 
-expect fun NativePaint.setMaskFilter(blurRadius: Float)
+expect fun NativePaint.setMaskFilter(blurRadius: Float)
+
+@Composable
+expect fun getStatusBarHeight(): Dp

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

@@ -2,15 +2,22 @@ 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
+import androidx.compose.ui.unit.dp
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
 import org.jetbrains.skia.FilterBlurMode
 import org.jetbrains.skia.MaskFilter
+import platform.UIKit.UIApplication
 import platform.UIKit.UIScreen
 
+
 actual fun getPlatformName(): String = "iOS"
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -30,4 +37,9 @@ actual fun getScreenDimensions(): ScreenDimension = memScoped {
 
 actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)
+}
+
+@Composable
+actual fun getStatusBarHeight(): Dp {
+    return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
 }

package/gradle.properties

@@ -14,6 +14,6 @@ android.minSdk=24
 #Versions
 kotlin.version=1.9.24
 agp.version=8.1.1
-compose.version=1.7.0-alpha02
+compose.version=1.7.0-dev1756
 composeCompilerVersion = 1.5.14
 maven-publish.version=0.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.21",
+  "version": "0.89.23-payment.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},