Search improvements

app/src/main/java/eu/faircode/email/FragmentAccounts.java

@@ -24,7 +24,11 @@ import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -35,6 +39,7 @@ import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SearchView;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
@@ -51,6 +56,7 @@ public class FragmentAccounts extends FragmentBase {
     private FloatingActionButton fabCompose;
     private ObjectAnimator animator;
 
+    private String searching = null;
     private AdapterAccount adapter;
 
     @Override
@@ -64,6 +70,7 @@ public class FragmentAccounts extends FragmentBase {
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         setSubtitle(R.string.title_list_accounts);
+        setHasOptionsMenu(true);
 
         View view = inflater.inflate(R.layout.fragment_accounts, container, false);
 
@@ -155,10 +162,20 @@ public class FragmentAccounts 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)
+            searching = savedInstanceState.getString("fair:searching");
+
         DB db = DB.getInstance(getContext());
 
         // Observe accounts
@@ -194,4 +211,43 @@ public class FragmentAccounts extends FragmentBase {
                         }
                     });
     }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_folders, menu);
+
+        final MenuItem menuSearch = menu.findItem(R.id.menu_search);
+        SearchView searchView = (SearchView) menuSearch.getActionView();
+
+        if (!TextUtils.isEmpty(searching)) {
+            menuSearch.expandActionView();
+            searchView.setQuery(searching, false);
+        }
+
+        searchView.setQueryHint(getString(R.string.title_search_device));
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                searching = newText;
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searching = null;
+                menuSearch.collapseActionView();
+                FragmentMessages.search(getContext(), getViewLifecycleOwner(), getFragmentManager(), -1, query);
+                return true;
+            }
+        });
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        menu.findItem(R.id.menu_search).setVisible(!settings);
+
+        super.onPrepareOptionsMenu(menu);
+    }
 }