Add ability to easily assign groups #1497
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexbakker
requested changes
Sep 19, 2024
|
|
||
| _selectedVaultGroupModel = new VaultGroupModel(group); | ||
| } else { | ||
| newGroupText.setError(getString(R.string.error_required_field)); |
There was a problem hiding this comment.
Calling setError on newGroupLayout instead would look a bit more modern:
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
Outdated
Show resolved
Hide resolved
| @@ -95,6 +101,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene | |||
| private String _pendingSearchQuery; | |||
|
|
|||
| private List<VaultEntry> _selectedEntries; | |||
| private VaultGroupModel _selectedVaultGroupModel; | |||
There was a problem hiding this comment.
I think this can be moved to the scope of startAssignGroupsDialog.
app/src/main/res/values/strings.xml
Outdated
| @@ -208,6 +208,9 @@ | |||
| <string name="edit">Edit</string> | |||
| <string name="select_all">Select all</string> | |||
| <string name="assign_icons">Assign icons</string> | |||
| <string name="assign_groups">Assign group</string> | |||
There was a problem hiding this comment.
Suggestion: "Assign to group"
app/src/main/res/values/strings.xml
Outdated
| @@ -208,6 +208,9 @@ | |||
| <string name="edit">Edit</string> | |||
| <string name="select_all">Select all</string> | |||
| <string name="assign_icons">Assign icons</string> | |||
| <string name="assign_groups">Assign group</string> | |||
| <string name="assign_groups_dialog_summary">Select a group that you wish to add to the selected entries.</string> | |||
There was a problem hiding this comment.
Suggestion: "Select a group you wish to assign the selected entries to."
|
|
||
| <com.google.android.material.textfield.TextInputLayout | ||
| android:id="@+id/text_group_name_layout" | ||
| android:hint="@string/set_group" |
There was a problem hiding this comment.
I'd suggest changing this to @string/group_name_hint.
Comment on lines
505
to
520
| ArrayList<VaultGroupModel> groupsArray = new ArrayList<>(); | ||
| groupsArray.add(new VaultGroupModel(getString(R.string.new_group))); | ||
| groupsArray.addAll(groups.stream().map(VaultGroupModel::new).collect(Collectors.toList())); | ||
|
|
||
| ArrayAdapter<VaultGroupModel> adapter = new ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, groupsArray) { | ||
| @NonNull | ||
| @Override | ||
| public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) { | ||
| View view = super.getView(position, convertView, parent); | ||
| TextView textView = view.findViewById(android.R.id.text1); | ||
| textView.setText(getItem(position).toString()); | ||
| return view; | ||
| } | ||
| }; | ||
|
|
||
| groupsSelection.setAdapter(adapter); |
There was a problem hiding this comment.
The padding of the dropdown items looks a little off. We have some existing utilities to help with this:
List<VaultGroupModel> groupModels = new ArrayList<>();
groupModels.add(new VaultGroupModel(getString(R.string.new_group)));
groupModels.addAll(groups.stream().map(VaultGroupModel::new).collect(Collectors.toList()));
DropdownHelper.fillDropdown(this, groupsSelection, groupModels);| .setNegativeButton(android.R.string.cancel, null) | ||
| .create(); | ||
|
|
||
| dialog.setOnShowListener(d -> { |
There was a problem hiding this comment.
Do we need this trick to find the positive button or can we pass the listener to setPositiveButton in this case?
michaelschattgen
force-pushed
the
feature/assign-groups
branch
from
f15cff6
to
797b0fd
Compare
alexbakker
force-pushed
the
feature/assign-groups
branch
from
797b0fd
to
4a9f189
Compare
alexbakker
approved these changes
Sep 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since we've heavily improved our group management it would only make sense to also improve the flow in which our users assign groups to their entries. This PR adds the ability to tap 'Assign group' whenever they have entries selected.
Fixes #597
Screen.Recording.2024-09-19.001835.mp4