From 5eb1e7902c66d3648d8c64cf06f78f93002e98f2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Dec 2023 20:47:38 +0100
Subject: [PATCH] Condensed date/time format

---
 .../java/eu/faircode/email/AdapterMessage.java     |  7 +++++--
 app/src/main/java/eu/faircode/email/Helper.java    | 14 ++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 268b0a6e18..72fec30e82 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1462,8 +1462,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     message.totalSize != null && ("size".equals(sort) || "attachments".equals(sort))
                             ? View.VISIBLE : View.GONE);
             SpannableStringBuilder time;
-            if (date_time)
-                time = new SpannableStringBuilderEx(Helper.getRelativeDateTimeSpanString(context, message.received));
+            if (EntityMessage.PRIORITIY_HIGH.equals(message.importance) ||
+                    EntityMessage.PRIORITIY_LOW.equals(message.importance))
+                time = new SpannableStringBuilderEx(Helper.getRelativeDateTimeSpanString(context, message.received, true));
+            else if (date_time)
+                time = new SpannableStringBuilderEx(Helper.getRelativeDateTimeSpanString(context, message.received, false));
             else if (date_week)
                 time = new SpannableStringBuilderEx(Helper.getRelativeDateSpanString(context, message.received));
             else
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7ae4b2eed2..3a86209eb2 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2256,18 +2256,18 @@ public class Helper {
     }
 
     static CharSequence getRelativeDateSpanString(Context context, long millis) {
-        return getRelativeTimeSpanString(context, millis, false, true);
+        return getRelativeTimeSpanString(context, millis, false, true, false);
     }
 
     static CharSequence getRelativeTimeSpanString(Context context, long millis) {
-        return getRelativeTimeSpanString(context, millis, true, false);
+        return getRelativeTimeSpanString(context, millis, true, false, false);
     }
 
-    static CharSequence getRelativeDateTimeSpanString(Context context, long millis) {
-        return getRelativeTimeSpanString(context, millis, true, true);
+    static CharSequence getRelativeDateTimeSpanString(Context context, long millis, boolean condensed) {
+        return getRelativeTimeSpanString(context, millis, true, true, condensed);
     }
 
-    private static CharSequence getRelativeTimeSpanString(Context context, long millis, boolean withTime, boolean withDate) {
+    private static CharSequence getRelativeTimeSpanString(Context context, long millis, boolean withTime, boolean withDate, boolean condensed) {
         Calendar cal0 = Calendar.getInstance();
         Calendar cal1 = Calendar.getInstance();
         cal0.setTimeInMillis(millis);
@@ -2277,7 +2277,9 @@ public class Helper {
         boolean thisDay = (cal0.get(Calendar.DAY_OF_MONTH) == cal1.get(Calendar.DAY_OF_MONTH));
         if (withDate) {
             try {
-                String skeleton = (thisMonth && thisYear ? "MMM-d" : "yyyy-M-d");
+                if (condensed && thisYear && thisMonth && thisDay)
+                    return getTimeInstance(context, SimpleDateFormat.SHORT).format(millis);
+                String skeleton = (thisYear ? "MMM-d" : "yyyy-M-d");
                 if (withTime) {
                     boolean is24Hour = android.text.format.DateFormat.is24HourFormat(context);
                     skeleton += (is24Hour ? " Hm" : " hm");