Skip to content

Add reverse layout option with ReorderableLazyStaggeredGrid #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hueachilles wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add reverse layout option with ReorderableLazyStaggeredGrid #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions reorderable/src/commonMain/kotlin/sh/calvin/reorderable/ReorderableLazyStaggeredGrid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ fun rememberReorderableLazyStaggeredGridState(
pixelAmountProvider = { lazyStaggeredGridState.layoutInfo.mainAxisViewportSize * ScrollAmountMultiplier },
),
scrollMoveMode: ScrollMoveMode = ScrollMoveMode.SWAP,
reverseLayout: Boolean = false,
onMove: suspend CoroutineScope.(from: LazyStaggeredGridItemInfo, to: LazyStaggeredGridItemInfo) -> Unit,
): ReorderableLazyStaggeredGridState {
val density = LocalDensity.current
Expand All @@ -86,7 +87,7 @@ fun rememberReorderableLazyStaggeredGridState(
bottom = with(density) { scrollThresholdPadding.calculateBottomPadding().toPx() },
)
val state = remember(
scope, lazyStaggeredGridState, scrollThreshold, scrollThresholdPadding, scroller,
scope, lazyStaggeredGridState, scrollThreshold, scrollThresholdPadding, scroller, reverseLayout,
) {
ReorderableLazyStaggeredGridState(
state = lazyStaggeredGridState,
Expand All @@ -97,6 +98,7 @@ fun rememberReorderableLazyStaggeredGridState(
scroller = scroller,
scrollMoveMode = scrollMoveMode,
layoutDirection = layoutDirection,
reverseLayout = reverseLayout,
)
}
return state
Expand All @@ -123,7 +125,7 @@ private fun LazyStaggeredGridItemInfo.toLazyCollectionItemInfo() =

}

private fun LazyStaggeredGridLayoutInfo.toLazyCollectionLayoutInfo() =
private fun LazyStaggeredGridLayoutInfo.toLazyCollectionLayoutInfo(reverseLayout: Boolean) =
object : LazyCollectionLayoutInfo<LazyStaggeredGridItemInfo> {
override val visibleItemsInfo: List<LazyCollectionItemInfo<LazyStaggeredGridItemInfo>>
get() = this@toLazyCollectionLayoutInfo.visibleItemsInfo.map {
Expand All @@ -133,20 +135,21 @@ private fun LazyStaggeredGridLayoutInfo.toLazyCollectionLayoutInfo() =
get() = this@toLazyCollectionLayoutInfo.viewportSize
override val orientation: Orientation
get() = this@toLazyCollectionLayoutInfo.orientation
override val reverseLayout: Boolean = false
override val reverseLayout: Boolean
get() = reverseLayout
override val beforeContentPadding: Int
get() = this@toLazyCollectionLayoutInfo.beforeContentPadding

}

private fun LazyStaggeredGridState.toLazyCollectionState() =
private fun LazyStaggeredGridState.toLazyCollectionState(reverseLayout: Boolean) =
object : LazyCollectionState<LazyStaggeredGridItemInfo> {
override val firstVisibleItemIndex: Int
get() = this@toLazyCollectionState.firstVisibleItemIndex
override val firstVisibleItemScrollOffset: Int
get() = this@toLazyCollectionState.firstVisibleItemScrollOffset
override val layoutInfo: LazyCollectionLayoutInfo<LazyStaggeredGridItemInfo>
get() = this@toLazyCollectionState.layoutInfo.toLazyCollectionLayoutInfo()
get() = this@toLazyCollectionState.layoutInfo.toLazyCollectionLayoutInfo(reverseLayout)

override suspend fun animateScrollBy(value: Float, animationSpec: AnimationSpec<Float>) =
this@toLazyCollectionState.animateScrollBy(value, animationSpec)
Expand All @@ -171,8 +174,9 @@ class ReorderableLazyStaggeredGridState internal constructor(
scroller: Scroller,
scrollMoveMode: ScrollMoveMode,
layoutDirection: LayoutDirection,
reverseLayout: Boolean,
) : ReorderableLazyCollectionState<LazyStaggeredGridItemInfo>(
state.toLazyCollectionState(),
state.toLazyCollectionState(reverseLayout),
scope,
onMoveState,
scrollThreshold,
Expand Down