isExpanded added, version change.

commandiron · Oct 13, 2022 · e9535ef · e9535ef
1 parent 7dd1f37
commit e9535ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/commandiron/expandablehorizontalpagercompose/MainActivity.kt b/app/src/main/java/com/commandiron/expandablehorizontalpagercompose/MainActivity.kt
@@ -57,7 +57,7 @@ class MainActivity : ComponentActivity() {
                         initialHorizontalPadding = 64.dp,
                         initialWidth = 240.dp,
                         targetWidth = maxWidth,
-                        mainContent = { page ->
+                        mainContent = { page, isExpanded ->
                             AsyncImage(
                                 modifier = Modifier.fillMaxSize(),
                                 model = ImageRequest.Builder(LocalContext.current)

diff --git a/expandable-horizontal-pager/build.gradle b/expandable-horizontal-pager/build.gradle
@@ -57,7 +57,7 @@ afterEvaluate {
 
                 groupId = 'com.git.luolix.topmandiron'
                 artifactId = 'expandable-horizontal-pager'
-                version = '1.0.6'
+                version = '1.0.7'
             }
         }
     }

diff --git a/...er/src/main/java/com/commandiron/expandable_horizontal_pager/ExpandableHorizontalPager.kt b/...er/src/main/java/com/commandiron/expandable_horizontal_pager/ExpandableHorizontalPager.kt
@@ -44,7 +44,7 @@ fun ExpandableHorizontalPager(
     targetWidth: Dp = 300.dp,
     aspectRatio: Float = 2 / 3f,
     durationMillis: Int = 400,
-    mainContent: @Composable ColumnScope.(page: Int) -> Unit,
+    mainContent: @Composable ColumnScope.(page: Int, isExpanded: Boolean) -> Unit,
     overMainContentCollapsed: @Composable ColumnScope.(page: Int) -> Unit,
     overMainContentExpanded: @Composable ColumnScope.(page: Int) -> Unit,
     hiddenContentBoxHeight: Dp = Dp.Unspecified,
@@ -288,14 +288,14 @@ fun ExpandableHorizontalPager(
                 shape = RoundedCornerShape(cornerSize)
             ) {
                 Box() {
+                    val isExpanded = transformState == ExpandablePagerTransformState.TARGET ||
+                            transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
                     Column() {
-                        mainContent(page)
+                        mainContent(page, isExpanded)
                     }
-                    val isExpand = transformState == ExpandablePagerTransformState.TARGET ||
-                            transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
                     Column() {
                         AnimatedVisibility(
-                            visible = !isExpand,
+                            visible = !isExpanded,
                             enter = fadeIn(tween(durationMillis)),
                             exit = fadeOut(tween(durationMillis))
                         ) {
@@ -304,7 +304,7 @@ fun ExpandableHorizontalPager(
                     }
                     Column() {
                         AnimatedVisibility(
-                            visible = isExpand,
+                            visible = isExpanded,
                             enter = fadeIn(tween(durationMillis)),
                             exit = fadeOut(tween(durationMillis))
                         ) {