From 87769ead4168bd49edb1d9c9d4c13654f6291a19 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 23 Apr 2023 20:57:22 +0200 Subject: [PATCH] improve search bar unfocusing --- .../main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt | 2 +- .../main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt | 2 +- 2 files changed, 2 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 d6425584..fdedea61 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 @@ -299,7 +299,7 @@ fun PagerScaffold( object : NestedScrollConnection { override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { if (source == NestedScrollSource.Drag && available.y.absoluteValue > available.x.absoluteValue * 2) { - keyboardController?.hide() + viewModel.setSearchbarFocus(false) searchVM.bestMatch.value = null } return super.onPreScroll(available, source) 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 57251740..8638a5e1 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 @@ -277,7 +277,7 @@ fun PullDownScaffold( override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { if (isWidgetEditMode || source != NestedScrollSource.Drag) return Offset.Zero if (available.y.absoluteValue > available.x.absoluteValue * 2) { - keyboardController?.hide() + viewModel.setSearchbarFocus(false) searchVM.bestMatch.value = null } val canPullDown = if (isSearchOpen) {