@momo-kits/native-kits 0.153.1-beta.1 → 0.153.1-beta.2

package/build/reports/problems/problems-report.html

@@ -650,7 +650,7 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"locations":[{},{"pluginId":"com.android.internal.library"}],"problem":[{"text":"The StartParameter.isConfigurationCacheRequested property has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"The StartParameter.isConfigurationCacheRequested property has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#deprecated_startparameter_is_configuration_cache_requested","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-startparameter-isconfigurationcacherequested-property-has-been-deprecated","displayName":"The StartParameter.isConfigurationCacheRequested property has been deprecated."}],"solutions":[[{"text":"Please use 'configurationCache.requested' property on 'BuildFeatures' service instead."}]]}],"problemsReport":{"totalProblemCount":1,"buildName":"momo-kits","requestedTasks":":sample:androidApp:assembleDebug","documentationLink":"https://docs.gradle.org/8.14.1/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"locations":[{},{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Retrieving attribute with a null key. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10.0."}],"contextualLabel":"Retrieving attribute with a null key. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#null-attribute-lookup","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"retrieving-attribute-with-a-null-key-this-behavior-has-been-deprecated","displayName":"Retrieving attribute with a null key. This behavior has been deprecated."}],"solutions":[[{"text":"Don't request attributes from attribute containers using null keys."}]]},{"locations":[{},{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Retrieving attribute with a null key. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10.0."}],"contextualLabel":"Retrieving attribute with a null key. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#null-attribute-lookup","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"retrieving-attribute-with-a-null-key-this-behavior-has-been-deprecated","displayName":"Retrieving attribute with a null key. This behavior has been deprecated."}],"solutions":[[{"text":"Don't request attributes from attribute containers using null keys."}]]},{"locations":[{},{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Retrieving attribute with a null key. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10.0."}],"contextualLabel":"Retrieving attribute with a null key. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#null-attribute-lookup","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"retrieving-attribute-with-a-null-key-this-behavior-has-been-deprecated","displayName":"Retrieving attribute with a null key. This behavior has been deprecated."}],"solutions":[[{"text":"Don't request attributes from attribute containers using null keys."}]]},{"locations":[{},{"pluginId":"com.android.internal.application"}],"problem":[{"text":"Retrieving attribute with a null key. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10.0."}],"contextualLabel":"Retrieving attribute with a null key. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#null-attribute-lookup","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"retrieving-attribute-with-a-null-key-this-behavior-has-been-deprecated","displayName":"Retrieving attribute with a null key. This behavior has been deprecated."}],"solutions":[[{"text":"Don't request attributes from attribute containers using null keys."}]]},{"locations":[{},{"pluginId":"com.android.internal.library"}],"problem":[{"text":"Retrieving attribute with a null key. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 10.0."}],"contextualLabel":"Retrieving attribute with a null key. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#null-attribute-lookup","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"retrieving-attribute-with-a-null-key-this-behavior-has-been-deprecated","displayName":"Retrieving attribute with a null key. This behavior has been deprecated."}],"solutions":[[{"text":"Don't request attributes from attribute containers using null keys."}]]}],"problemsReport":{"totalProblemCount":5,"buildName":"momo-kits","requestedTasks":"","documentationLink":"https://docs.gradle.org/8.14.1/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>

package/compose/build/kotlin/compileDebugKotlinAndroid/cacheable/caches-jvm/inputs/source-to-output.tab.values.s

@@ -1 +1 @@
-�?�:
+�@�:

package/compose/build/kotlin/compileDebugKotlinAndroid/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s

@@ -1 +1 @@
-��
��
��
��
�

+��
��
Ҿ
��
�

package/compose/build/kotlin/compileDebugKotlinAndroid/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s

@@ -1 +1 @@
-�`
+�`

package/compose/build/kotlin/compileDebugKotlinAndroid/cacheable/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-��

+��

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

@@ -248,7 +248,7 @@ fun Screen(
                     .align(Alignment.BottomCenter)
                     .zIndex(3f)
             ) {
-                ScreenSnackBarHost(footerHeightPx.value)
+                ScreenSnackBarHost(if (footer == null) 0 else footerHeightPx.value)
             }
         }
     }
