From e81ec26fe8af1e9a501ef484e01abb0d19641636 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Thu, 19 Jan 2023 19:18:58 +0100
Subject: [PATCH] Improve pager layout scrolling

---
 .../mm20/launcher2/ui/launcher/PagerScaffold.kt   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
index 0d0e19e1..41738d5c 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
@@ -2,7 +2,9 @@ package de.mm20.launcher2.ui.launcher
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.animation.slideIn
 import androidx.compose.animation.slideOut
 import androidx.compose.foundation.LocalOverscrollConfiguration
@@ -27,6 +29,7 @@ import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PagerDefaults
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -309,9 +312,13 @@ fun PagerScaffold(
                     reverseLayout = reverse,
                     state = pagerState,
                     userScrollEnabled = !isWidgetEditMode,
+                    flingBehavior = PagerDefaults.flingBehavior(
+                        state = pagerState,
+                        lowVelocityAnimationSpec = spring(
+                            stiffness = Spring.StiffnessMediumLow,
+                        ),
+                    )
                 ) {
-                    val pagerProgress =
-                        pagerState.currentPage + pagerState.currentPageOffsetFraction
                     when (it) {
                         0 -> {
                             val editModePadding by animateDpAsState(if (isWidgetEditMode && bottomSearchBar) 56.dp else 0.dp)
@@ -349,6 +356,8 @@ fun PagerScaffold(
                                     .verticalScroll(widgetsScrollState)
                                     .windowInsetsPadding(WindowInsets.safeDrawing)
                                     .graphicsLayer {
+                                        val pagerProgress =
+                                            pagerState.currentPage + pagerState.currentPageOffsetFraction
                                         alpha = 1f - pagerProgress
                                     }
                                     .padding(8.dp)
@@ -404,6 +413,8 @@ fun PagerScaffold(
                                     .requiredWidth(width)
                                     .fillMaxHeight()
                                     .graphicsLayer {
+                                        val pagerProgress =
+                                            pagerState.currentPage + pagerState.currentPageOffsetFraction
                                         alpha = pagerProgress
                                     }
                                     .nestedScroll(searchNestedScrollConnection)