@momo-kits/native-kits 0.160.12-debug → 0.160.13-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.12-debug"
+        version = "0.160.13-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.159.1-beta.16'
+    spec.version                  = '0.161.2-beta.1'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -3,6 +3,7 @@ package vn.momo.kits.navigation
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.unit.Dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -49,7 +50,9 @@ fun NavigationContainer(
         }
     }
 
-    val startDestination = DynamicScreenRegistry.register(initialScreenName, initialScreen, options)
+    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
+    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
+    val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
@@ -132,6 +135,7 @@ fun NavigationContainer(
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
+            DynamicScreenRegistry.unregisterScreen(screenId)
         }
     }
 }

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

@@ -196,6 +196,18 @@ object DynamicScreenRegistry {
         return DynamicScreenRoute(id)
     }
 
+    fun nextId(): Int = idCounter++
+
+    fun bind(id: Int, screenName: String, content: @Composable () -> Unit, options: NavigationOptions?) {
+        screens[id] = DynamicScreen(
+            id = id,
+            name = screenName,
+            content = content,
+            options = options
+        )
+        if (id >= idCounter) idCounter = id + 1 // keep counter ahead after process-death restore
+    }
+
     fun unregisterScreen(id: Int) {
         screens.remove(id)
     }

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

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -27,10 +28,12 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
@@ -179,23 +182,20 @@ internal fun StackScreen(
                 HeaderBackground()
             }
 
-            Box(Modifier.zIndex(5f)) {
+            Box(Modifier.zIndex(4f)) {
                 Header(onBackHandler)
             }
 
-            Column(Modifier.zIndex(6f)) {
+            Column(Modifier.zIndex(5f)) {
                 SearchAnimated(isScrollInProgress = scrollInProcess)
             }
 
             Column(Modifier.zIndex(2f).fillMaxSize()) {
                 MainContent(content = content)
-            }
-
-            Box(Modifier.zIndex(4f).align(Alignment.BottomCenter)) {
                 FooterContent()
             }
 
-            Box(Modifier.zIndex(7f)) {
+            Box(Modifier.zIndex(6f)) {
                 FloatingContent()
             }
 
@@ -261,11 +261,6 @@ fun ColumnScope.MainContent(content: @Composable () -> Unit) {
         ScreenContent(content = content)
     }
 
-    if (options.footerComponent != null) {
-        val footerHeight = LocalFooterHeightPx.current
-        val footerHeightDp = with(density) { footerHeight.value.toDp() }
-        Spacer(Modifier.height(footerHeightDp))
-    }
 }
 
 @Composable
@@ -292,22 +287,24 @@ fun ScreenContent(content: @Composable () -> Unit) {
 fun FooterContent() {
     val options = LocalOptions.current
     if (options.footerComponent != null) {
-        val ime = WindowInsets.ime
-        val density = LocalDensity.current
-        val imeBottom = ime.getBottom(density)
-        val thresholdPx = with(density) { 50.dp.toPx() }
-        val isKeyboardVisible = imeBottom > thresholdPx
-        val bottomPadding = if (isKeyboardVisible) 0.dp else AppNavigationBar.current
+        val keyboardSize = keyboardSizeState()
+        val bottomPadding = (AppNavigationBar.current - keyboardSize.value).coerceAtLeast(0.dp)
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }
 
+@Composable
+fun keyboardSizeState(): State<Dp> {
+    val bottom = WindowInsets.ime.asPaddingValues()
+    return rememberUpdatedState(bottom.calculateBottomPadding())
+}
+
 @Composable
 fun OverplayView(bottomTabIndex: Int, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
-        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 8f).fillMaxSize()) {
+        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 7f).fillMaxSize()) {
             if (bottomTabIndex != -1) return@Box
             if (OverplayComponentRegistry.currentRootId() != id) return@Box
             OverplayComponentRegistry.OverlayComponent()
@@ -466,13 +463,6 @@ fun SearchAnimated(
     }
 }
 
-@Composable
-internal fun isKeyboardVisible(): Boolean {
-    val ime = WindowInsets.ime
-    val density = LocalDensity.current
-    return ime.getBottom(density) > 0
-}
-
 private fun quantize(value: Int, stepPx: Int): Int {
     if (stepPx <= 1) return value
     return (value / stepPx) * stepPx

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.160.12
+version=0.160.13
 
 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.160.12-debug",
+  "version": "0.160.13-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},