From dd4394bf5237ec8ea6e3804208d32db3e5bb9dab Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Mon, 3 Feb 2020 19:28:58 +0800
Subject: [PATCH] Fix search not iconified

---
 .../meowcat/edxposed/manager/BlackListActivity.java   |  2 +-
 .../meowcat/edxposed/manager/DownloadActivity.java    |  1 -
 .../org/meowcat/edxposed/manager/ModulesActivity.java | 11 ++++++++++-
 app/src/main/res/menu/menu_app_list.xml               |  2 +-
 app/src/main/res/menu/menu_modules.xml                |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
index a53e3072..1b618951 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
@@ -64,7 +64,7 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba
     @Override
     public boolean onCreateOptionsMenu(@NonNull Menu menu) {
         getMenuInflater().inflate(R.menu.menu_app_list, menu);
-        mSearchView = (SearchView) menu.findItem(R.id.app_search).getActionView();
+        mSearchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
         mSearchView.setOnQueryTextListener(mSearchListener);
         return super.onCreateOptionsMenu(menu);
     }
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
index 2ffcbdb2..b06d60bc 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
@@ -2,7 +2,6 @@ package org.meowcat.edxposed.manager;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
index 04b59880..f1816abb 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
@@ -174,7 +174,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_modules, menu);
-        mSearchView = (SearchView) menu.findItem(R.id.app_search).getActionView();
+        mSearchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
         mSearchView.setOnQueryTextListener(mSearchListener);
         return super.onCreateOptionsMenu(menu);
     }
@@ -503,6 +503,15 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
         return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mSearchView.isIconified()) {
+            super.onBackPressed();
+        } else {
+            mSearchView.setIconified(true);
+        }
+    }
+
     private class ModuleAdapter extends RecyclerView.Adapter<ModuleAdapter.ViewHolder> {
         Collection<ModuleUtil.InstalledModule> items;
 
diff --git a/app/src/main/res/menu/menu_app_list.xml b/app/src/main/res/menu/menu_app_list.xml
index b412991f..5c654c7c 100644
--- a/app/src/main/res/menu/menu_app_list.xml
+++ b/app/src/main/res/menu/menu_app_list.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/app_search"
+        android:id="@+id/menu_search"
         android:title="@string/menuSearch"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always" />
diff --git a/app/src/main/res/menu/menu_modules.xml b/app/src/main/res/menu/menu_modules.xml
index 43f55d92..31783df0 100644
--- a/app/src/main/res/menu/menu_modules.xml
+++ b/app/src/main/res/menu/menu_modules.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/app_search"
+        android:id="@+id/menu_search"
         android:title="@string/menuSearch"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always" />