Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02: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

35
app/src/main/java/eu/faircode/email/FragmentContacts.java
View File

@@ -50,7 +50,7 @@ public class FragmentContacts extends FragmentBase {
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private String search = null;
private String searching = null;
private AdapterContact adapter;
@Override
@@ -82,13 +82,19 @@ public class FragmentContacts extends FragmentBase {
return view;
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString("fair:searching", searching);
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) {
search = savedInstanceState.getString("fair:search");
adapter.search(search);
searching = savedInstanceState.getString("fair:searching");
adapter.search(searching);
}
DB db = DB.getInstance(getContext());
@@ -108,12 +114,6 @@ public class FragmentContacts extends FragmentBase {
Shortcuts.update(getContext(), getViewLifecycleOwner());
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString("fair:search", search);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.menu_contacts, menu);
@@ -121,24 +121,23 @@ public class FragmentContacts extends FragmentBase {
MenuItem menuSearch = menu.findItem(R.id.menu_search);
SearchView searchView = (SearchView) menuSearch.getActionView();
if (!TextUtils.isEmpty(search)) {
if (!TextUtils.isEmpty(searching)) {
menuSearch.expandActionView();
searchView.setQuery(search, true);
searchView.clearFocus();
searchView.setQuery(searching, true);
}
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
search = query;
adapter.search(query);
public boolean onQueryTextChange(String newText) {
searching = newText;
adapter.search(newText);
return true;
}
@Override
public boolean onQueryTextChange(String newText) {
search = newText;
adapter.search(newText);
public boolean onQueryTextSubmit(String query) {
searching = query;
adapter.search(query);
return true;
}
});