From 42357a257bac27f26db9b5205543cce575f5c2b1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 20 Jan 2019 11:21:09 +0000
Subject: [PATCH] Added day headers, relative time

---
 .../eu/faircode/email/AdapterMessage.java     | 75 +++++++++++++------
 .../main/res/layout/item_message_compact.xml  | 32 +++++++-
 .../main/res/layout/item_message_normal.xml   | 32 +++++++-
 3 files changed, 112 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b7994d5100..698e53f68c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -79,6 +79,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -108,6 +109,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
+import static android.text.format.DateUtils.DAY_IN_MILLIS;
+
 public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHolder> {
     private Context context;
     private LayoutInflater inflater;
@@ -141,11 +144,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     enum ViewType {UNIFIED, FOLDER, THREAD, SEARCH}
 
+    private static DateFormat tf = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT);
     private static DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG);
 
     public class ViewHolder extends RecyclerView.ViewHolder implements
             View.OnClickListener, BottomNavigationView.OnNavigationItemSelectedListener {
         private View itemView;
+        private TextView tvDay;
         private View vwColor;
         private ImageView ivExpander;
         private ImageView ivFlagged;
@@ -198,6 +203,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private RecyclerView rvImage;
 
+        private Group grpDay;
         private Group grpAddress;
         private Group grpHeaders;
         private Group grpAttachments;
@@ -212,6 +218,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             super(itemView);
 
             this.itemView = itemView.findViewById(R.id.clItem);
+            tvDay = itemView.findViewById(R.id.tvDay);
             vwColor = itemView.findViewById(R.id.vwColor);
             ivExpander = itemView.findViewById(R.id.ivExpander);
             ivFlagged = itemView.findViewById(R.id.ivFlagged);
@@ -278,6 +285,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             adapterImage = new AdapterImage(context, owner);
             rvImage.setAdapter(adapterImage);
 
+            grpDay = itemView.findViewById(R.id.grpDay);
             grpAddress = itemView.findViewById(R.id.grpAddress);
             grpHeaders = itemView.findViewById(R.id.grpHeaders);
             grpAttachments = itemView.findViewById(R.id.grpAttachments);
@@ -285,23 +293,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void wire() {
-            if (viewType == ViewType.THREAD) {
-                final View touch = (threading ? ivExpander : vwColor);
-                touch.setOnClickListener(this);
-                itemView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Rect rect = new Rect(
-                                itemView.getLeft(),
-                                touch.getTop(),
-                                itemView.getRight(),
-                                touch.getBottom());
-                        Log.i("Touch delegate=" + rect);
-                        itemView.setTouchDelegate(new TouchDelegate(rect, touch));
-                    }
-                });
-            } else
-                itemView.setOnClickListener(this);
+            final View touch = (viewType == ViewType.THREAD && threading ? ivExpander : vwColor);
+            touch.setOnClickListener(this);
+            itemView.post(new Runnable() {
+                @Override
+                public void run() {
+                    Rect rect = new Rect(
+                            itemView.getLeft(),
+                            touch.getTop(),
+                            itemView.getRight(),
+                            touch.getBottom());
+                    Log.i("Touch delegate=" + rect);
+                    itemView.setTouchDelegate(new TouchDelegate(rect, touch));
+                }
+            });
 
             ivSnoozed.setOnClickListener(this);
             ivFlagged.setOnClickListener(this);
@@ -376,6 +381,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             rvImage.setVisibility(View.GONE);
 
+            grpDay.setVisibility(View.GONE);
             grpAddress.setVisibility(View.GONE);
             ivAddContact.setVisibility(View.GONE);
             grpHeaders.setVisibility(View.GONE);
@@ -391,6 +397,34 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             pbLoading.setVisibility(View.GONE);
 
+            if (textSize != 0) {
+                tvDay.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                tvSubject.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+            }
+
+            boolean day;
+            TupleMessageEx prev = (position == 0 ? null : differ.getItem(position - 1));
+            if (prev == null)
+                day = true;
+            else {
+                Calendar cal0 = Calendar.getInstance();
+                Calendar cal1 = Calendar.getInstance();
+                cal0.setTimeInMillis(prev.received);
+                cal1.setTimeInMillis(message.received);
+                int day0 = cal0.get(Calendar.DAY_OF_YEAR);
+                int day1 = cal1.get(Calendar.DAY_OF_YEAR);
+                day = (day0 != day1);
+            }
+            if (day)
+                tvDay.setText(
+                        DateUtils.getRelativeTimeSpanString(
+                                message.received,
+                                new Date().getTime(),
+                                DAY_IN_MILLIS, 0));
+            grpDay.setVisibility(day ? View.VISIBLE : View.GONE);
+
+
             itemView.setAlpha(message.uid == null && !EntityFolder.OUTBOX.equals(message.folderType)
                     ? Helper.LOW_LIGHT : 1.0f);
 
@@ -496,7 +530,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvFrom.setText(MessageHelper.formatAddresses(outgoing ? message.to : message.from, !compact, false));
             tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
             tvSize.setVisibility(message.size == null || message.content ? View.GONE : View.VISIBLE);
-            tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
+            tvTime.setText(tf.format(message.received));
 
             ivDraft.setVisibility(message.drafts > 0 ? View.VISIBLE : View.GONE);
             ivSnoozed.setVisibility(message.ui_snoozed == null ? View.GONE : View.VISIBLE);
@@ -563,11 +597,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvSubject.setTypeface(null, typeface);
             tvCount.setTypeface(null, typeface);
 
-            if (textSize != 0) {
-                tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
-                tvSubject.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
-            }
-
             int colorUnseen = (message.unseen > 0 ? colorUnread : textColorSecondary);
             tvFrom.setTextColor(colorUnseen);
             tvSize.setTextColor(colorUnseen);
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index ca2b7e2d9c..ea55f94b00 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -10,6 +10,28 @@
         android:layout_height="wrap_content"
         android:background="?attr/drawableItemBackground">
 
+        <TextView
+            android:id="@+id/tvDay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Today"
+            android:padding="6dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/vSeparatorDay"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvDay" />
+
         <View
             android:id="@+id/vwColor"
             android:layout_width="6dp"
@@ -17,7 +39,7 @@
             android:background="@color/colorAccent"
             app:layout_constraintBottom_toTopOf="@+id/vSeparatorAddress"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDay" />
 
         <View
             android:id="@+id/paddingTop"
@@ -26,7 +48,7 @@
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDay" />
 
         <ImageView
             android:id="@+id/ivExpander"
@@ -724,6 +746,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rvImage" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpDay"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="tvDay,vSeparatorDay" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpAddress"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 1b3085c468..5bdcf393de 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -10,6 +10,28 @@
         android:layout_height="wrap_content"
         android:background="?attr/drawableItemBackground">
 
+        <TextView
+            android:id="@+id/tvDay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="Today"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/vSeparatorDay"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvDay" />
+
         <View
             android:id="@+id/vwColor"
             android:layout_width="6dp"
@@ -17,7 +39,7 @@
             android:background="@color/colorAccent"
             app:layout_constraintBottom_toTopOf="@+id/vSeparatorAddress"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDay" />
 
         <View
             android:id="@+id/paddingTop"
@@ -25,7 +47,7 @@
             android:layout_height="12dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDay" />
 
         <ImageView
             android:id="@+id/ivExpander"
@@ -720,6 +742,12 @@
             android:layout_height="0dp"
             app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeExTitle,tvTimeEx,tvSizeExTitle,tvSizeEx,tvSubjectEx" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpDay"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="tvDay,vSeparatorDay" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpHeaders"
             android:layout_width="0dp"