mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-21 21:57:19 +00:00
Code Issues Releases Wiki Activity

Show time when using fixed date header

Browse source
This commit is contained in:
M66B 2023-01-07 12:25:34 +01:00
parent 29688026ad
commit 2017950526
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -260,7 +260,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private float textSize;
private boolean date;
private boolean week;
private boolean date_week;
private boolean date_fixed;
private boolean cards;
private boolean shadow_unread;
private boolean shadow_border;
@ -1409,7 +1410,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
message.totalSize != null && ("size".equals(sort) || "attachments".equals(sort))
? View.VISIBLE : View.GONE);
SpannableStringBuilder time = new SpannableStringBuilderEx(
(date && !week) && FragmentMessages.SORT_DATE_HEADER.contains(sort)
((date || date_fixed) && !date_week) && FragmentMessages.SORT_DATE_HEADER.contains(sort)
? TF.format(message.received)
: Helper.getRelativeTimeSpanString(context, message.received));
if (show_recent && message.recent)
@ -7328,7 +7329,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean generated = prefs.getBoolean("generated_icons", true);
this.date = prefs.getBoolean("date", true);
this.week = prefs.getBoolean("date_week", false);
this.date_week = prefs.getBoolean("date_week", false);
this.date_fixed = (!date && prefs.getBoolean("date_fixed", false));
this.cards = prefs.getBoolean("cards", true);
this.shadow_unread = prefs.getBoolean("shadow_unread", false);
this.shadow_border = prefs.getBoolean("shadow_border", true);