From 704b5c30b02e4a9271aeafa134f7207ac520184e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 22 Jul 2019 09:48:48 +0200
Subject: [PATCH] Show last sync time in account nav item

---
 .../eu/faircode/email/AdapterNavAccount.java    | 10 ++++++++++
 .../eu/faircode/email/AdapterNavFolder.java     |  4 ++++
 .../java/eu/faircode/email/AdapterNavMenu.java  |  4 ++++
 .../eu/faircode/email/AdapterNavUnified.java    |  3 +++
 app/src/main/res/layout/item_nav.xml            | 17 ++++++++++++++++-
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
index 2a471a37cd..b2d177297f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
@@ -34,7 +34,9 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListUpdateCallback;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.text.DateFormat;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -48,11 +50,13 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
     private List<TupleAccountEx> items = new ArrayList<>();
 
     private NumberFormat nf = NumberFormat.getNumberInstance();
+    private DateFormat DTF;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         private View view;
         private ImageView ivItem;
         private TextView tvItem;
+        private TextView tvItemExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -61,6 +65,7 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
+            tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -91,6 +96,8 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
             tvItem.setTextColor(Helper.resolveColor(context,
                     account.unseen == 0 ? android.R.attr.textColorSecondary : R.attr.colorUnread));
 
+            tvItemExtra.setText(account.last_connected == null ? null : DTF.format(account.last_connected));
+
             ivWarning.setVisibility(account.error == null ? View.GONE : View.VISIBLE);
         }
 
@@ -115,6 +122,9 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
         this.context = context;
         this.owner = owner;
         this.inflater = LayoutInflater.from(context);
+
+        this.DTF = Helper.getTimeInstance(context, SimpleDateFormat.SHORT);
+
         setHasStableIds(true);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index a126529ced..29005261c5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -53,6 +53,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
         private View view;
         private ImageView ivItem;
         private TextView tvItem;
+        private TextView tvItemExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -61,6 +62,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
+            tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -109,6 +111,8 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
             tvItem.setTextColor(Helper.resolveColor(context,
                     count == 0 ? android.R.attr.textColorSecondary : R.attr.colorUnread));
 
+            tvItemExtra.setVisibility(View.GONE);
+
             ivWarning.setVisibility(folder.error == null ? View.GONE : View.VISIBLE);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index 786102d563..aba7142bd5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -50,6 +50,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         private View view;
         private ImageView ivItem;
         private TextView tvItem;
+        private TextView tvItemExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -58,6 +59,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
+            tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -83,6 +85,8 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             tvItem.setTextColor(Helper.resolveColor(context,
                     menu.getCount() == null ? android.R.attr.textColorSecondary : R.attr.colorUnread));
 
+            tvItemExtra.setVisibility(View.GONE);
+
             ivWarning.setVisibility(menu.hasWarning() ? View.VISIBLE : View.GONE);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index fb3f910da2..bfdb7900c4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -50,6 +50,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
         private View view;
         private ImageView ivItem;
         private TextView tvItem;
+        private TextView tvItemExtra;
         private ImageView ivWarning;
 
         ViewHolder(View itemView) {
@@ -58,6 +59,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             view = itemView.findViewById(R.id.clItem);
             ivItem = itemView.findViewById(R.id.ivItem);
             tvItem = itemView.findViewById(R.id.tvItem);
+            tvItemExtra = itemView.findViewById(R.id.tvItemExtra);
             ivWarning = itemView.findViewById(R.id.ivWarning);
         }
 
@@ -72,6 +74,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
         private void bindTo(String type) {
             ivItem.setImageResource(R.drawable.baseline_folder_shared_24);
             tvItem.setText(Helper.localizeFolderType(context, type));
+            tvItemExtra.setVisibility(View.GONE);
             ivWarning.setVisibility(View.GONE);
         }
 
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index f44a5e2e42..201f0e4f8c 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -34,10 +34,25 @@
             android:text="Nav item"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/ivWarning"
+            app:layout_constraintEnd_toStartOf="@+id/tvItemExtra"
             app:layout_constraintStart_toEndOf="@id/ivItem"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tvItemExtra"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:singleLine="true"
+            android:text="Extra"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/ivWarning"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ImageView
             android:id="@+id/ivWarning"
             android:layout_width="wrap_content"