Skip to content

Commit e9535ef

Browse files
committed
isExpanded added, version change.
1 parent 7dd1f37 commit e9535ef

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class MainActivity : ComponentActivity() {
5757
initialHorizontalPadding = 64.dp,
5858
initialWidth = 240.dp,
5959
targetWidth = maxWidth,
60-
mainContent = { page ->
60+
mainContent = { page, isExpanded ->
6161
AsyncImage(
6262
modifier = Modifier.fillMaxSize(),
6363
model = ImageRequest.Builder(LocalContext.current)

expandable-horizontal-pager/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ afterEvaluate {
5757

5858
groupId = 'com.github.commandiron'
5959
artifactId = 'expandable-horizontal-pager'
60-
version = '1.0.6'
60+
version = '1.0.7'
6161
}
6262
}
6363
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun ExpandableHorizontalPager(
4444
targetWidth: Dp = 300.dp,
4545
aspectRatio: Float = 2 / 3f,
4646
durationMillis: Int = 400,
47-
mainContent: @Composable ColumnScope.(page: Int) -> Unit,
47+
mainContent: @Composable ColumnScope.(page: Int, isExpanded: Boolean) -> Unit,
4848
overMainContentCollapsed: @Composable ColumnScope.(page: Int) -> Unit,
4949
overMainContentExpanded: @Composable ColumnScope.(page: Int) -> Unit,
5050
hiddenContentBoxHeight: Dp = Dp.Unspecified,
@@ -288,14 +288,14 @@ fun ExpandableHorizontalPager(
288288
shape = RoundedCornerShape(cornerSize)
289289
) {
290290
Box() {
291+
val isExpanded = transformState == ExpandablePagerTransformState.TARGET ||
292+
transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
291293
Column() {
292-
mainContent(page)
294+
mainContent(page, isExpanded)
293295
}
294-
val isExpand = transformState == ExpandablePagerTransformState.TARGET ||
295-
transformState == ExpandablePagerTransformState.INITIAL_TO_TARGET
296296
Column() {
297297
AnimatedVisibility(
298-
visible = !isExpand,
298+
visible = !isExpanded,
299299
enter = fadeIn(tween(durationMillis)),
300300
exit = fadeOut(tween(durationMillis))
301301
) {
@@ -304,7 +304,7 @@ fun ExpandableHorizontalPager(
304304
}
305305
Column() {
306306
AnimatedVisibility(
307-
visible = isExpand,
307+
visible = isExpanded,
308308
enter = fadeIn(tween(durationMillis)),
309309
exit = fadeOut(tween(durationMillis))
310310
) {

0 commit comments

Comments
 (0)