From 0f3c9fb2a01a8a7f05f84cd1d8da2ecf60ec8972 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 12 Jan 2021 10:33:39 +0100
Subject: [PATCH] iFixed issue
 https://github.com/BelledonneCommunications/linphone-android/issues/1269 by
 replacing SearchView by EditText..., TODO: use our own search icon

---
 .../org/linphone/utils/DataBindingUtils.kt    | 26 -------------------
 .../contact_master_fragment.xml               | 13 +++++-----
 .../layout/chat_room_creation_fragment.xml    | 14 +++++-----
 .../res/layout/contact_master_fragment.xml    | 13 +++++-----
 4 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index cb3e5104d..bdac98df0 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -505,29 +505,3 @@ fun setEditTextErrorListener(editText: EditText, attrChange: InverseBindingListe
         override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
     })
 }
-
-@BindingAdapter("queryValue")
-fun setSearchViewQuery(view: SearchView, query: String?) {
-    if (query != view.query) {
-        view.setQuery(query, false)
-    }
-}
-
-@InverseBindingAdapter(attribute = "queryValue")
-fun getSearchViewQuery(view: SearchView): String? {
-    return view.query?.toString()
-}
-
-@BindingAdapter("queryValueAttrChanged")
-fun setSearchViewQueryListener(view: SearchView, attrChange: InverseBindingListener) {
-    view.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-        override fun onQueryTextSubmit(query: String?): Boolean {
-            return true
-        }
-
-        override fun onQueryTextChange(newText: String?): Boolean {
-            attrChange.onChange()
-            return true
-        }
-    })
-}
diff --git a/app/src/main/res/layout-sw533dp/contact_master_fragment.xml b/app/src/main/res/layout-sw533dp/contact_master_fragment.xml
index 4e59ddac6..93490f23e 100644
--- a/app/src/main/res/layout-sw533dp/contact_master_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/contact_master_fragment.xml
@@ -128,18 +128,19 @@
                     android:layout_alignTop="@id/top_bar"
                     tools:layout="@layout/list_edit_top_bar_fragment" />
 
-                <SearchView
+                <EditText
                     android:id="@+id/searchBar"
-                    queryValue="@={viewModel.filter}"
+                    android:text="@={viewModel.filter}"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
-                    android:gravity="center"
-                    android:iconifiedByDefault="false"
                     android:inputType="textPersonName"
                     android:layout_below="@id/top_bar"
                     android:layout_margin="10dp"
-                    android:queryBackground="@color/transparent_color"
-                    android:queryHint="@string/contact_filter_hint"/>
+                    android:drawableLeft="@android:drawable/ic_menu_search"
+                    android:drawablePadding="10dp"
+                    android:background="@color/transparent_color"
+                    android:backgroundTint="@color/transparent_color"
+                    android:hint="@string/contact_filter_hint"/>
 
                 <View
                     android:layout_width="match_parent"
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 a943762bc..b5b001848 100644
--- a/app/src/main/res/layout/chat_room_creation_fragment.xml
+++ b/app/src/main/res/layout/chat_room_creation_fragment.xml
@@ -148,19 +148,19 @@
 
         </LinearLayout>
 
-        <SearchView
+        <EditText
             android:id="@+id/searchBar"
-            queryValue="@={viewModel.filter}"
+            android:text="@={viewModel.filter}"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:gravity="center"
-            android:iconifiedByDefault="false"
             android:inputType="textPersonName"
             android:layout_below="@id/top_bar"
             android:layout_margin="10dp"
-            android:paddingRight="5dp"
-            android:queryBackground="@color/transparent_color"
-            android:queryHint="@string/contact_filter_hint"/>
+            android:drawableLeft="@android:drawable/ic_menu_search"
+            android:drawablePadding="10dp"
+            android:background="@color/transparent_color"
+            android:backgroundTint="@color/transparent_color"
+            android:hint="@string/contact_filter_hint"/>
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/contact_master_fragment.xml b/app/src/main/res/layout/contact_master_fragment.xml
index 7b7c90e18..2fc9aa233 100644
--- a/app/src/main/res/layout/contact_master_fragment.xml
+++ b/app/src/main/res/layout/contact_master_fragment.xml
@@ -118,18 +118,19 @@
             android:layout_alignTop="@id/top_bar"
             tools:layout="@layout/list_edit_top_bar_fragment" />
 
-        <SearchView
+        <EditText
             android:id="@+id/searchBar"
-            queryValue="@={viewModel.filter}"
+            android:text="@={viewModel.filter}"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_below="@id/top_bar"
             android:layout_margin="10dp"
-            android:gravity="center"
-            android:iconifiedByDefault="false"
             android:inputType="textPersonName"
-            android:queryBackground="@color/transparent_color"
-            android:queryHint="@string/contact_filter_hint"/>
+            android:drawableLeft="@android:drawable/ic_menu_search"
+            android:drawablePadding="10dp"
+            android:background="@color/transparent_color"
+            android:backgroundTint="@color/transparent_color"
+            android:hint="@string/contact_filter_hint"/>
 
         <View
             android:layout_width="match_parent"