From 294bfeb6538fd7f492e9599da71a6c5752d2a21e Mon Sep 17 00:00:00 2001 From: Gouri Panda Date: Sat, 22 May 2021 16:28:16 -0700 Subject: [PATCH 1/2] #2657 search was laggy -removed renderd text from each time text changed --- .../org/kiwix/kiwixmobile/core/search/SearchFragment.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt index 1518ee9ff..2cef492da 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt @@ -19,6 +19,7 @@ package org.kiwix.kiwixmobile.core.search import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater @@ -170,11 +171,14 @@ class SearchFragment : BaseFragment() { lifecycleScope.launchWhenCreated { searchViewModel.state.collect { render(it) } } + val searchStringFromArguments = arguments?.getString(NAV_ARG_SEARCH_STRING) + if (searchStringFromArguments != null) { + searchView.setQuery(searchStringFromArguments, false) + } searchViewModel.actions.offer(Action.CreatedWithArguments(arguments)) } private fun render(state: SearchState) { - searchView.setQuery(state.searchTerm, false) searchInTextMenuItem.isVisible = state.searchOrigin == FromWebView searchInTextMenuItem.isEnabled = state.searchTerm.isNotBlank() searchLoadingIndicator.isShowing(state.isLoading) @@ -193,6 +197,7 @@ class SearchFragment : BaseFragment() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) searchViewModel.actions.offer(ActivityResultReceived(requestCode, resultCode, data)) + Log.d("GPDEBUG", "render: on activity result") } } From 54e0621271d5c709f4dcc829664c64f2053720c7 Mon Sep 17 00:00:00 2001 From: Gouri Panda Date: Sat, 22 May 2021 16:34:01 -0700 Subject: [PATCH 2/2] clean up code --- .../java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt index 2cef492da..fd6f9b913 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt @@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.core.search import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater @@ -197,7 +196,6 @@ class SearchFragment : BaseFragment() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) searchViewModel.actions.offer(ActivityResultReceived(requestCode, resultCode, data)) - Log.d("GPDEBUG", "render: on activity result") } }