fix, onTransform added, version change.

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

Hide file tree

Showing 3 changed files with 18 additions and 9 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, isExpanded ->
+                        mainContent = { page ->
                             AsyncImage(
                                 modifier = Modifier.fillMaxSize(),
                                 model = ImageRequest.Builder(LocalContext.current)
@@ -86,6 +86,9 @@ class MainActivity : ComponentActivity() {
                                 title = films[page].title,
                                 overview = films[page].overview
                             )
+                        },
+                        onTransform = { isExpanded ->
+                            println(isExpanded)
                         }
                     )
                 }

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.7'
+                version = '1.0.8'
             }
         }
     }

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,13 +44,14 @@ fun ExpandableHorizontalPager(
     targetWidth: Dp = 300.dp,
     aspectRatio: Float = 2 / 3f,
     durationMillis: Int = 400,
-    mainContent: @Composable ColumnScope.(page: Int, isExpanded: Boolean) -> Unit,
-    overMainContentCollapsed: @Composable ColumnScope.(page: Int) -> Unit,
-    overMainContentExpanded: @Composable ColumnScope.(page: Int) -> Unit,
+    mainContent: @Composable ColumnScope.(page: Int) -> Unit,
+    overMainContentCollapsed: @Composable ColumnScope.(page: Int) -> Unit = {},
+    overMainContentExpanded: @Composable ColumnScope.(page: Int) -> Unit = {},
     hiddenContentBoxHeight: Dp = Dp.Unspecified,
     hiddenContentContainerColor: Color = Color.Black,
     hiddenContentContentColor: Color = Color.White,
     hiddenContent: @Composable ColumnScope.(page: Int) -> Unit,
+    onTransform: (isExpanded: Boolean) -> Unit = {}
 ) {
     var transformState by rememberSaveable { mutableStateOf(ExpandablePagerTransformState.INITIAL) }
 
@@ -183,6 +184,8 @@ fun ExpandableHorizontalPager(
                 .fillMaxSize(),
             Alignment.Center
         ) {
+            val isExpanded = transformState == ExpandablePagerTransformState.TARGET ||
+                    transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
             Card(
                 modifier = Modifier
                     .width(contentWidth)
@@ -230,7 +233,10 @@ fun ExpandableHorizontalPager(
                         .draggable(
                             orientation = Orientation.Vertical,
                             state = rememberDraggableState {},
-                            onDragStarted = { expand(this@BoxWithConstraints.maxHeight) }
+                            onDragStarted = {
+                                onTransform(!isExpanded)
+                                expand(this@BoxWithConstraints.maxHeight)
+                            }
                         ),
                     contentAlignment = Alignment.Center
                 ) {
@@ -277,21 +283,21 @@ fun ExpandableHorizontalPager(
                         orientation = Orientation.Vertical,
                         state = rememberDraggableState {},
                         onDragStarted = {
+                            onTransform(!isExpanded)
                             expand(maxHeight)
                         }
                     )
                     .clickable(
                         enabled = currentPage == page,
                     ) {
+                        onTransform(!isExpanded)
                         expand(maxHeight)
                     },
                 shape = RoundedCornerShape(cornerSize)
             ) {
                 Box() {
-                    val isExpanded = transformState == ExpandablePagerTransformState.TARGET ||
-                            transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
                     Column() {
-                        mainContent(page, isExpanded)
+                        mainContent(page)
                     }
                     Column() {
                         AnimatedVisibility(