Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved outbox to unified folders

Browse Source
This commit is contained in:
M66B
2021-09-11 11:36:22 +02:00
parent e7ef17be72
commit 7b9d21325d
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/AdapterNavUnified.java
View File

@@ -42,6 +42,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.ViewHolder> {
private Context context;
@@ -89,11 +90,17 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
private void bindTo(TupleFolderUnified folder) {
if (EntityFolder.INBOX.equals(folder.type))
ivItem.setImageResource(R.drawable.twotone_all_inbox_24);
else
else if (EntityFolder.OUTBOX.equals(folder.type)) {
if ("syncing".equals(folder.sync_state))
ivItem.setImageResource(R.drawable.twotone_compare_arrows_24);
else
ivItem.setImageResource(EntityFolder.getIcon(folder.type));
} else
ivItem.setImageResource(EntityFolder.getIcon(folder.type));
long count;
if (EntityFolder.DRAFTS.equals(folder.type))
if (EntityFolder.DRAFTS.equals(folder.type) ||
EntityFolder.OUTBOX.equals(folder.type))
count = folder.messages;
else
count = folder.unseen;
@@ -223,7 +230,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
TupleFolderUnified f1 = prev.get(oldItemPosition);
TupleFolderUnified f2 = next.get(newItemPosition);
return (f1.messages == f2.messages && f1.unseen == f2.unseen);
return f1.equals(f2);
}
}