mirror of https://github.com/M66B/FairEmail.git
Reordered folder item menu
This commit is contained in:
parent
2a380d1087
commit
58d74a232a
|
@ -246,8 +246,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_empty_trash, 3, R.string.title_empty_trash);
|
popupMenu.getMenu().add(Menu.NONE, action_empty_trash, 3, R.string.title_empty_trash);
|
||||||
|
|
||||||
if (folder.account != null) {
|
if (folder.account != null) {
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 4, R.string.title_edit_properties);
|
popupMenu.getMenu().add(Menu.NONE, action_edit_rules, 4, R.string.title_edit_rules);
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_edit_rules, 5, R.string.title_edit_rules);
|
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 5, R.string.title_edit_properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
||||||
|
@ -266,14 +266,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
onActionEmptyTrash();
|
onActionEmptyTrash();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case action_edit_properties:
|
|
||||||
onActionEditProperties();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case action_edit_rules:
|
case action_edit_rules:
|
||||||
onActionEditRules();
|
onActionEditRules();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
case action_edit_properties:
|
||||||
|
onActionEditProperties();
|
||||||
|
return true;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -404,13 +404,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onActionEditProperties() {
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
|
||||||
lbm.sendBroadcast(
|
|
||||||
new Intent(ActivityView.ACTION_EDIT_FOLDER)
|
|
||||||
.putExtra("id", folder.id));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onActionEditRules() {
|
private void onActionEditRules() {
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
||||||
lbm.sendBroadcast(
|
lbm.sendBroadcast(
|
||||||
|
@ -418,6 +411,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
.putExtra("account", folder.account)
|
.putExtra("account", folder.account)
|
||||||
.putExtra("folder", folder.id));
|
.putExtra("folder", folder.id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void onActionEditProperties() {
|
||||||
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
||||||
|
lbm.sendBroadcast(
|
||||||
|
new Intent(ActivityView.ACTION_EDIT_FOLDER)
|
||||||
|
.putExtra("id", folder.id));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
popupMenu.show();
|
popupMenu.show();
|
||||||
|
|
Loading…
Reference in New Issue