diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index f60763d5cc..87cc0fbd01 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -315,15 +315,16 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB List items = new ArrayList<>(); for (TupleAccountEx account : accounts) { - StringBuilder sb = new StringBuilder(); - sb.append(account.name); + String title; if (account.unseen > 0) - sb.append(" (").append(nf.format(account.unseen)).append(")"); + title = getString(R.string.title_name_count, account.name, nf.format(account.unseen)); + else + title = account.name; items.add(new DrawerItem(account.id, "connected".equals(account.state) ? account.primary ? R.drawable.baseline_folder_special_24 : R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24, - account.color, sb.toString(), account.unseen > 0)); + account.color, title, account.unseen > 0)); } items.add(new DrawerItem(-1)); diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index dad6a54c7d..47b4c0f586 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -164,11 +164,13 @@ public class AdapterFolder extends RecyclerView.Adapter 0) - n.append(" (").append(nf.format(folder.unseen)).append(")"); - tvName.setText(n.toString()); + tvName.setText(context.getString(R.string.title_name_count, + folder.getDisplayName(context), + nf.format(folder.unseen))); + else + tvName.setText(folder.getDisplayName(context)); + tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL); tvName.setTextColor(folder.unseen > 0 ? colorUnread : textColorSecondary); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index f6f09cbc93..c0dbae89de 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1547,11 +1547,12 @@ public class FragmentMessages extends FragmentBase { errors = true; } - StringBuilder sb = new StringBuilder(); - sb.append(getString(R.string.title_folder_unified)); if (unseen > 0) - sb.append(" (").append(nf.format(unseen)).append(")"); - setSubtitle(sb.toString()); + setSubtitle(getString(R.string.title_name_count, + getString(R.string.title_folder_unified), + nf.format(unseen))); + else + setSubtitle(getString(R.string.title_folder_unified)); boolean refreshing = false; for (TupleFolderEx folder : folders) @@ -1583,11 +1584,12 @@ public class FragmentMessages extends FragmentBase { if (folder == null) setSubtitle(null); else { - StringBuilder sb = new StringBuilder(); - sb.append(folder.getDisplayName(getContext())); if (folder.unseen > 0) - sb.append(" (").append(nf.format(folder.unseen)).append(")"); - setSubtitle(sb.toString()); + setSubtitle(getString(R.string.title_name_count, + folder.getDisplayName(getContext()), + nf.format(folder.unseen))); + else + setSubtitle(folder.getDisplayName(getContext())); boolean outbox = EntityFolder.OUTBOX.equals(folder.type); if (FragmentMessages.this.outbox != outbox) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd05b42715..353b2b8b13 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,6 +62,8 @@ Sending messages \'%1$s\' failed + %1$s (%2$s) + Templates Operations Setup