From 5ec97f3f81345608225e13c32e43630443d8245a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 7 Dec 2020 14:55:11 +0100
Subject: [PATCH] search view

---
 app/src/exodus/res/values/colors.xml                 |  2 +-
 .../exodus_privacy/exodusprivacy/MainActivity.java   | 12 ++++++++----
 app/src/main/res/menu/main.xml                       |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/exodus/res/values/colors.xml b/app/src/exodus/res/values/colors.xml
index 695a7ac..ca2db61 100644
--- a/app/src/exodus/res/values/colors.xml
+++ b/app/src/exodus/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#684971</color>
     <color name="colorPrimaryDark">#3d2b43</color>
-    <color name="colorAccent">#684971</color>
+    <color name="colorAccent">#3d2b43</color>
 
     <color name="colorGreen">#6fc384</color>
     <color name="colorLightRed">#e46772</color>
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
index 250d871..ea8f3dd 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
@@ -180,21 +180,25 @@ public class MainActivity extends AppCompatActivity {
         toolbarMenu = menu;
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main, menu);
-        searchView = (SearchView) menu.findItem(R.id.action_filter).getActionView();
-        searchView.setIconifiedByDefault(false);
+        MenuItem actionFilterItem = menu.findItem(R.id.action_filter);
+        searchView = (SearchView) actionFilterItem.getActionView();
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 HomeFragment home = (HomeFragment) fragments.get(0);
                 home.filter(query);
-                return true;
+                if (!searchView.isIconified()) {
+                    searchView.setIconified(true);
+                }
+                menu.findItem(R.id.action_filter).collapseActionView();
+                return false;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
                 HomeFragment home = (HomeFragment) fragments.get(0);
                 home.filter(newText);
-                return true;
+                return false;
             }
         });
 
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index b05145e..bad5e4f 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -6,7 +6,7 @@
         android:icon="@drawable/ic_search"
         android:title="@string/menu_action_filter"
         app:actionViewClass="android.widget.SearchView"
-        app:showAsAction="ifRoom|collapseActionView" />
+        app:showAsAction="always|collapseActionView" />
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_settings"