From b0f3ddf32576d47d3be13c0f9f693e17af522863 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 21 Jan 2023 13:34:07 +0100
Subject: [PATCH] Bring the search bar back into view when pressing back

---
 .../java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt     | 6 +++++-
 .../java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

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 b5a26296..3d0d75aa 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
@@ -219,6 +219,8 @@ fun PagerScaffold(
         }
     }
 
+    val searchBarOffset = remember { mutableStateOf(0f) }
+
     val scope = rememberCoroutineScope()
     BackHandler {
         when {
@@ -235,6 +237,9 @@ fun PagerScaffold(
                 scope.launch {
                     widgetsScrollState.animateScrollTo(0)
                 }
+                scope.launch {
+                    searchBarOffset.animateTo(0f)
+                }
             }
         }
     }
@@ -243,7 +248,6 @@ fun PagerScaffold(
 
     val gestureManager = LocalGestureDetector.current
 
-    val searchBarOffset = remember { mutableStateOf(0f) }
     val density = LocalDensity.current
     val maxSearchBarOffset = with(density) { 128.dp.toPx() }
 
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
index db7f9850..f38315c6 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
@@ -259,6 +259,9 @@ fun PullDownScaffold(
                 scope.launch {
                     widgetsScrollState.animateScrollTo(0)
                 }
+                scope.launch {
+                    searchBarOffset.animateTo(0f)
+                }
             }
         }
     }