From 98d97e574c71aa1f4e07713e446fe32825fdae42 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 7 Nov 2019 12:23:21 +0100
Subject: [PATCH] Fix regression when filtering emojis

---
 .../reactions/EmojiReactionPickerActivity.kt         | 12 ++++++------
 .../res/layout/activity_emoji_reaction_picker.xml    |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
index a442f5f77e..4dc8cd643d 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
@@ -131,8 +131,8 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
             }
         }
 
-        supportFragmentManager.findFragmentById(R.id.fragment)?.view?.isVisible = true
-        supportFragmentManager.findFragmentById(R.id.searchFragment)?.view?.isInvisible = true
+        emojiPickerWholeListFragmentContainer.isVisible = true
+        emojiPickerFilteredListFragmentContainer.isVisible = false
         tabLayout.isVisible = true
     }
 
@@ -195,13 +195,13 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
 
     private fun onQueryText(query: String) {
         if (query.isEmpty()) {
-            supportFragmentManager.findFragmentById(R.id.fragment)?.view?.isVisible = true
-            supportFragmentManager.findFragmentById(R.id.searchFragment)?.view?.isInvisible = true
             tabLayout.isVisible = true
+            emojiPickerWholeListFragmentContainer.isVisible = true
+            emojiPickerFilteredListFragmentContainer.isVisible = false
         } else {
             tabLayout.isVisible = false
-            supportFragmentManager.findFragmentById(R.id.fragment)?.view?.isInvisible = true
-            supportFragmentManager.findFragmentById(R.id.searchFragment)?.view?.isVisible = true
+            emojiPickerWholeListFragmentContainer.isVisible = false
+            emojiPickerFilteredListFragmentContainer.isVisible = true
             searchResultViewModel.updateQuery(query)
         }
     }
diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
index f46635d816..9d680e6221 100644
--- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
+++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
@@ -7,7 +7,7 @@
     tools:context="im.vector.riotx.features.reactions.EmojiReactionPickerActivity">
 
     <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragment"
+        android:id="@+id/emojiPickerWholeListFragmentContainer"
         android:name="im.vector.riotx.features.reactions.EmojiChooserFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,12 +15,12 @@
         tools:layout="@layout/emoji_chooser_fragment" />
 
     <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/searchFragment"
+        android:id="@+id/emojiPickerFilteredListFragmentContainer"
         android:name="im.vector.riotx.features.reactions.EmojiSearchResultFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:visibility="invisible" />
+        android:visibility="gone" />
 
     <com.google.android.material.appbar.AppBarLayout
         style="@style/VectorAppBarLayoutStyle"