Fixed visibility preview

pull/156/head
M66B 6 years ago
parent c063e40ff8
commit 1e85c2ac37

@ -670,7 +670,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Message text preview // Message text preview
tvPreview.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT, Typeface.ITALIC); tvPreview.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT, Typeface.ITALIC);
tvPreview.setText(message.preview); tvPreview.setText(message.preview);
// bind/clearExpanded will manage visibility tvPreview.setVisibility(preview && !TextUtils.isEmpty(message.preview) ? View.VISIBLE : View.GONE);
// Error / warning // Error / warning
String error = message.error; String error = message.error;
@ -757,19 +757,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
private void clearExpanded(TupleMessageEx message) { private void clearExpanded(TupleMessageEx message) {
if (vsBody == null)
return;
cowner.stop();
if (compact) { if (compact) {
tvFrom.setSingleLine(true); tvFrom.setSingleLine(true);
tvSubject.setSingleLine(true); tvSubject.setSingleLine(true);
tvPreview.setVisibility(
preview && message != null && !TextUtils.isEmpty(message.preview)
? View.VISIBLE : View.GONE);
} }
tvPreview.setVisibility(
preview && message != null && !TextUtils.isEmpty(message.preview)
? View.VISIBLE : View.GONE);
if (vsBody == null)
return;
cowner.stop();
grpAddresses.setVisibility(View.GONE); grpAddresses.setVisibility(View.GONE);
grpHeaders.setVisibility(View.GONE); grpHeaders.setVisibility(View.GONE);
grpCalendar.setVisibility(View.GONE); grpCalendar.setVisibility(View.GONE);
@ -852,9 +853,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (compact) { if (compact) {
tvFrom.setSingleLine(false); tvFrom.setSingleLine(false);
tvSubject.setSingleLine(false); tvSubject.setSingleLine(false);
tvPreview.setVisibility(View.GONE);
} }
tvPreview.setVisibility(View.GONE);
ensureExpanded(); ensureExpanded();
grpAddresses.setVisibility(View.VISIBLE); grpAddresses.setVisibility(View.VISIBLE);

Loading…
Cancel
Save