From 45cb74d4ce3c0b8e2efaba5e2beab305bca897a0 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Fri, 16 Aug 2024 12:17:43 -0500 Subject: [PATCH 1/3] partial fix - now need to reset highlighting after exit Signed-off-by: rapterjet2004 --- .../talk/conversationlist/ConversationsListActivity.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 1f9383185..bdef55cb8 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -373,7 +373,8 @@ class ConversationsListActivity : conversationsListViewModel.getRoomsFlow .onEach { list -> // Update Conversations - conversationItems.clear() + conversationItemsWithHeader.clear() + conversationItems.clear() // fixme remove this for (conversation in list) { addToConversationItems(conversation) } @@ -538,6 +539,12 @@ class ConversationsListActivity : if (searchManager != null) { searchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName)) } + initSearchDisposable() + } + } + + private fun initSearchDisposable() { + if (searchViewDisposable == null || searchViewDisposable?.isDisposed == true) { searchViewDisposable = observeSearchView(searchView!!) .debounce { query: String? -> if (TextUtils.isEmpty(query)) { @@ -629,6 +636,7 @@ class ConversationsListActivity : } searchItem!!.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { override fun onMenuItemActionExpand(item: MenuItem): Boolean { + initSearchDisposable() adapter!!.setHeadersShown(true) if (!filterState.containsValue(true)) filterableConversationItems = searchableConversationItems adapter!!.updateDataSet(filterableConversationItems, false) From a4fd2e6a4bb6848f5bafe4a267dd14c21e9b16f7 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Wed, 21 Aug 2024 11:36:41 -0500 Subject: [PATCH 2/3] Got the highlighting fixed - need to fix the submit button (or disable it) as tapping it destroys the searchViewDisposable for some reason Signed-off-by: rapterjet2004 --- .../talk/conversationlist/ConversationsListActivity.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index bdef55cb8..348e868f4 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -625,15 +625,18 @@ class ConversationsListActivity : showSearchView(searchView, searchItem) viewThemeUtils.platform.themeStatusBar(this) } - searchView!!.setOnCloseListener { + searchView!!.findViewById(R.id.search_close_btn).setOnClickListener { if (TextUtils.isEmpty(searchView!!.query.toString())) { searchView!!.onActionViewCollapsed() viewThemeUtils.platform.resetStatusBar(this) } else { - searchView!!.post { searchView!!.setQuery(TAG, true) } + resetSearchResults() + searchView!!.setQuery("", false) } - true } + + + searchItem!!.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { override fun onMenuItemActionExpand(item: MenuItem): Boolean { initSearchDisposable() From 64ac46e605ef8449542ea4030c81d98c91d55378 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Thu, 22 Aug 2024 09:58:33 -0500 Subject: [PATCH 3/3] Got it fixed Signed-off-by: rapterjet2004 --- .../talk/conversationlist/ConversationsListActivity.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 348e868f4..14318c20c 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -635,7 +635,17 @@ class ConversationsListActivity : } } + searchView!!.setOnQueryTextListener(object : SearchView.OnQueryTextListener { + override fun onQueryTextSubmit(p0: String?): Boolean { + initSearchDisposable() + return true + } + override fun onQueryTextChange(p0: String?): Boolean { + this@ConversationsListActivity.onQueryTextChange(p0) + return true + } + }) searchItem!!.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { override fun onMenuItemActionExpand(item: MenuItem): Boolean {