mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added swipe to junk

This commit is contained in:
M66B 2020-03-17 08:40:51 +01:00
parent 84d332964a
commit 8806a32abc
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -173,6 +173,7 @@ public class FragmentAccount extends FragmentBase {
static final Long SWIPE_ACTION_MOVE = -5L;
static final Long SWIPE_ACTION_FLAG = -6L;
static final Long SWIPE_ACTION_DELETE = -7L;
static final Long SWIPE_ACTION_JUNK = -8L;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -1729,6 +1730,11 @@ public class FragmentAccount extends FragmentBase {
move.name = getString(R.string.title_move);
folders.add(move);
EntityFolder junk = new EntityFolder();
junk.id = SWIPE_ACTION_JUNK;
junk.name = getString(R.string.title_spam);
folders.add(junk);
EntityFolder delete = new EntityFolder();
delete.id = SWIPE_ACTION_DELETE;
delete.name = getString(R.string.title_delete);

28
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -1688,6 +1688,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
? R.drawable.baseline_visibility_24 : R.drawable.baseline_timer_off_24));
else if (FragmentAccount.SWIPE_ACTION_MOVE.equals(action))
icon = R.drawable.baseline_folder_24;
else if (FragmentAccount.SWIPE_ACTION_JUNK.equals(action))
icon = R.drawable.baseline_flag_24;
else if (FragmentAccount.SWIPE_ACTION_DELETE.equals(action) ||
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)))
icon = R.drawable.baseline_delete_forever_24;
@ -1774,6 +1776,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else if (FragmentAccount.SWIPE_ACTION_MOVE.equals(action)) {
adapter.notifyItemChanged(pos);
onSwipeMove(message);
} else if (FragmentAccount.SWIPE_ACTION_JUNK.equals(action)) {
adapter.notifyItemChanged(pos);
onSwipeJunk(message);
} else if (FragmentAccount.SWIPE_ACTION_DELETE.equals(action) ||
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType))) {
adapter.notifyItemChanged(pos);
@ -1831,7 +1836,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 5, R.string.title_flag_color);
popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 6, R.string.title_move);
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 7, R.string.title_delete);
popupMenu.getMenu().add(Menu.NONE, R.string.title_spam, 7, R.string.title_spam);
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 8, R.string.title_delete);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
@ -1862,6 +1868,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
case R.string.title_move:
onSwipeMove(message);
return true;
case R.string.title_spam:
onSwipeJunk(message);
return true;
case R.string.title_delete:
onSwipeDelete(message);
return true;
@ -1912,7 +1921,18 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogFolder fragment = new FragmentDialogFolder();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_MOVE);
fragment.show(getParentFragmentManager(), "message:move");
fragment.show(getParentFragmentManager(), "swipe:move");
}
private void onSwipeJunk(final @NonNull TupleMessageEx message) {
Bundle aargs = new Bundle();
aargs.putLong("id", message.id);
aargs.putString("from", MessageHelper.formatAddresses(message.from));
AdapterMessage.FragmentDialogJunk ask = new AdapterMessage.FragmentDialogJunk();
ask.setArguments(aargs);
ask.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_JUNK);
ask.show(getParentFragmentManager(), "swipe:junk");
}
private void onSwipeDelete(@NonNull TupleMessageEx message) {
@ -1923,7 +1943,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(args);
ask.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_MESSAGE_DELETE);
ask.show(getParentFragmentManager(), "message:delete");
ask.show(getParentFragmentManager(), "swipe:delete");
}
private void swipeFolder(@NonNull TupleMessageEx message, @NonNull Long target) {
@ -1980,7 +2000,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:swipe");
}.execute(FragmentMessages.this, args, "swipe:folder");
}
};