From c201412882610e3845bd957accc32ac0b038431a Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 14 Oct 2020 13:05:08 +0200 Subject: [PATCH] Refactoring --- .../eu/faircode/email/FragmentMessages.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 355ee54189..4188021e8c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2092,35 +2092,37 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } private void onSwipeAsk(final @NonNull TupleMessageEx message, @NonNull RecyclerView.ViewHolder viewHolder) { + // Make sure animations are done rvMessage.post(new Runnable() { @Override public void run() { try { + int order = 1; PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), viewHolder.itemView); if (message.ui_seen) - popupMenu.getMenu().add(Menu.NONE, R.string.title_unseen, 1, R.string.title_unseen); + popupMenu.getMenu().add(Menu.NONE, R.string.title_unseen, order++, R.string.title_unseen); else - popupMenu.getMenu().add(Menu.NONE, R.string.title_seen, 1, R.string.title_seen); + popupMenu.getMenu().add(Menu.NONE, R.string.title_seen, order++, R.string.title_seen); if (message.ui_flagged) - popupMenu.getMenu().add(Menu.NONE, R.string.title_unflag, 2, R.string.title_unflag); + popupMenu.getMenu().add(Menu.NONE, R.string.title_unflag, order++, R.string.title_unflag); else - popupMenu.getMenu().add(Menu.NONE, R.string.title_flag, 2, R.string.title_flag); + popupMenu.getMenu().add(Menu.NONE, R.string.title_flag, order++, R.string.title_flag); - popupMenu.getMenu().add(Menu.NONE, R.string.title_snooze, 3, R.string.title_snooze); + popupMenu.getMenu().add(Menu.NONE, R.string.title_snooze, order++, R.string.title_snooze); if (message.ui_snoozed == null) - popupMenu.getMenu().add(Menu.NONE, R.string.title_hide, 4, R.string.title_hide); + popupMenu.getMenu().add(Menu.NONE, R.string.title_hide, order++, R.string.title_hide); else if (message.ui_snoozed == Long.MAX_VALUE) - popupMenu.getMenu().add(Menu.NONE, R.string.title_unhide, 4, R.string.title_unhide); + popupMenu.getMenu().add(Menu.NONE, R.string.title_unhide, order++, R.string.title_unhide); - popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 5, R.string.title_flag_color); + popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, order++, R.string.title_flag_color); if (message.accountProtocol == EntityAccount.TYPE_IMAP) { - popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 6, R.string.title_move); - popupMenu.getMenu().add(Menu.NONE, R.string.title_report_spam, 7, R.string.title_report_spam); + popupMenu.getMenu().add(Menu.NONE, R.string.title_move, order++, R.string.title_move); + popupMenu.getMenu().add(Menu.NONE, R.string.title_report_spam, order++, R.string.title_report_spam); } - popupMenu.getMenu().add(Menu.NONE, R.string.title_delete_permanently, 8, R.string.title_delete_permanently); + popupMenu.getMenu().add(Menu.NONE, R.string.title_delete_permanently, order++, R.string.title_delete_permanently); popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override