Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed folder sort / item layout

Browse Source
This commit is contained in:
M66B
2018-08-06 16:01:56 +00:00
parent 33c0ec0efe
commit a63a5767c1
40 changed files with 417 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@@ -53,9 +53,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
TextView tvName;
TextView tvAfter;
ImageView ivSync;
TextView tvCount;
TextView tvType;
TextView tvAccount;
TextView tvType;
ViewHolder(View itemView) {
super(itemView);
@@ -64,9 +63,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
tvName = itemView.findViewById(R.id.tvName);
tvAfter = itemView.findViewById(R.id.tvAfter);
ivSync = itemView.findViewById(R.id.ivSync);
tvCount = itemView.findViewById(R.id.tvCount);
tvType = itemView.findViewById(R.id.tvType);
tvAccount = itemView.findViewById(R.id.tvAccount);
tvType = itemView.findViewById(R.id.tvType);
}
private void wire() {
@@ -125,7 +123,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
Collections.sort(folders, new Comparator<TupleFolderEx>() {
@Override
public int compare(TupleFolderEx f1, TupleFolderEx f2) {
int s = EntityFolder.isUser(f1.type).compareTo(EntityFolder.isUser(f2.type));
int s = ((Integer) EntityFolder.FOLDER_SORT_ORDER.indexOf(f1.type))
.compareTo(EntityFolder.FOLDER_SORT_ORDER.indexOf(f2.type));
if (s == 0) {
int a = collator.compare(
f1.accountName == null ? "" : f1.accountName,
@@ -228,10 +227,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
TupleFolderEx folder = filtered.get(position);
String name = Helper.localizeFolderName(context, folder.name);
if (folder.unseen > 0)
holder.tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
else
holder.tvName.setText(name);
holder.tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen, folder.messages));
holder.tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
holder.tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary));
@@ -239,7 +235,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
holder.tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
holder.ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
holder.tvCount.setText(Integer.toString(folder.messages));
holder.tvAccount.setText(folder.accountName);
holder.tvAccount.setVisibility(EntityFolder.TYPE_OUTBOX.equals(folder.type) ? View.GONE : View.VISIBLE);
int resid = context.getResources().getIdentifier(
"title_folder_" + folder.type.toLowerCase(),
@@ -247,8 +245,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
context.getPackageName());
holder.tvType.setText(resid > 0 ? context.getString(resid) : folder.type);
holder.tvAccount.setText(folder.accountName);
holder.wire();
}
}