A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into kotlinify
Simon Marquisb6d82e24df50
diff --cc core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.ktindex 0984317b9,a55f62f5f..76fab08d0--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ScrollbarExt.kt@@@ -177,57 -178,62 +178,57 @@@ fun LazyGridState.scrollbarStatefun LazyStaggeredGridState.scrollbarState(itemsAvailable: Int,itemIndex: (LazyStaggeredGridItemInfo) -> Int = LazyStaggeredGridItemInfo::index,- ): ScrollbarState = produceState(- initialValue = ScrollbarState.FULL,- key1 = this,- key2 = itemsAvailable,- ) {- snapshotFlow {- if (itemsAvailable == 0) return@snapshotFlow null-- val visibleItemsInfo = layoutInfo.visibleItemsInfo- if (visibleItemsInfo.isEmpty()) return@snapshotFlow null-- val firstIndex = min(- a = interpolateFirstItemIndex(- visibleItems = visibleItemsInfo,- itemSize = { layoutInfo.orientation.valueOf(it.size) },- offset = { layoutInfo.orientation.valueOf(it.offset) },- nextItemOnMainAxis = { first ->- visibleItemsInfo.find { it != first && it.lane == first.lane }- },- itemIndex = itemIndex,- ),- b = itemsAvailable.toFloat(),- )- if (firstIndex.isNaN()) return@snapshotFlow null-- val itemsVisible = visibleItemsInfo.floatSumOf { itemInfo ->- itemVisibilityPercentage(- itemSize = layoutInfo.orientation.valueOf(itemInfo.size),- itemStartOffset = layoutInfo.orientation.valueOf(itemInfo.offset),- viewportStartOffset = layoutInfo.viewportStartOffset,- viewportEndOffset = layoutInfo.viewportEndOffset,+ ): ScrollbarState {+ val state = remember { ScrollbarState() }+ LaunchedEffect(this, itemsAvailable) {+ snapshotFlow {+ if (itemsAvailable == 0) return@snapshotFlow null++ val visibleItemsInfo = layoutInfo.visibleItemsInfo+ if (visibleItemsInfo.isEmpty()) return@snapshotFlow null++ val firstIndex = min(+ a = interpolateFirstItemIndex(+ visibleItems = visibleItemsInfo,+ itemSize = { layoutInfo.orientation.valueOf(it.size) },+ offset = { layoutInfo.orientation.valueOf(it.offset) },+ nextItemOnMainAxis = { first ->+ visibleItemsInfo.find { it != first && it.lane == first.lane }+ },+ itemIndex = itemIndex,+ ),+ b = itemsAvailable.toFloat(),+ )+ if (firstIndex.isNaN()) return@snapshotFlow null++ val itemsVisible = visibleItemsInfo.floatSumOf { itemInfo ->+ itemVisibilityPercentage(+ itemSize = layoutInfo.orientation.valueOf(itemInfo.size),+ itemStartOffset = layoutInfo.orientation.valueOf(itemInfo.offset),+ viewportStartOffset = layoutInfo.viewportStartOffset,+ viewportEndOffset = layoutInfo.viewportEndOffset,+ )+ }++ val thumbTravelPercent = min(+ a = firstIndex / itemsAvailable,+ b = 1f,+ )+ val thumbSizePercent = min(+ a = itemsVisible / itemsAvailable,+ b = 1f,+ )+ scrollbarStateValue(+ thumbSizePercent = thumbSizePercent,+ thumbMovedPercent = thumbTravelPercent,)}-- val thumbTravelPercent = min(- a = firstIndex / itemsAvailable,- b = 1f,- )- val thumbSizePercent = min(- a = itemsVisible / itemsAvailable,- b = 1f,- )- ScrollbarState(- thumbSizePercent = thumbSizePercent,- thumbMovedPercent = thumbTravelPercent,- )+ .filterNotNull()+ .distinctUntilChanged()+ .collect { state.onScroll(it) }}- .filterNotNull()- .distinctUntilChanged()- .collect { value = it }- }.value+ return state+ }-private inline fun <T> List<T>.floatSumOf(selector: (T) -> Float): Float {- var sum = 0f- for (element in this) {- sum += selector(element)- }- return sum-}+private inline fun <T> List<T>.floatSumOf(selector: (T) -> Float): Float =+ fold(0f) { acc, it -> acc + selector(it) }