mirror of https://github.com/M66B/FairEmail.git
Moved edit as new to reply menu
This commit is contained in:
parent
546781b354
commit
9ec206f150
|
@ -2889,8 +2889,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
popupMenu.getMenu().findItem(R.id.menu_reply_to_all).setVisible(recipients.length > 0);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_list).setVisible(message.list_post != null);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_receipt).setVisible(message.receipt_to != null);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context));
|
||||
popupMenu.getMenu().findItem(R.id.menu_new_message).setVisible(to != null && to.length > 0);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context));
|
||||
|
||||
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
||||
@Override
|
||||
|
@ -2908,15 +2908,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
case R.id.menu_reply_receipt:
|
||||
onMenuReply(message, "receipt");
|
||||
return true;
|
||||
case R.id.menu_reply_answer:
|
||||
onMenuAnswer(message);
|
||||
return true;
|
||||
case R.id.menu_forward:
|
||||
onMenuReply(message, "forward");
|
||||
return true;
|
||||
case R.id.menu_editasnew:
|
||||
onMenuEditAsNew(message);
|
||||
return true;
|
||||
case R.id.menu_new_message:
|
||||
onMenuNew(message, to);
|
||||
return true;
|
||||
case R.id.menu_reply_answer:
|
||||
onMenuAnswer(message);
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
@ -2939,6 +2942,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
context.startActivity(reply);
|
||||
}
|
||||
|
||||
private void onMenuEditAsNew(final TupleMessageEx message) {
|
||||
Intent asnew = new Intent(context, ActivityCompose.class)
|
||||
.putExtra("action", "editasnew")
|
||||
.putExtra("reference", message.id);
|
||||
context.startActivity(asnew);
|
||||
}
|
||||
|
||||
private void onMenuNew(TupleMessageEx message, Address[] to) {
|
||||
Intent reply = new Intent(context, ActivityCompose.class)
|
||||
.putExtra("action", "new")
|
||||
|
@ -3114,8 +3124,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, anchor);
|
||||
popupMenu.inflate(R.menu.popup_message_more);
|
||||
|
||||
popupMenu.getMenu().findItem(R.id.menu_editasnew).setEnabled(message.content);
|
||||
|
||||
popupMenu.getMenu().findItem(R.id.menu_unseen).setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen);
|
||||
popupMenu.getMenu().findItem(R.id.menu_unseen).setEnabled(
|
||||
(message.uid != null && !message.folderReadOnly) || message.accountProtocol != EntityAccount.TYPE_IMAP);
|
||||
|
@ -3157,9 +3165,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
@Override
|
||||
public boolean onMenuItemClick(MenuItem target) {
|
||||
switch (target.getItemId()) {
|
||||
case R.id.menu_editasnew:
|
||||
onMenuEditAsNew(message);
|
||||
return true;
|
||||
case R.id.menu_unseen:
|
||||
onMenuUnseen(message);
|
||||
return true;
|
||||
|
@ -3323,13 +3328,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
fragment.show(parentFragment.getParentFragmentManager(), "view:image");
|
||||
}
|
||||
|
||||
private void onMenuEditAsNew(final TupleMessageEx message) {
|
||||
Intent asnew = new Intent(context, ActivityCompose.class)
|
||||
.putExtra("action", "editasnew")
|
||||
.putExtra("reference", message.id);
|
||||
context.startActivity(asnew);
|
||||
}
|
||||
|
||||
private void onMenuUnseen(final TupleMessageEx message) {
|
||||
Bundle args = new Bundle();
|
||||
args.putLong("id", message.id);
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/menu_editasnew"
|
||||
android:title="@string/title_editasnew" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_unseen"
|
||||
android:title="@string/title_unseen" />
|
||||
|
|
|
@ -16,15 +16,19 @@
|
|||
android:id="@+id/menu_reply_receipt"
|
||||
android:title="@string/title_reply_receipt" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_reply_answer"
|
||||
android:title="@string/title_reply_template" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_forward"
|
||||
android:title="@string/title_forward" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_editasnew"
|
||||
android:title="@string/title_editasnew" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_new_message"
|
||||
android:title="@string/title_new_message" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_reply_answer"
|
||||
android:title="@string/title_reply_template" />
|
||||
</menu>
|
Loading…
Reference in New Issue