From 429025e5ac100b6aaf9e3f38a19b2a4934cc80c2 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 30 Jun 2024 13:11:57 +0200
Subject: [PATCH] Make popups more bouncy

---
 .../launcher/search/common/grid/GridItem.kt   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
index e0fe2324..145a6218 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt
@@ -3,6 +3,9 @@ package de.mm20.launcher2.ui.launcher.search.common.grid
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.SpringSpec
+import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -202,16 +205,20 @@ fun ItemPopup(origin: Rect, searchable: Searchable, onDismissRequest: () -> Unit
         }
     }
     val animationProgress = remember {
-        Animatable(0f).apply {
-            updateBounds(0f, 1f)
-        }
+        Animatable(0f)
     }
     LaunchedEffect(show.targetState) {
         if (!show.targetState) {
-            animationProgress.animateTo(0f, tween(300))
+            animationProgress.animateTo(0f, spring(
+                Spring.DampingRatioNoBouncy,
+                Spring.StiffnessMediumLow,
+            ))
             onDismissRequest()
         } else {
-            animationProgress.animateTo(1f, tween(300))
+            animationProgress.animateTo(1f, spring(
+                Spring.DampingRatioLowBouncy,
+                Spring.StiffnessMediumLow,
+            ))
         }
     }
     BackHandler {
@@ -221,7 +228,7 @@ fun ItemPopup(origin: Rect, searchable: Searchable, onDismissRequest: () -> Unit
     Overlay {
         Box(
             modifier = Modifier
-                .background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.32f * animationProgress.value))
+                .background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.32f * animationProgress.value.coerceIn(0f, 1f)))
                 .fillMaxSize()
                 .systemBarsPadding()
                 .imePadding()