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

Hide preview on expanding message

Browse Source
This commit is contained in:
M66B
2019-06-05 07:59:34 +02:00
parent b7a0987c52
commit 1fc5fc387b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,7 +523,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvError.setVisibility(View.GONE);
pbLoading.setVisibility(View.VISIBLE);
clearExpanded();
clearExpanded(null);
}
@SuppressLint("WrongConstant")
@@ -670,7 +670,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Message text preview
tvPreview.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT, Typeface.ITALIC);
tvPreview.setText(message.preview);
tvPreview.setVisibility(preview && !TextUtils.isEmpty(message.preview) ? View.VISIBLE : View.GONE);
// bind/clearExpanded will manage visibility
// Error / warning
String error = message.error;
@@ -750,13 +750,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (show_expanded)
bindExpanded(message);
else {
clearExpanded();
clearExpanded(message);
properties.setBody(message.id, null);
}
}
}
private void clearExpanded() {
private void clearExpanded(TupleMessageEx message) {
if (vsBody == null)
return;
@@ -765,6 +765,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (compact) {
tvFrom.setSingleLine(true);
tvSubject.setSingleLine(true);
tvPreview.setVisibility(
preview && message != null && !TextUtils.isEmpty(message.preview)
? View.VISIBLE : View.GONE);
}
grpAddresses.setVisibility(View.GONE);
@@ -849,6 +852,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (compact) {
tvFrom.setSingleLine(false);
tvSubject.setSingleLine(false);
tvPreview.setVisibility(View.GONE);
}
ensureExpanded();
@@ -1630,7 +1634,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
bindExpanded(message);
properties.scrollTo(getAdapterPosition());
} else
clearExpanded();
clearExpanded(message);
}
}