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

Add an option to save the current group filter

Browse source
This commit is contained in:
Alexander Bakker 2021-05-16 13:04:58 +02:00
parent 51eade900c
commit fc25312d12
6 changed files with 83 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,6 +119,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_entryListView.setSortCategory(getPreferences().getCurrentSortCategory(), false);
_entryListView.setViewMode(getPreferences().getCurrentViewMode());
_entryListView.setIsCopyOnTapEnabled(getPreferences().isCopyOnTapEnabled());
_entryListView.setPrefGroupFilter(getPreferences().getGroupFilter());
FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(v -> {
@ -723,6 +724,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
@Override
public void onListChange() { _fabScrollHelper.setVisible(true); }
@Override
public void onSaveGroupFilter(List<String> groupFilter) {
getPreferences().setGroupFilter(groupFilter);
}
@Override
public void onLocked(boolean userInitiated) {
if (_actionMode != null) {

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

@ -283,10 +283,6 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
_viewMode = viewMode;
}
public void setGroups(TreeSet<String> groups) {
_view.setGroups(groups);
}
@Override
public void onItemDismiss(int position) {

48
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
View file

@ -67,6 +67,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
private LinearLayout _emptyStateView;
private Chip _groupChip;
private List<String> _groupFilter;
private List<String> _prefGroupFilter;
private UiRefresher _refresher;
@ -130,7 +131,6 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
});
_emptyStateView = view.findViewById(R.id.vEmptyList);
return view;
}
@ -269,6 +269,10 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
@Override
public void onListChange() { _listener.onListChange(); }
public void setPrefGroupFilter(List<String> groupFilter) {
_prefGroupFilter = groupFilter;
}
public void setCodeGroupSize(int codeGrouping) {
_adapter.setCodeGroupSize(codeGrouping);
}
@ -375,9 +379,19 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
ChipGroup chipGroup = view.findViewById(R.id.groupChipGroup);
Button clearButton = view.findViewById(R.id.btnClear);
Button saveButton = view.findViewById(R.id.btnSave);
clearButton.setOnClickListener(v -> {
chipGroup.clearCheck();
setGroupFilter(Collections.emptyList(), true);
List<String> groupFilter = Collections.emptyList();
_listener.onSaveGroupFilter(groupFilter);
setGroupFilter(groupFilter, true);
dialog.dismiss();
});
saveButton.setOnClickListener(v -> {
List<String> groupFilter = getGroupFilter(chipGroup);
_listener.onSaveGroupFilter(groupFilter);
setGroupFilter(groupFilter, true);
dialog.dismiss();
});
@ -394,9 +408,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
chip.setChipBackgroundColorResource(R.color.bg_chip_color);
chip.setTextColor(colorStateList);
chip.setOnCheckedChangeListener((group1, checkedId) -> {
List<String> groupFilter = chipGroup.getCheckedChipIds().stream()
.map(i -> ((Chip) view.findViewById(i)).getText().toString())
.collect(Collectors.toList());
List<String> groupFilter = getGroupFilter(chipGroup);
setGroupFilter(groupFilter, true);
});
@ -407,6 +419,12 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
});
}
private static List<String> getGroupFilter(ChipGroup chipGroup) {
return chipGroup.getCheckedChipIds().stream()
.map(i -> ((Chip) chipGroup.findViewById(i)).getText().toString())
.collect(Collectors.toList());
}
private void updateGroupChip() {
if (_groupFilter.isEmpty()) {
_groupChip.setText(R.string.groups);
@ -425,17 +443,26 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
_groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
updateDividerDecoration();
if (_groupFilter != null) {
List<String> groupFilter = _groupFilter.stream()
.filter(g -> _groups.contains(g))
.collect(Collectors.toList());
if (_prefGroupFilter != null) {
List<String> groupFilter = cleanGroupFilter(_prefGroupFilter);
_prefGroupFilter = null;
if (!groupFilter.isEmpty()) {
setGroupFilter(groupFilter, false);
}
} else if (_groupFilter != null) {
List<String> groupFilter = cleanGroupFilter(_groupFilter);
if (!_groupFilter.equals(groupFilter)) {
setGroupFilter(groupFilter, true);
}
}
}
private List<String> cleanGroupFilter(List<String> groupFilter) {
return groupFilter.stream()
.filter(g -> _groups.contains(g))
.collect(Collectors.toList());
}
private void updateDividerDecoration() {
if (_dividerDecoration != null) {
_recyclerView.removeItemDecoration(_dividerDecoration);
@ -474,6 +501,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
void onSelect(VaultEntry entry);
void onDeselect(VaultEntry entry);
void onListChange();
void onSaveGroupFilter(List<String> groupFilter);
}
private class VerticalSpaceItemDecoration extends RecyclerView.ItemDecoration {