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

Added flag on swipe

This commit is contained in:
M66B 2019-11-11 10:05:58 +01:00
parent 884826b61b
commit 85c8bdd067
2 changed files with 31 additions and 10 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

@ -153,6 +153,7 @@ public class FragmentAccount extends FragmentBase {
static final Long SWIPE_ACTION_SNOOZE = -3L; static final Long SWIPE_ACTION_SNOOZE = -3L;
static final Long SWIPE_ACTION_HIDE = -4L; static final Long SWIPE_ACTION_HIDE = -4L;
static final Long SWIPE_ACTION_MOVE = -5L; static final Long SWIPE_ACTION_MOVE = -5L;
static final Long SWIPE_ACTION_FLAG = -6L;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -1495,6 +1496,11 @@ public class FragmentAccount extends FragmentBase {
seen.name = getString(R.string.title_seen); seen.name = getString(R.string.title_seen);
folders.add(seen); folders.add(seen);
EntityFolder flag = new EntityFolder();
flag.id = SWIPE_ACTION_FLAG;
flag.name = getString(R.string.title_flag);
folders.add(flag);
EntityFolder snooze = new EntityFolder(); EntityFolder snooze = new EntityFolder();
snooze.id = SWIPE_ACTION_SNOOZE; snooze.id = SWIPE_ACTION_SNOOZE;
snooze.name = getString(R.string.title_snooze_now); snooze.name = getString(R.string.title_snooze_now);

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

@ -1446,6 +1446,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
icon = R.drawable.baseline_list_24; icon = R.drawable.baseline_list_24;
else if (FragmentAccount.SWIPE_ACTION_SEEN.equals(action)) else if (FragmentAccount.SWIPE_ACTION_SEEN.equals(action))
icon = (message.ui_seen ? R.drawable.baseline_visibility_off_24 : R.drawable.baseline_visibility_24); icon = (message.ui_seen ? R.drawable.baseline_visibility_off_24 : R.drawable.baseline_visibility_24);
else if (FragmentAccount.SWIPE_ACTION_FLAG.equals(action))
icon = (message.ui_flagged ? R.drawable.baseline_star_border_24 : R.drawable.baseline_star_24);
else if (FragmentAccount.SWIPE_ACTION_SNOOZE.equals(action)) else if (FragmentAccount.SWIPE_ACTION_SNOOZE.equals(action))
icon = (message.ui_snoozed == null ? R.drawable.baseline_timelapse_24 : R.drawable.baseline_timer_off_24); icon = (message.ui_snoozed == null ? R.drawable.baseline_timelapse_24 : R.drawable.baseline_timer_off_24);
else if (FragmentAccount.SWIPE_ACTION_HIDE.equals(action)) else if (FragmentAccount.SWIPE_ACTION_HIDE.equals(action))
@ -1521,6 +1523,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
onSwipeAsk(message, viewHolder); onSwipeAsk(message, viewHolder);
} else if (FragmentAccount.SWIPE_ACTION_SEEN.equals(action)) } else if (FragmentAccount.SWIPE_ACTION_SEEN.equals(action))
onActionSeenSelection(!message.ui_seen, message.id); onActionSeenSelection(!message.ui_seen, message.id);
else if (FragmentAccount.SWIPE_ACTION_FLAG.equals(action))
onActionFlagSelection(!message.ui_flagged, null, message.id);
else if (FragmentAccount.SWIPE_ACTION_SNOOZE.equals(action)) else if (FragmentAccount.SWIPE_ACTION_SNOOZE.equals(action))
onActionSnooze(message); onActionSnooze(message);
else if (FragmentAccount.SWIPE_ACTION_HIDE.equals(action)) else if (FragmentAccount.SWIPE_ACTION_HIDE.equals(action))
@ -1569,15 +1573,20 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else else
popupMenu.getMenu().add(Menu.NONE, R.string.title_seen, 1, R.string.title_seen); popupMenu.getMenu().add(Menu.NONE, R.string.title_seen, 1, R.string.title_seen);
popupMenu.getMenu().add(Menu.NONE, R.string.title_snooze, 2, R.string.title_snooze); if (message.ui_flagged)
popupMenu.getMenu().add(Menu.NONE, R.string.title_unflag, 2, 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_snooze, 3, R.string.title_snooze);
if (message.ui_snoozed == null) if (message.ui_snoozed == null)
popupMenu.getMenu().add(Menu.NONE, R.string.title_hide, 3, R.string.title_hide); popupMenu.getMenu().add(Menu.NONE, R.string.title_hide, 4, R.string.title_hide);
else if (message.ui_snoozed == Long.MAX_VALUE) else if (message.ui_snoozed == Long.MAX_VALUE)
popupMenu.getMenu().add(Menu.NONE, R.string.title_unhide, 3, R.string.title_unhide); popupMenu.getMenu().add(Menu.NONE, R.string.title_unhide, 4, R.string.title_unhide);
popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 4, R.string.title_flag_color); 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, 5, R.string.title_move); popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 6, R.string.title_move);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
@ -1589,6 +1598,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
case R.string.title_unseen: case R.string.title_unseen:
onActionSeenSelection(false, message.id); onActionSeenSelection(false, message.id);
return true; return true;
case R.string.title_flag:
onActionFlagSelection(true, null, message.id);
return true;
case R.string.title_unflag:
onActionFlagSelection(false, null, message.id);
return true;
case R.string.title_snooze: case R.string.title_snooze:
onMenuSnooze(); onMenuSnooze();
return true; return true;
@ -1876,10 +1891,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
onHideSelection(false); onHideSelection(false);
return true; return true;
case R.string.title_flag: case R.string.title_flag:
onActionFlagSelection(true, null); onActionFlagSelection(true, null, null);
return true; return true;
case R.string.title_unflag: case R.string.title_unflag:
onActionFlagSelection(false, null); onActionFlagSelection(false, null, null);
return true; return true;
case R.string.title_flag_color: case R.string.title_flag_color:
onActionFlagColorSelection(); onActionFlagColorSelection();
@ -2058,9 +2073,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}.execute(this, args, "messages:flag"); }.execute(this, args, "messages:flag");
} }
private void onActionFlagSelection(boolean flagged, Integer color) { private void onActionFlagSelection(boolean flagged, Integer color, Long id) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLongArray("ids", getSelection()); args.putLongArray("ids", id == null ? getSelection() : new long[]{id});
args.putBoolean("flagged", flagged); args.putBoolean("flagged", flagged);
if (color != null) if (color != null)
args.putInt("color", color); args.putInt("color", color);
@ -3845,7 +3860,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onActionFlagSelection(true, args.getInt("color")); onActionFlagSelection(true, args.getInt("color"), null);
} }
break; break;
case REQUEST_MESSAGE_SNOOZE: case REQUEST_MESSAGE_SNOOZE: