Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 00:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show unread count per account

Browse Source
This commit is contained in:
M66B
2018-12-16 17:39:15 +01:00
parent c402a97016
commit 3b2ee071f7
10 changed files with 77 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -248,9 +248,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
getSupportFragmentManager().addOnBackStackChangedListener(this);
DB.getInstance(this).account().liveAccounts(true).observe(this, new Observer<List<EntityAccount>>() {
DB.getInstance(this).account().liveAccounts(true).observe(this, new Observer<List<TupleAccountEx>>() {
@Override
public void onChanged(@Nullable List<EntityAccount> accounts) {
public void onChanged(@Nullable List<TupleAccountEx> accounts) {
if (accounts == null)
accounts = new ArrayList<>();
@@ -266,11 +266,14 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
});
for (EntityAccount account : accounts)
for (TupleAccountEx account : accounts)
drawerArray.add(new DrawerItem(
R.layout.item_drawer, -1,
"connected".equals(account.state) ? R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24,
account.color, account.name, account.id));
account.color,
account.unseen > 0 ? getString(R.string.title_unseen_count, account.name, account.unseen) : account.name,
account.unseen > 0,
account.id));
drawerArray.add(new DrawerItem(R.layout.item_drawer_separator));
@@ -1129,6 +1132,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private int icon;
private Integer color;
private String title;
private boolean highlight;
private Object data;
DrawerItem(int layout) {
@@ -1143,12 +1147,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
this.title = context.getString(title);
}
DrawerItem(int layout, int id, int icon, Integer color, String title, Object data) {
DrawerItem(int layout, int id, int icon, Integer color, String title, boolean highlight, Object data) {
this.layout = layout;
this.id = id;
this.icon = icon;
this.color = color;
this.title = title;
this.highlight = highlight;
this.data = data;
}
@@ -1179,9 +1184,14 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (item.color != null)
iv.setColorFilter(item.color);
}
if (tv != null)
if (tv != null) {
tv.setText(item.title);
tv.setTextColor(Helper.resolveColor(getContext(),
item.highlight ? R.attr.colorUnread : android.R.attr.textColorSecondary));
}
return row;
}
}