luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-25 10:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't allow drag and drop if the entry list is filtered in any way

Browse source
This commit is contained in:
Alexander Bakker 2020-06-07 17:18:19 +02:00
parent 626995ec91
commit 992dcd651b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,8 +126,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
} }
public void setGroupFilter(String group, boolean apply) { public void setGroupFilter(String group, boolean apply) {
_touchCallback.setIsLongPressDragEnabled(group == null);
_adapter.setGroupFilter(group, apply); _adapter.setGroupFilter(group, apply);
_touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
if (apply) { if (apply) {
runEntriesAnimation(); runEntriesAnimation();
@ -135,7 +135,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
} }
public void setIsLongPressDragEnabled(boolean enabled) { public void setIsLongPressDragEnabled(boolean enabled) {
_touchCallback.setIsLongPressDragEnabled(enabled); _touchCallback.setIsLongPressDragEnabled(enabled && _adapter.isDragAndDropAllowed());
} }
public void setIsCopyOnTapEnabled(boolean enabled) { public void setIsCopyOnTapEnabled(boolean enabled) {
@ -154,8 +154,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
} }
public void setSortCategory(SortCategory sortCategory, boolean apply) { public void setSortCategory(SortCategory sortCategory, boolean apply) {
_touchCallback.setIsLongPressDragEnabled(sortCategory == SortCategory.CUSTOM);
_adapter.setSortCategory(sortCategory, apply); _adapter.setSortCategory(sortCategory, apply);
_touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
if (apply) { if (apply) {
runEntriesAnimation(); runEntriesAnimation();
@ -163,8 +163,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
} }
public void setSearchFilter(String search) { public void setSearchFilter(String search) {
_touchCallback.setIsLongPressDragEnabled(search == null);
_adapter.setSearchFilter(search); _adapter.setSearchFilter(search);
_touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
} }
public void setViewMode(ViewMode mode) { public void setViewMode(ViewMode mode) {