Dismiss emoji keyboard when starting search

Tunous · Tunous · commit 4cf60e3688f2 · 2018-10-20T12:01:46.000+02:00
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -271,7 +271,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         activity?.invalidateOptionsMenu()
     }
 
-    private fun dismissEmojiKeyboard() {
+    fun dismissEmojiKeyboard() {
         // Check if the keyboard was ever initialized.
         // It may be the case when you are looking a not joined room
         if (::emojiKeyboardPopup.isInitialized) {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt
@@ -79,6 +79,14 @@ private fun ChatRoomFragment.setupSearchMessageMenuItem(menu: Menu, context: Con
         .setShowAsActionFlags(
             MenuItem.SHOW_AS_ACTION_IF_ROOM or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
         )
+        .setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                dismissEmojiKeyboard()
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?) = true
+        })
 
     (searchItem?.actionView as? SearchView)?.let {
         // TODO: Check why we need to stylize the search text programmatically instead of by defining it in the styles.xml (ChatRoom.SearchView)

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR`
`271`	`271`	`activity?.invalidateOptionsMenu()`
`272`	`272`	`}`
`273`	`273`
`274`		`- private fun dismissEmojiKeyboard() {`
	`274`	`+ fun dismissEmojiKeyboard() {`
`275`	`275`	`// Check if the keyboard was ever initialized.`
`276`	`276`	`// It may be the case when you are looking a not joined room`
`277`	`277`	`if (::emojiKeyboardPopup.isInitialized) {`