@momo-kits/native-kits 0.89.23 → 0.89.25

package/android/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    alias libs.plugins.kotlin.compose.compiler
 }
 
 android {
@@ -26,10 +27,6 @@ android {
     buildFeatures {
         compose true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.14"
-    }
 }
 
 dependencies {

package/build.gradle.kts

@@ -1,10 +1,24 @@
 plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
-    kotlin("multiplatform").apply(false)
-    id("com.android.application").apply(false)
-    id("com.android.library").apply(false)
-    id("org.jetbrains.compose").apply(false)
+    alias(libs.plugins.jetbrains.kotlin.jvm) apply false
+    alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
+    alias(libs.plugins.kotlin.compose.compiler)
+    alias(libs.plugins.compose) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.application) apply false
+}
+
+buildscript {
+    repositories {
+        maven("https://storage.googleapis.com/r8-releases/raw")
+    }
+
+    dependencies {
+        classpath(libs.r8)
+    }
 }
 
 subprojects {

package/compose/build.gradle.kts

@@ -1,7 +1,8 @@
 plugins {
-    kotlin("multiplatform")
-    id("com.android.library")
-    id("org.jetbrains.compose")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.multiplatform)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose.compiler)
     id("maven-publish")
 }
 

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,14 @@ actual fun getScreenDimensions(): ScreenDimension {
 
 actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = BlurMaskFilter(blurRadius, BlurMaskFilter.Blur.NORMAL)
+}
+
+@SuppressLint("InternalInsetResource")
+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/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/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,6 @@ expect fun disableOverscroll(): Unit
 @Composable
 expect fun getScreenDimensions(): ScreenDimension
 
-expect fun NativePaint.setMaskFilter(blurRadius: Float)
+expect fun NativePaint.setMaskFilter(blurRadius: Float)
+
+expect fun getStatusBarHeight(): Dp

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

@@ -4,13 +4,17 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.optOutOfCupertinoOverscroll
 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 +34,10 @@ actual fun getScreenDimensions(): ScreenDimension = memScoped {
 
 actual fun NativePaint.setMaskFilter(blurRadius: Float) {
     this.maskFilter = MaskFilter.makeBlur(FilterBlurMode.NORMAL, blurRadius / 2, true)
+}
+
+@OptIn(ExperimentalForeignApi::class)
+actual fun getStatusBarHeight(): Dp {
+    val size = UIApplication.sharedApplication.statusBarFrame.size
+    return size.dp
 }

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.23",
+  "version": "0.89.25",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/settings.gradle.kts

@@ -11,26 +11,6 @@ pluginManagement {
         google()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-
-    plugins {
-
-        val kotlinVersion = extra["kotlin.version"] as String
-        val agpVersion = extra["agp.version"] as String
-        val composeVersion = extra["compose.version"] as String
-
-        kotlin("jvm").version(kotlinVersion)
-        kotlin("multiplatform").version(kotlinVersion)
-        kotlin("android").version(kotlinVersion)
-
-        id("com.android.application").version(agpVersion)
-        id("com.android.library").version(agpVersion)
-
-        id("org.jetbrains.compose").version(composeVersion)
-    }
-}
-
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
 }
 
 dependencyResolutionManagement {