@@ -335,21 +335,27 @@ val LocalScreenHelper = staticCompositionLocalOf<ScreenHelper> {
 fun ScreenSnackBarHost(footerHeightPx: Int) {
     val helper = LocalScreenHelper.current
     val snackBarData = helper.snackBarState ?: return
+    val density = LocalDensity.current
+    val navigationBar = AppNavigationBar.current
 
+    val footerHeight = if (footerHeightPx > 0) {
+            footerHeightPx
+    } else {
+        with(density) {
+            min(navigationBar, 21.dp).toPx()
+        }
+    }.toInt()
 
-    val snackBarHeight = when (snackBarData.type) {
-        is SnackBar.Custom -> snackBarData.type.heightContent
-        is SnackBar.Toast -> 300f
-    }
-
-    val startPosition = if (footerHeightPx > 0) 0f else snackBarHeight
-    val targetPosition = if (footerHeightPx > 0) -footerHeightPx.toFloat() else -with(LocalDensity.current) { AppNavigationBar.current.toPx() }
+    var startPosition by remember { mutableStateOf(Float.MAX_VALUE) }
+    val targetPosition = 0f
 
-    val offsetY = remember { Animatable(startPosition) }
+    var offsetY by remember { mutableStateOf(Animatable(startPosition)) }
 
-    LaunchedEffect(snackBarData, footerHeightPx) {
-        offsetY.snapTo(startPosition)
-        offsetY.animateTo(targetPosition, tween(350))
+    LaunchedEffect(startPosition) {
+        if (startPosition != Float.MAX_VALUE){
+            offsetY.snapTo(startPosition)
+            offsetY.animateTo(targetPosition, tween(350))
+        }
     }
 
     LaunchedEffect(helper.requestHide) {
@@ -374,7 +380,13 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
 
     Box(
         modifier = Modifier
-            .offset { IntOffset(0, offsetY.value.toInt()) }
+            .offset { IntOffset(0, offsetY.value.toInt() - footerHeight) }
+            .onGloballyPositioned {
+                if (startPosition != it.size.height.toFloat()) {
+                    startPosition = it.size.height.toFloat()
+                    offsetY = Animatable(startPosition)
+                }
+            }
             .fillMaxWidth()
     ) {
         when (val type = snackBarData.type) {

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

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -13,7 +12,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
@@ -21,7 +22,6 @@ import androidx.compose.ui.unit.min
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.Spacing
 import vn.momo.kits.navigation.LocalFooterHeightPx
 import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.LocalOptions
@@ -30,7 +30,6 @@ import vn.momo.kits.navigation.OverplayComponentRegistry
 sealed class SnackBar(open val duration: Long? = null) {
     data class Custom(
         val content: @Composable () -> Unit,
-        val heightContent: Float = 300f,
         override val duration: Long? = 3000L
     ) : SnackBar(duration)
 
@@ -46,27 +45,26 @@ fun SnackBar(
 ) {
     val navigator = LocalNavigator.current
     val options = LocalOptions.current
+    val density = LocalDensity.current
     val footerHeightPxState = LocalFooterHeightPx.current
+    val navigationBar = AppNavigationBar.current
 
-    val snackBarHeight = when (data) {
-        is SnackBar.Custom -> -data.heightContent
-        is SnackBar.Toast -> -300f
-    }
-
-    val startPosition = if (options.footerComponent != null) 0f else -snackBarHeight
-    val targetPosition = if (options.footerComponent != null) {
-        footerHeightPxState.intValue.toFloat()
+    val footerHeight = if (options.footerComponent != null) {
+        footerHeightPxState.value
     } else {
-        with(LocalDensity.current) { min(AppNavigationBar.current, 21.dp).toPx() }
-    }
+        with(density){ min(navigationBar, 21.dp).toPx() }
+    }.toInt()
 
-    val offsetY by remember { mutableStateOf(Animatable(startPosition)) }
+    var startPosition by remember { mutableStateOf(Float.MAX_VALUE) }
+    val targetPosition = 0f
+
+    var offsetY by remember { mutableStateOf(Animatable(startPosition)) }
     val coroutineScope = rememberCoroutineScope()
 
     suspend fun openEvent() {
         offsetY.snapTo(startPosition)
         offsetY.animateTo(
-            targetValue = -targetPosition,
+            targetValue = targetPosition,
             animationSpec = tween(
                 durationMillis = 350,
             )
@@ -85,8 +83,10 @@ fun SnackBar(
         }
     }
 
-    LaunchedEffect(targetPosition) {
-        openEvent()
+    LaunchedEffect(startPosition) {
+        if (startPosition != Float.MAX_VALUE){
+            openEvent()
+        }
     }
 
     LaunchedEffect(data.duration) {
@@ -108,8 +108,13 @@ fun SnackBar(
 
     Box(
         modifier = Modifier
-            .offset { IntOffset(0, offsetY.value.toInt()) }
-            .padding(bottom = Spacing.S)
+            .offset { IntOffset(0, offsetY.value.toInt() - footerHeight) }
+            .onGloballyPositioned {
+                if (startPosition != it.size.height.toFloat()) {
+                    startPosition = it.size.height.toFloat()
+                    offsetY = Animatable(startPosition)
+                }
+            }
             .fillMaxWidth()
     ) {
         when (data) {
@@ -117,7 +122,4 @@ fun SnackBar(
             is SnackBar.Toast -> {}
         }
     }
-}
-
-
-
+}

package/package.json

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