From e9f0bed2d2f556a164a3763960ddc3ed8bd19a9e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 26 Apr 2024 10:02:02 +0200
Subject: [PATCH] Close search bar when clicking on clear filter button if
 filter is empty

---
 .../linphone/ui/main/viewmodel/AbstractMainViewModel.kt    | 7 ++++++-
 app/src/main/res/layout/top_bar.xml                        | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
index 36671d9d2..ae3f622fc 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
@@ -201,7 +201,12 @@ open class AbstractMainViewModel @UiThread constructor() : ViewModel() {
 
     @UiThread
     fun clearFilter() {
-        searchFilter.value = ""
+        if (searchFilter.value.orEmpty().isEmpty()) {
+            searchBarVisible.value = false
+            focusSearchBarEvent.value = Event(false)
+        } else {
+            searchFilter.value = ""
+        }
     }
 
     @UiThread
diff --git a/app/src/main/res/layout/top_bar.xml b/app/src/main/res/layout/top_bar.xml
index 68d065ccd..bed8af872 100644
--- a/app/src/main/res/layout/top_bar.xml
+++ b/app/src/main/res/layout/top_bar.xml
@@ -117,7 +117,6 @@
         <ImageView
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
-            android:enabled="@{viewModel.searchFilter.length() > 0}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:padding="15dp"