From 4c4d477fe35a683c46ea56ab7c3f17acda8f0d75 Mon Sep 17 00:00:00 2001
From: Thomas Andres Gomez <thomas.andres.gomez@gmail.com>
Date: Tue, 25 Oct 2022 17:35:47 +0200
Subject: [PATCH] Close button behavior change on search

---
 .../com/pixelized/biblib/ui/screen/home/HomeScreen.kt  | 10 +++++++---
 .../home/page/search/viewModel/BookSearchViewModel.kt  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt
index f35f4f7..4695a21 100644
--- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt
@@ -50,9 +50,13 @@ fun HomeScreen(
                             viewModel.filterSearch(criteria = it)
                         },
                         onCloseTap = {
-                            focusManager.clearFocus(force = true)
-                            keyboard?.hide()
-                            searchScaffoldState.collapse()
+                            if (viewModel.search == null) {
+                                focusManager.clearFocus(force = true)
+                                keyboard?.hide()
+                                searchScaffoldState.collapse()
+                            } else {
+                                viewModel.filterSearch(null)
+                            }
                         },
                         onAvatarTap = {
                             homeViewModel.showProfileDialog()
diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/viewModel/BookSearchViewModel.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/viewModel/BookSearchViewModel.kt
index 5c28c54..a4efd7b 100644
--- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/viewModel/BookSearchViewModel.kt
+++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/viewModel/BookSearchViewModel.kt
@@ -52,7 +52,7 @@ class BookSearchViewModel @Inject constructor(
             .cachedIn(viewModelScope + Dispatchers.IO)
     }
 
-    fun filterSearch(criteria: String) {
+    fun filterSearch(criteria: String?) {
         this.search = criteria
         searchSource?.invalidate()
     }