WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix search not iconified

This commit is contained in:
NekoInverter 2020-02-03 19:28:58 +08:00
parent ab169555db
commit dd4394bf52
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
View File

@ -64,7 +64,7 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba
@Override @Override
public boolean onCreateOptionsMenu(@NonNull Menu menu) { public boolean onCreateOptionsMenu(@NonNull Menu menu) {
getMenuInflater().inflate(R.menu.menu_app_list, 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); mSearchView.setOnQueryTextListener(mSearchListener);
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }

1
app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
View File

@ -2,7 +2,6 @@ package org.meowcat.edxposed.manager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;

11
app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
View File

@ -174,7 +174,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_modules, 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); mSearchView.setOnQueryTextListener(mSearchListener);
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@ -503,6 +503,15 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter); 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> { private class ModuleAdapter extends RecyclerView.Adapter<ModuleAdapter.ViewHolder> {
Collection<ModuleUtil.InstalledModule> items; Collection<ModuleUtil.InstalledModule> items;

2
app/src/main/res/menu/menu_app_list.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/app_search" android:id="@+id/menu_search"
android:title="@string/menuSearch" android:title="@string/menuSearch"
app:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always" /> app:showAsAction="always" />

2
app/src/main/res/menu/menu_modules.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/app_search" android:id="@+id/menu_search"
android:title="@string/menuSearch" android:title="@string/menuSearch"
app:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always" /> app:showAsAction="always" />