Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Search improvements

Browse Source
This commit is contained in:
M66B
2019-03-20 08:49:21 +00:00
parent b20f62f577
commit 0d330fc481
5 changed files with 140 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -134,7 +134,7 @@ public class FragmentMessages extends FragmentBase {
private long primary;
private boolean outbox = false;
private boolean connected;
private boolean searching = false;
private String searching = null;
private boolean refresh = false;
private boolean manual = false;
private AdapterMessage adapter;
@@ -1486,6 +1486,8 @@ public class FragmentMessages extends FragmentBase {
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString("fair:searching", searching);
outState.putBoolean("fair:autoExpanded", autoExpanded);
outState.putInt("fair:autoCloseCount", autoCloseCount);
@@ -1515,6 +1517,8 @@ public class FragmentMessages extends FragmentBase {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) {
searching = savedInstanceState.getString("fair:searching");
autoExpanded = savedInstanceState.getBoolean("fair:autoExpanded");
autoCloseCount = savedInstanceState.getInt("fair:autoCloseCount");
@@ -1765,36 +1769,27 @@ public class FragmentMessages extends FragmentBase {
inflater.inflate(R.menu.menu_messages, menu);
final MenuItem menuSearch = menu.findItem(R.id.menu_search);
menuSearch.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
searching = true;
return true;
}
SearchView searchView = (SearchView) menuSearch.getActionView();
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
searching = false;
return true;
}
});
if (searching)
if (!TextUtils.isEmpty(searching)) {
menuSearch.expandActionView();
searchView.setQuery(searching, false);
}
final SearchView searchView = (SearchView) menuSearch.getActionView();
searchView.setQueryHint(getString(folder < 0 ? R.string.title_search_device : R.string.title_search_hint));
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
searching = false;
menuSearch.collapseActionView();
search(getContext(), getViewLifecycleOwner(), getFragmentManager(), folder, query);
public boolean onQueryTextChange(String newText) {
searching = newText;
return true;
}
@Override
public boolean onQueryTextChange(String newText) {
return false;
public boolean onQueryTextSubmit(String query) {
searching = null;
menuSearch.collapseActionView();
search(getContext(), getViewLifecycleOwner(), getFragmentManager(), folder, query);
return true;
}
});