Allow selecting inbox as swipe target

pull/159/head
M66B 6 years ago
parent 748f532a94
commit ebfa20b952

@ -1375,15 +1375,17 @@ public class FragmentAccount extends FragmentBase {
} }
private void setFolders(List<EntityFolder> _folders, EntityAccount account) { private void setFolders(List<EntityFolder> _folders, EntityAccount account) {
{
List<EntityFolder> folders = new ArrayList<>(); List<EntityFolder> folders = new ArrayList<>();
for (EntityFolder folder : _folders)
if (!EntityFolder.INBOX.equals(folder.type))
folders.add(folder);
EntityFolder none = new EntityFolder(); EntityFolder none = new EntityFolder();
none.id = 0L; none.id = 0L;
none.name = "-"; none.name = "-";
folders.add(0, none); folders.add(none);
for (EntityFolder folder : _folders)
if (!EntityFolder.INBOX.equals(folder.type))
folders.add(folder);
adapter.clear(); adapter.clear();
adapter.addAll(folders); adapter.addAll(folders);
@ -1402,16 +1404,27 @@ public class FragmentAccount extends FragmentBase {
else if (EntityFolder.JUNK.equals(folder.type)) else if (EntityFolder.JUNK.equals(folder.type))
spJunk.setSelection(pos); spJunk.setSelection(pos);
} }
}
{
List<EntityFolder> folders = new ArrayList<>();
EntityFolder none = new EntityFolder();
none.id = 0L;
none.name = "-";
folders.add(none);
EntityFolder ask = new EntityFolder(); EntityFolder ask = new EntityFolder();
ask.id = SWIPE_ACTION_ASK; ask.id = SWIPE_ACTION_ASK;
ask.name = getString(R.string.title_ask_what); ask.name = getString(R.string.title_ask_what);
folders.add(1, ask); folders.add(ask);
EntityFolder seen = new EntityFolder(); EntityFolder seen = new EntityFolder();
seen.id = SWIPE_ACTION_SEEN; seen.id = SWIPE_ACTION_SEEN;
seen.name = getString(R.string.title_seen); seen.name = getString(R.string.title_seen);
folders.add(1, seen); folders.add(seen);
folders.addAll(_folders);
adapterSwipe.clear(); adapterSwipe.clear();
adapterSwipe.addAll(folders); adapterSwipe.addAll(folders);
@ -1436,6 +1449,7 @@ public class FragmentAccount extends FragmentBase {
if (right == null ? (account == null && rightDefault.equals(folder.type)) : right.equals(folder.id)) if (right == null ? (account == null && rightDefault.equals(folder.type)) : right.equals(folder.id))
spRight.setSelection(pos); spRight.setSelection(pos);
} }
}
grpFolders.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE); grpFolders.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE);
btnSave.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE); btnSave.setVisibility(_folders.size() > 1 ? View.VISIBLE : View.GONE);

Loading…
Cancel
Save