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

Show account name in unified inbox

Browse Source
This commit is contained in:
M66B
2018-08-22 16:37:10 +00:00
parent 82855d9a1e
commit ea66c6100e
5 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -52,7 +52,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private boolean debug;
private DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.LONG);
enum ViewType {FOLDER, THREAD}
enum ViewType {UNIFIED, FOLDER, THREAD}
public class ViewHolder extends RecyclerView.ViewHolder
implements View.OnClickListener, View.OnLongClickListener {
@@ -61,6 +61,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
TextView tvTime;
ImageView ivAttachments;
TextView tvSubject;
TextView tvFolder;
TextView tvCount;
TextView tvError;
ProgressBar pbLoading;
@@ -73,6 +74,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
tvTime = itemView.findViewById(R.id.tvTime);
ivAttachments = itemView.findViewById(R.id.ivAttachments);
tvSubject = itemView.findViewById(R.id.tvSubject);
tvFolder = itemView.findViewById(R.id.tvFolder);
tvCount = itemView.findViewById(R.id.tvCount);
tvError = itemView.findViewById(R.id.tvError);
pbLoading = itemView.findViewById(R.id.pbLoading);
@@ -113,12 +115,18 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
tvSubject.setText(message.subject);
if (viewType == ViewType.FOLDER) {
if (viewType == ViewType.UNIFIED) {
tvFolder.setText(message.accountName);
tvCount.setText(Integer.toString(message.count));
tvCount.setVisibility(debug || message.count > 1 ? View.VISIBLE : View.GONE);
} else if (viewType == ViewType.FOLDER) {
tvFolder.setVisibility(View.GONE);
tvCount.setText(Integer.toString(message.count));
tvCount.setVisibility(debug || message.count > 1 ? View.VISIBLE : View.GONE);
} else {
tvCount.setText(Helper.localizeFolderName(context, message.folderName));
tvCount.setVisibility(View.VISIBLE);
tvCount.setVisibility(View.GONE);
tvFolder.setText(Helper.localizeFolderName(context, message.folderName));
tvFolder.setVisibility(View.VISIBLE);
}
if (debug) {