@momo-kits/native-kits 0.150.0-beta.7 → 0.150.0-beta.8

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

@@ -3,6 +3,7 @@ package vn.momo.kits.platform
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.BlurMaskFilter
+import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.platform.LocalConfiguration
@@ -47,4 +48,6 @@ actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
 @Composable
 actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp + AppStatusBar.current + AppNavigationBar.current
-}
+}
+
+actual fun getAndroidBuildVersion(): Int = Build.VERSION.SDK_INT

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

@@ -14,19 +14,16 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.onGloballyPositioned
@@ -37,13 +34,12 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
 import vn.momo.kits.components.InputSearchProps
-import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
-import vn.momo.kits.platform.getStatusBarHeight
+import vn.momo.kits.platform.getAndroidBuildVersion
 
 enum class HeaderType {
     DEFAULT,
@@ -82,17 +78,9 @@ fun Screen(
     val statusBarHeight = getAppStatusBarHeight()
     val keyboardController = LocalSoftwareKeyboardController.current
 
+    val isKeyboardVisible = isKeyboardVisible()
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    val bottomPadding = min(indicator, 21.dp)
-
-    val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
-    val keyboardSize = when {
-        !useAvoidKeyboard -> 0.dp
-        keyboardHeight > 100.dp && footer == null -> keyboardHeight
-        keyboardHeight > 100.dp && footer != null -> keyboardHeight - bottomPadding
-        else -> 0.dp
-    }
-
+    val bottomPadding = min(indicator, if (isKeyboardVisible) 0.dp else 21.dp)
 
     val headerHeight = if (animatedHeader !== null)
         with(LocalDensity.current) { layoutOffset.roundToPx() }
@@ -115,6 +103,9 @@ fun Screen(
     Box(
         Modifier.fillMaxSize()
             .background(backgroundColor ?: AppTheme.current.colors.background.default)
+            .conditional(useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+                imePadding()
+            }
     ) {
 
         if (animatedHeader === null) {
@@ -154,7 +145,6 @@ fun Screen(
             Column(
                 modifier = Modifier
                     .conditional(scrollable) { weight(1f) }
-                    .padding(bottom = keyboardSize)
                     .conditional(onContentLayout != null) {
                         onGloballyPositioned(onContentLayout ?: {})
                     }
@@ -178,7 +168,7 @@ fun Screen(
             }
 
             footer?.let {
-                Footer(footer, keyboardSize, bottomPadding)
+                Footer(footer, bottomPadding)
             }
         }
 
@@ -194,17 +184,23 @@ fun Screen(
                 text = fabProps.label,
                 size = fabProps.size,
                 position = fabProps.position ?: FABPosition.END,
-                keyboardSize = keyboardSize
             )
         }
     }
 }
 
 @Composable
-fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bottom: Dp = 0.dp) {
+internal fun isKeyboardVisible(): Boolean {
+    val ime = WindowInsets.ime
+    val density = LocalDensity.current
+    val bottom = ime.getBottom(density)
+    return bottom > 0
+}
+
+@Composable
+fun Footer(footer: @Composable (() -> Unit)? = null, bottom: Dp = 0.dp) {
     Box(
         Modifier
-            .offset(y = -keyboardSize)
             .shadow(
                 color = Colors.black_20.copy(alpha = 0.05f),
                 blurRadius = 24f,

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

@@ -10,12 +10,12 @@ import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 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
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -33,7 +33,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
@@ -60,6 +59,7 @@ import vn.momo.kits.navigation.component.HeaderBackground
 import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderType
 import vn.momo.kits.platform.BackHandler
+import vn.momo.kits.platform.getAndroidBuildVersion
 
 const val HEADER_HEIGHT = 52
 
@@ -113,23 +113,15 @@ internal fun StackScreen(
         }
     )
 
-    val bottomPadding = min(AppNavigationBar.current, 21.dp)
-
-    val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
-    val keyboardSize = when {
-        !options.keyboardOptions.useAvoidKeyboard -> 0.dp
-        keyboardHeight > 100.dp && options.footerComponent == null -> keyboardHeight
-        keyboardHeight > 100.dp && options.footerComponent != null -> keyboardHeight - bottomPadding
-        else -> 0.dp
-    }
+    val isKeyboardVisible = isKeyboardVisible()
+    val bottomPadding = min(AppNavigationBar.current, if (isKeyboardVisible) 0.dp else 21.dp)
 
     BackHandler(true){
         navigator.pop()
     }
 
     CompositionLocalProvider(
-        LocalNavigation provides navigation,
-        LocalKeyboardSize provides keyboardSize
+        LocalNavigation provides navigation
     ) {
         Box(Modifier
             .fillMaxSize()
@@ -138,6 +130,9 @@ internal fun StackScreen(
             .conditional(options.keyboardOptions.keyboardShouldPersistTaps == true) {
                 hideKeyboardOnTap()
             }
+            .conditional(options.keyboardOptions.useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+                imePadding()
+            }
         ) {
             Box(Modifier.zIndex(1f)) {
                 HeaderBackground(
@@ -166,7 +161,7 @@ internal fun StackScreen(
                 )
             }
 
-            Column(Modifier.zIndex(2f).fillMaxSize().padding(bottom = keyboardSize)) {
+            Column(Modifier.zIndex(2f).fillMaxSize()) {
                 Spacer(Modifier.height(if (options.headerType is HeaderType.DefaultOrExtended) AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp))
                 Column (Modifier
                     .fillMaxWidth()
@@ -188,7 +183,7 @@ internal fun StackScreen(
             Box(Modifier.zIndex(5f)){
                 val fabProps = options.floatingButtonProps ?: return@Box
                 val bottomPadding = fabProps.bottom ?:
-                    (keyboardSize + Spacing.M + if (options.footerComponent != null) with(LocalDensity.current){ footerHeight.toDp() } else 0.dp)
+                    (Spacing.M + if (options.footerComponent != null) with(LocalDensity.current){ footerHeight.toDp() } else 0.dp)
 
                 FloatingButton(
                     scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
@@ -383,4 +378,11 @@ fun BoxScope.renderPullRefreshIndicator(refreshing: Boolean, pullState: PullRefr
     )
 }
 
-val LocalKeyboardSize = staticCompositionLocalOf { 0.dp }
+
+@Composable
+internal fun isKeyboardVisible(): Boolean {
+    val ime = WindowInsets.ime
+    val density = LocalDensity.current
+    val bottom = ime.getBottom(density)
+    return bottom > 0
+}

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

@@ -23,4 +23,6 @@ expect fun getStatusBarHeight(): Dp
 expect fun BackHandler(enabled: Boolean, onBack: () -> Unit)
 
 @Composable
-expect fun getScreenHeight(): Dp
+expect fun getScreenHeight(): Dp
+
+expect fun getAndroidBuildVersion(): Int

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

@@ -44,4 +44,6 @@ actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
 @Composable
 actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
-}
+}
+
+actual fun getAndroidBuildVersion(): Int = 999

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.150.0-beta.7",
+  "version": "0.150.0-beta.8",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"