@momo-kits/native-kits 0.157.13-debug → 0.157.14-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.13-debug"
+        version = "0.157.14-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -63,6 +63,7 @@ kotlin {
             implementation(compose.material)
             implementation(compose.material3)
             implementation(compose.components.resources)
+            implementation(libs.compose.ui.backhandler)
             implementation(libs.ktor.client.core)
             implementation(libs.jetbrains.coroutines.core)
             implementation(libs.navigation.multiplatform)
@@ -177,4 +178,3 @@ compose {
 //         }
 //     }
 // }
-

package/compose/build.gradle.kts.backup

@@ -63,6 +63,7 @@ kotlin {
             implementation(compose.material)
             implementation(compose.material3)
             implementation(compose.components.resources)
+            implementation(libs.compose.ui.backhandler)
             implementation(libs.ktor.client.core)
             implementation(libs.jetbrains.coroutines.core)
             implementation(libs.navigation.multiplatform)
@@ -177,4 +178,3 @@ mavenPublishing {
         }
     }
 }
-

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

@@ -60,12 +60,17 @@ actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
     AndroidBackHandler(enabled = enabled, onBack = onBack)
 }
 
+@Composable
+actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit) {
+    content()
+}
+
 @Composable
 actual fun getScreenHeight(): Dp {
-    return getScreenDimensions().height.dp + if (getAndroidBuildVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
+    return getScreenDimensions().height.dp + if (getOSVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
 }
 
-actual fun getAndroidBuildVersion(): Int = Build.VERSION.SDK_INT
+actual fun getOSVersion(): Int = Build.VERSION.SDK_INT
 
 @Composable
 actual fun LottieAnimation(
@@ -108,4 +113,4 @@ actual fun LottieAnimation(
 
 actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
-}
+}

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

@@ -60,7 +60,7 @@ import vn.momo.kits.modifier.DeprecatedModifier
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.navigation.component.SnackBar
-import vn.momo.kits.platform.getAndroidBuildVersion
+import vn.momo.kits.platform.getOSVersion
 import vn.momo.kits.utils.getAppStatusBarHeight
 
 enum class HeaderType {
@@ -135,7 +135,7 @@ fun Screen(
         Box(
             Modifier.fillMaxSize()
                 .background(backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+                .conditional(useAvoidKeyboard && getOSVersion() > 29) {
                     imePadding()
                 }.then(DeprecatedModifier())
         ) {
@@ -402,4 +402,3 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
 
 
 
-

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

@@ -34,6 +34,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
 import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
 import vn.momo.kits.utils.getAppStatusBarHeight
 import vn.momo.maxapi.IMaxApi
 
@@ -77,77 +78,79 @@ fun NavigationContainer(
 
     val startDestination = DynamicScreenRegistry.register(initialScreenName, initialScreen, options)
 
-    CompositionLocalProvider(
-        LocalNavigator provides navigator,
-        LocalMaxApi provides maxApi,
-        AppTheme provides theme.value,
-        AppStatusBar provides statusBarHeight,
-        AppNavigationBar provides navigationBarHeight,
-        ApplicationContext provides mergedContext,
-        AppConfig provides config,
-        AppLanguage provides language,
-        ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
+    ProvideNavigationEventDispatcherOwner {
+        CompositionLocalProvider(
+            LocalNavigator provides navigator,
+            LocalMaxApi provides maxApi,
+            AppTheme provides theme.value,
+            AppStatusBar provides statusBarHeight,
+            AppNavigationBar provides navigationBarHeight,
+            ApplicationContext provides mergedContext,
+            AppConfig provides config,
+            AppLanguage provides language,
+            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
         ) {
-        LaunchedEffect(Unit) {
-            setNavigator?.invoke(navigator)
-        }
+            LaunchedEffect(Unit) {
+                setNavigator?.invoke(navigator)
+            }
 
-        NavHost(navController, startDestination = startDestination) {
-            composable<DynamicScreenRoute>(
-                enterTransition = {
-                    slideInHorizontally(
-                        animationSpec = tween(300),
-                        initialOffsetX = { it }
-                    )
-                },
-                exitTransition = null,
-                popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                popExitTransition = {
-                    slideOutHorizontally(
-                        animationSpec = tween(300),
-                        targetOffsetX = { it }
-                    )
-                }
-            ) { backStackEntry ->
-                val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                val screen = DynamicScreenRegistry.getScreen(route.id)
+            NavHost(navController, startDestination = startDestination) {
+                composable<DynamicScreenRoute>(
+                    enterTransition = {
+                        slideInHorizontally(
+                            animationSpec = tween(300),
+                            initialOffsetX = { it }
+                        )
+                    },
+                    exitTransition = null,
+                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                    popExitTransition = {
+                        slideOutHorizontally(
+                            animationSpec = tween(300),
+                            targetOffsetX = { it }
+                        )
+                    }
+                ) { backStackEntry ->
+                    val route = backStackEntry.toRoute<DynamicScreenRoute>()
+                    val screen = DynamicScreenRegistry.getScreen(route.id)
 
-                if (screen != null){
-                    StackScreen(
-                        id = route.id,
-                        name = screen.name,
-                        content = screen.content,
-                        navigationOptions = screen.options
-                    )
+                    if (screen != null) {
+                        StackScreen(
+                            id = route.id,
+                            name = screen.name,
+                            content = screen.content,
+                            navigationOptions = screen.options
+                        )
+                    }
                 }
-            }
 
-            composable<DynamicDialogRoute>(
-                enterTransition = {
-                    slideInVertically (
-                        animationSpec = tween(300),
-                        initialOffsetY = { it }
-                    )
-                },
-                exitTransition = null,
-                popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                popExitTransition = {
-                    slideOutVertically (
-                        animationSpec = tween(300),
-                        targetOffsetY = { it }
-                    )
-                }
-            ) { backStackEntry ->
-                val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                val screen = DynamicScreenRegistry.getScreen(route.id)
+                composable<DynamicDialogRoute>(
+                    enterTransition = {
+                        slideInVertically(
+                            animationSpec = tween(300),
+                            initialOffsetY = { it }
+                        )
+                    },
+                    exitTransition = null,
+                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                    popExitTransition = {
+                        slideOutVertically(
+                            animationSpec = tween(300),
+                            targetOffsetY = { it }
+                        )
+                    }
+                ) { backStackEntry ->
+                    val route = backStackEntry.toRoute<DynamicDialogRoute>()
+                    val screen = DynamicScreenRegistry.getScreen(route.id)
 
-                if (screen != null){
-                    StackScreen(
-                        id = route.id,
-                        name = screen.name,
-                        content = screen.content,
-                        navigationOptions = screen.options
-                    )
+                    if (screen != null) {
+                        StackScreen(
+                            id = route.id,
+                            name = screen.name,
+                            content = screen.content,
+                            navigationOptions = screen.options
+                        )
+                    }
                 }
             }
         }
@@ -163,4 +166,3 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
-

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

@@ -62,7 +62,7 @@ import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderType
 import vn.momo.kits.navigation.component.InputSearchType
 import vn.momo.kits.platform.BackHandler
-import vn.momo.kits.platform.getAndroidBuildVersion
+import vn.momo.kits.platform.getOSVersion
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
@@ -166,7 +166,7 @@ internal fun StackScreen(
             .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
                 hideKeyboardOnTap()
             }
-            .conditional(options.keyboardOptions.useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+            .conditional(options.keyboardOptions.useAvoidKeyboard && getOSVersion() > 29) {
                 imePadding()
             }
         ) {

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

@@ -24,10 +24,13 @@ expect fun getStatusBarHeight(): Dp
 @Composable
 expect fun BackHandler(enabled: Boolean, onBack: () -> Unit)
 
+@Composable
+expect fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit)
+
 @Composable
 expect fun getScreenHeight(): Dp
 
-expect fun getAndroidBuildVersion(): Int
+expect fun getOSVersion(): Int
 
 @Composable
 expect fun LottieAnimation(
@@ -39,4 +42,4 @@ expect fun LottieAnimation(
 
 expect fun NativePaint.setColor(
     color: Color = Color.Black
-)
+)

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

@@ -6,12 +6,15 @@ import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
@@ -26,10 +29,13 @@ import cocoapods.lottie_ios.CompatibleAnimationView
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
+import androidx.navigationevent.NavigationEventDispatcher
+import androidx.navigationevent.NavigationEventDispatcherOwner
 import org.jetbrains.skia.FilterBlurMode
 import org.jetbrains.skia.MaskFilter
 import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
+import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
 
 actual fun getPlatformName(): String = "iOS"
@@ -57,12 +63,31 @@ actual fun getStatusBarHeight(): Dp {
 actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
 }
 
+@OptIn(InternalComposeUiApi::class)
+@Composable
+actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit) {
+    val navigationEventDispatcherOwner = remember {
+        object : NavigationEventDispatcherOwner {
+            override val navigationEventDispatcher = NavigationEventDispatcher().apply {
+                isEnabled = false
+            }
+        }
+    }
+
+    CompositionLocalProvider(
+        LocalCompatNavigationEventDispatcherOwner provides navigationEventDispatcherOwner,
+        content = content
+    )
+}
+
 @Composable
 actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
 }
 
-actual fun getAndroidBuildVersion(): Int = 999
+actual fun getOSVersion(): Int {
+    return UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
+}
 
 @OptIn(ExperimentalForeignApi::class)
 @Composable
@@ -148,4 +173,4 @@ fun Color.toUIColor(): UIColor {
 
 actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
-}
+}

package/gradle/libs.versions.toml

@@ -31,6 +31,7 @@ jetbrains-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-c
 jetbrains-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization", version.ref = "kSerialize" }
 jetbrains-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kSerialize" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
+compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "compose" }
 navigation-multiplatform = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation-multiplatform" }
 coil-multiplatform-core = { module = "io.coil-kt.coil3:coil-core", version.ref = "coil3-multiplatform" }
 coil-multiplatform-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3-multiplatform" }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.157.13
+version=0.157.14
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

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