From 7d911fff1727a5eb38c831c8e9c3f64b8e3294ca Mon Sep 17 00:00:00 2001
From: ryg-git <ygretharekar@outlook.com>
Date: Mon, 27 Sep 2021 22:41:34 +0530
Subject: [PATCH] Focus on search bar when opening reaction view

---
 .../app/features/reactions/EmojiReactionPickerActivity.kt  | 7 +++++++
 vector/src/main/res/menu/menu_emoji_reaction_picker.xml    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index 7140bb0baa..f39f02af14 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -165,6 +165,12 @@ class EmojiReactionPickerActivity : VectorBaseActivity<ActivityEmojiReactionPick
                 }
             })
 
+            searchView.setOnCloseListener {
+                currentFocus?.clearFocus()
+                searchItem.collapseActionView()
+                true
+            }
+
             searchView.queryTextChanges()
                     .throttleWithTimeout(600, TimeUnit.MILLISECONDS)
                     .doOnError { err -> Timber.e(err) }
@@ -174,6 +180,7 @@ class EmojiReactionPickerActivity : VectorBaseActivity<ActivityEmojiReactionPick
                     }
                     .disposeOnDestroy()
         }
+        searchItem.expandActionView()
         return true
     }
 
diff --git a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
index 4c71bbcb0c..637d709707 100644
--- a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
+++ b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
@@ -7,5 +7,5 @@
         app:iconTint="?vctr_content_primary"
         android:title="@string/search"
         app:actionViewClass="android.widget.SearchView"
-        app:showAsAction="collapseActionView|ifRoom" />
+        app:showAsAction="collapseActionView|always" />
 </menu>