Skip to content

Allow reordering of favorite entries #1796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skrtstsk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow reordering of favorite entries #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,7 @@ public void setIsLongPressDragEnabled(boolean enabled) {
}

public void setSelectedEntry(VaultEntry entry) {
if (entry == null) {
_selectedEntry = null;
return;
}

if (!entry.isFavorite()) {
_selectedEntry = entry;
}
_selectedEntry = entry;
}

@Override
Expand Down Expand Up @@ -80,13 +73,21 @@ public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull Recycle
@Override
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
RecyclerView.ViewHolder target) {
int targetIndex = _adapter.translateEntryPosToIndex(target.getBindingAdapterPosition());
if (targetIndex < _adapter.getShownFavoritesCount()) {
int targetPosition = target.getBindingAdapterPosition();

if (_adapter.isPositionFooter(targetPosition) || _adapter.isPositionErrorCard(targetPosition)) {
return false;
}

VaultEntry sourceEntry = _adapter.getEntryAtPosition(viewHolder.getBindingAdapterPosition());
VaultEntry targetEntry = _adapter.getEntryAtPosition(targetPosition);

if (sourceEntry.isFavorite() != targetEntry.isFavorite()) {
return false;
}

int firstPosition = viewHolder.getLayoutPosition();
int secondPosition = target.getBindingAdapterPosition();
int secondPosition = targetPosition;

_adapter.onItemMove(firstPosition, secondPosition);
_positionChanged = true;
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ private boolean isEntryDraggable(VaultEntry entry) {
return entry != null
&& isDragAndDropAllowed()
&& _selectedEntries.size() == 1
&& !_selectedEntries.get(0).isFavorite()
&& _selectedEntries.get(0) == entry;
}

Expand Down