From a2d08e7268b47fd0fb08458e29b21788aa984d44 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 23 Jun 2022 12:29:46 +0200
Subject: [PATCH] Added clean search field buttons for conference & chat room
 creation

---
 .../contact/ContactsSelectionViewModel.kt     |  4 +++
 .../layout/chat_room_creation_fragment.xml    | 11 +++++-
 ..._scheduling_participants_list_fragment.xml | 36 +++++++++++++------
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt b/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt
index d34a6e782..a85d2f5ea 100644
--- a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt
+++ b/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt
@@ -112,6 +112,10 @@ open class ContactsSelectionViewModel : MessageNotifierViewModel() {
         }
     }
 
+    fun clearFilter() {
+        filter.value = ""
+    }
+
     fun toggleSelectionForSearchResult(searchResult: SearchResult) {
         val address = searchResult.address
         if (address != null) {
diff --git a/app/src/main/res/layout/chat_room_creation_fragment.xml b/app/src/main/res/layout/chat_room_creation_fragment.xml
index 3bf2f63a4..7caff976d 100644
--- a/app/src/main/res/layout/chat_room_creation_fragment.xml
+++ b/app/src/main/res/layout/chat_room_creation_fragment.xml
@@ -160,6 +160,15 @@
             android:backgroundTint="@color/transparent_color"
             android:hint="@string/contact_filter_hint"/>
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/searchBar"
+            android:layout_alignRight="@id/searchBar"
+            android:layout_alignBottom="@id/searchBar"
+            android:onClick="@{() -> viewModel.clearFilter()}"
+            android:src="@drawable/field_clean" />
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -216,7 +225,7 @@
 
         <include
             layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForChatRoomCreation || viewModel.fetchInProgress}"/>
+            bind:visibility="@{viewModel.waitForChatRoomCreation || viewModel.fetchInProgress}" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml b/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml
index 6ca7d29f7..ff3b89a9b 100644
--- a/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml
+++ b/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml
@@ -58,17 +58,33 @@
 
         </LinearLayout>
 
-        <EditText
-            android:text="@={viewModel.filter}"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:inputType="textPersonName"
-            android:layout_margin="10dp"
-            android:drawableLeft="@drawable/search"
-            android:drawablePadding="10dp"
-            android:background="@color/transparent_color"
-            android:backgroundTint="@color/transparent_color"
-            android:hint="@string/contact_filter_hint"/>
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/searchBar"
+                android:text="@={viewModel.filter}"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:inputType="textPersonName"
+                android:layout_margin="10dp"
+                android:drawableLeft="@drawable/search"
+                android:drawablePadding="10dp"
+                android:background="@color/transparent_color"
+                android:backgroundTint="@color/transparent_color"
+                android:hint="@string/contact_filter_hint"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/searchBar"
+                android:layout_alignRight="@id/searchBar"
+                android:layout_alignBottom="@id/searchBar"
+                android:onClick="@{() -> viewModel.clearFilter()}"
+                android:src="@drawable/field_clean" />
+
+        </RelativeLayout>
 
         <HorizontalScrollView
             android:id="@+id/layoutContactsSelected"