luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-04 20:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ungrouped filter

Browse source
This commit is contained in:
Michael Schättgen 2019-09-16 23:02:48 +02:00
parent a88d1cf11e
commit 9f075e7bc6
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -333,6 +333,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
}
}
if (groups.size() > 0) {
menu.add(R.id.action_filter_group, Menu.NONE, 10, R.string.filter_ungrouped);
}
menu.setGroupCheckable(R.id.action_filter_group, true, true);
}

11
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
View file

@ -4,6 +4,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.beemdevelopment.aegis.R;
import com.beemdevelopment.aegis.SortCategory;
import com.beemdevelopment.aegis.ViewMode;
import com.beemdevelopment.aegis.db.DatabaseEntry;
@ -158,8 +159,14 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
String issuer = entry.getIssuer().toLowerCase();
String name = entry.getName().toLowerCase();
if (_groupFilter != null && (group == null || !group.equals(_groupFilter))) {
return true;
if (_groupFilter != null) {
if (group == null && _groupFilter.equals(_view.getContext().getString(R.string.filter_ungrouped))) {
return false;
}
if (group == null || !group.equals(_groupFilter)) {
return true;
}
}
if (_searchFilter == null) {