@momo-kits/native-kits 0.160.1-beta.8-debug → 0.160.1-beta.9-debug

package/compose/build.gradle.kts

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

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

@@ -174,6 +174,10 @@ internal fun StackScreen(
                 HeaderBackground()
             }
 
+            Box(Modifier.zIndex(1.5f)) {
+                AnimatedHeaderImage()
+            }
+
             Box(Modifier.zIndex(5f)) {
                 Header(onBackHandler)
             }
@@ -231,7 +235,7 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
     val scrollState = LocalScrollState.current
 
     Spacer(Modifier.height(
-        if (options.headerType is HeaderType.DefaultOrExtended || (options.headerType is HeaderType.Transparent && !options.headerType.isFullScreenContent))
+        if (options.headerType is HeaderType.DefaultOrExtended || (options.headerType is HeaderType.Transparent && !options.headerType.isFullScreenContent) || options.headerType is HeaderType.Animated)
             AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp)
     )
     if (inputSearchType == InputSearchType.Animated){
@@ -246,7 +250,7 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
     Column (Modifier
         .fillMaxWidth()
         .weight(1f)
-        .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
+        .conditional(options.scrollData.scrollable && options.scrollData.scrollState !is LazyListState) {
             verticalScroll(scrollState)
         }
     ) {
@@ -262,24 +266,37 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
 
 @Composable
 fun ScreenContent(content: @Composable () -> Unit){
-    val scrollState = LocalScrollState.current
     val options = LocalOptions.current
 
     if (options.headerType is HeaderType.Animated){
         val animatedHeader = options.headerType
-        Box {
-            Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)){
-                animatedHeader.composable.invoke(scrollState.value)
-            }
-            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)){
-                content()
-            }
+        Column {
+            Spacer(Modifier.height(animatedHeader.layoutOffSet))
+            content()
         }
     } else {
         content()
     }
 }
 
+@Composable
+fun AnimatedHeaderImage() {
+    val options = LocalOptions.current
+    val scrollState = LocalScrollState.current
+    val animatedHeader = options.headerType as? HeaderType.Animated ?: return
+    val density = LocalDensity.current
+    val scrollDp = with(density) { scrollState.value.toDp() }
+
+    Box(
+        Modifier
+            .fillMaxWidth()
+            .offset(y = -scrollDp)
+            .aspectRatio(animatedHeader.aspectRatio.value)
+    ) {
+        animatedHeader.composable.invoke(scrollState.value)
+    }
+}
+
 @Composable
 fun FooterContent(){
     val options = LocalOptions.current

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-beta.8-debug",
+  "version": "0.160.1-beta.9-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},