Added menu to delete non-selectable folders

This commit is contained in:
M66B
2020-04-16 16:25:10 +02:00
parent febab8c196
commit 2dfabba508
2 changed files with 60 additions and 0 deletions

View File

@@ -414,6 +414,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
return false;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean debug = prefs.getBoolean("debug", false);
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
@@ -479,6 +480,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
popupMenu.getMenu().add(Menu.NONE, R.string.title_create_sub_folder, 16, R.string.title_create_sub_folder)
.setEnabled(folder.inferiors);
if (!folder.selectable && debug)
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 17, R.string.title_delete)
.setEnabled(folder.inferiors);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
@@ -545,6 +550,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
onActionCreateFolder();
return true;
case R.string.title_delete:
onActionDeleteFolder();
return true;
default:
return false;
}
@@ -713,6 +722,17 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
.putExtra("account", folder.account)
.putExtra("parent", folder.name));
}
private void onActionDeleteFolder() {
Bundle aargs = new Bundle();
aargs.putLong("id", folder.id);
aargs.putString("question", context.getString(R.string.title_folder_delete));
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_DELETE_FOLDER);
ask.show(parentFragment.getParentFragmentManager(), "folder:delete");
}
});
popupMenu.show();