some fix.

Author: commandiron

app/src/main/java/com/commandiron/expandablehorizontalpagercompose/MainActivity.kt

@@ -3,6 +3,7 @@ package com.commandiron.expandablehorizontalpagercompose
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
@@ -14,6 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
@@ -64,13 +66,13 @@ class MainActivity : ComponentActivity() {
                             )
                         },
                         overMainContentExpanded = { page ->
-                            OverMainContentExpanded(
+                            OverMainContent(
                                 title = "Details",
                                 imageVector = Icons.Default.KeyboardArrowDown
                             )
                         },
                         overMainContentCollapsed = { page ->
-                            OverMainContentExpanded(
+                            OverMainContent(
                                 title = "Close",
                                 imageVector = Icons.Default.KeyboardArrowUp,
                                 iconOnTop = true
@@ -89,35 +91,51 @@ class MainActivity : ComponentActivity() {
 }
 
 @Composable
-fun OverMainContentExpanded(
+fun OverMainContent(
     title: String,
     imageVector: ImageVector,
     iconOnTop: Boolean = false
 ) {
-    if(iconOnTop) {
-        Icon(
-            modifier = Modifier
-                .size(16.dp),
-            imageVector = imageVector,
-            contentDescription = null,
-            tint = Color.White
-        )
-    }
-    Text(
-        text = title,
-        fontSize = 14.sp,
-        color = Color.White
-    )
-    if(!iconOnTop) {
-        Icon(
-            modifier = Modifier
-                .size(16.dp),
-            imageVector = imageVector,
-            contentDescription = null,
-            tint = Color.White
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(
+                brush = Brush.verticalGradient(
+                    listOf(
+                        Color.Transparent,
+                        Color.Transparent,
+                        Color.Black.copy(alpha = 0.65f)
+                    )
+                )
+            ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Bottom
+    ) {
+        if(iconOnTop) {
+            Icon(
+                modifier = Modifier
+                    .size(16.dp),
+                imageVector = imageVector,
+                contentDescription = null,
+                tint = Color.White
+            )
+        }
+        Text(
+            text = title,
+            fontSize = 14.sp,
+            color = Color.White
         )
+        if(!iconOnTop) {
+            Icon(
+                modifier = Modifier
+                    .size(16.dp),
+                imageVector = imageVector,
+                contentDescription = null,
+                tint = Color.White
+            )
+        }
+        Spacer(Modifier.height(8.dp))
     }
-    Spacer(Modifier.height(8.dp))
 }
 
 @Composable

expandable-horizontal-pager/src/main/java/com/commandiron/expandable_horizontal_pager/ExpandableHorizontalPager.kt

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.draggable
@@ -18,7 +17,6 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.Dp
@@ -56,7 +54,7 @@ fun ExpandableHorizontalPager(
 ) {
     var state by rememberSaveable { mutableStateOf(ExpandablePagerState.INITIAL) }
 
-    fun animationFinish(expandablePagerState: ExpandablePagerState) {
+    fun setStateOnAnimationFinish(expandablePagerState: ExpandablePagerState) {
         when (expandablePagerState) {
             ExpandablePagerState.INITIAL_TO_TARGET -> {
                 state = ExpandablePagerState.TARGET
@@ -91,7 +89,7 @@ fun ExpandableHorizontalPager(
             durationMillis = durationMillis
         ),
         finishedListener = {
-            animationFinish(state)
+            setStateOnAnimationFinish(state)
         }
     )
 
@@ -111,7 +109,7 @@ fun ExpandableHorizontalPager(
             durationMillis = durationMillis
         ),
         finishedListener = {
-            animationFinish(state)
+            setStateOnAnimationFinish(state)
         }
     )
 
@@ -168,8 +166,6 @@ fun ExpandableHorizontalPager(
 
             cornerSizeState = 16.dp
         }
-
-
     }
 
     HorizontalPager(
@@ -193,11 +189,7 @@ fun ExpandableHorizontalPager(
                         if (currentPage == page) {
                             boxHeight
                         } else {
-                            if(state == ExpandablePagerState.TARGET) {
-                                boxHeight
-                            } else {
-                                0.dp
-                            }
+                            if(state == ExpandablePagerState.TARGET) boxHeight else 0.dp
                         }
                     )
                     .offset(
@@ -305,23 +297,7 @@ fun ExpandableHorizontalPager(
                             enter = fadeIn(tween(durationMillis)),
                             exit = fadeOut(tween(durationMillis))
                         ) {
-                            Column(
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .background(
-                                        brush = Brush.verticalGradient(
-                                            listOf(
-                                                Color.Transparent,
-                                                Color.Transparent,
-                                                Color.Black.copy(alpha = 0.65f)
-                                            )
-                                        )
-                                    ),
-                                horizontalAlignment = Alignment.CenterHorizontally,
-                                verticalArrangement = Arrangement.Bottom
-                            ) {
-                                overMainContentExpanded(page)
-                            }
+                            overMainContentExpanded(page)
                         }
                     }
                     Column() {
@@ -331,23 +307,7 @@ fun ExpandableHorizontalPager(
                             enter = fadeIn(tween(durationMillis)),
                             exit = fadeOut(tween(durationMillis))
                         ) {
-                            Column(
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .background(
-                                        brush = Brush.verticalGradient(
-                                            listOf(
-                                                Color.Transparent,
-                                                Color.Transparent,
-                                                Color.Black.copy(alpha = 0.65f)
-                                            )
-                                        )
-                                    ),
-                                horizontalAlignment = Alignment.CenterHorizontally,
-                                verticalArrangement = Arrangement.Bottom
-                            ) {
-                                overMainContentCollapsed(page)
-                            }
+                            overMainContentCollapsed(page)
                         }
                     }
                 }