kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2619 from gouri-panda/bug/gouri-panda/#2607_search_menu_items_recreates_mulitple_times

Browse Source 
#2607 search menu items recreates multiple times
This commit is contained in:
Kelson 2021-04-05 13:03:10 +02:00 committed by GitHub
commit 2f6d397e5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -755,8 +755,9 @@ public abstract class CoreReaderFragment extends BaseFragment
} }
return webView; return webView;
} }
return null; return null;
} }
@NotNull protected ToolbarScrollingKiwixWebView createWebView(AttributeSet attrs) { @NotNull protected ToolbarScrollingKiwixWebView createWebView(AttributeSet attrs) {
if (activityMainRoot != null) { if (activityMainRoot != null) {
return new ToolbarScrollingKiwixWebView( return new ToolbarScrollingKiwixWebView(
@ -1228,6 +1229,7 @@ public abstract class CoreReaderFragment extends BaseFragment
switch (intent.getAction()) { switch (intent.getAction()) {
case Intent.ACTION_PROCESS_TEXT: { case Intent.ACTION_PROCESS_TEXT: {
goToSearchWithText(intent); goToSearchWithText(intent);
intent.setAction(null); // see https://github.com/kiwix/kiwix-android/issues/2607
break; break;
} }
case CoreSearchWidget.TEXT_CLICKED: case CoreSearchWidget.TEXT_CLICKED:

4
core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt
View File

@ -150,7 +150,9 @@ class SearchFragment : BaseFragment() {
searchMenuItem.expandActionView() searchMenuItem.expandActionView()
searchView = searchMenuItem.actionView as SearchView searchView = searchMenuItem.actionView as SearchView
searchView.setOnQueryTextListener(SimpleTextListener { searchView.setOnQueryTextListener(SimpleTextListener {
searchViewModel.actions.offer(Filter(it)) if (it.isNotEmpty()) {
searchViewModel.actions.offer(Filter(it))
}
}) })
searchMenuItem.setOnActionExpandListener(object : OnActionExpandListener { searchMenuItem.setOnActionExpandListener(object : OnActionExpandListener {
override fun onMenuItemActionExpand(item: MenuItem) = false override fun onMenuItemActionExpand(item: MenuItem) = false