Fixing the time on Notes

BijoySingh · Jan 31, 2018 · 16c8750 · 16c8750
1 parent 2727f05
commit 16c8750
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/com/bijoysingh/quicknote/database/Note.java b/app/src/main/java/com/bijoysingh/quicknote/database/Note.java
@@ -117,7 +117,9 @@ public CharSequence getLockedText(Context context, boolean isMarkdownEnabled) {
 
   public String getDisplayTime() {
     long time = updateTimestamp != 0 ? updateTimestamp : (timestamp == null ? 0 : timestamp);
-    return DateFormatter.getDate("dd MMMM yyyy", time);
+    String format = (Calendar.getInstance().getTimeInMillis() - time < 1000 * 60 * 60 * 2)
+        ? "hh:mm aa" : "dd MMM";
+    return DateFormatter.getDate(format, time);
   }
 
   public List<Format> getFormats() {

diff --git a/app/src/main/java/com/bijoysingh/quicknote/recyclerview/NoteRecyclerViewHolderBase.kt b/app/src/main/java/com/bijoysingh/quicknote/recyclerview/NoteRecyclerViewHolderBase.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.CardView
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.widget.ImageView
 import android.widget.TextView
 import com.bijoysingh.quicknote.R
@@ -63,13 +65,18 @@ open class NoteRecyclerViewHolderBase(context: Context, view: View) : RecyclerVi
 
     pinIndicator.visibility = if (data.pinned) View.VISIBLE else View.GONE
 
+    val noteTimestamp = data.displayTime
     if (!TextUtils.isNullOrEmpty(data.tags)) {
       tags.setTextColor(ContextCompat.getColor(context, R.color.light_secondary_text))
       val source = Markwon.markdown(context, data.getTagString(context))
-      tags.setText(trim(source))
-    } else {
+      tags.text = trim(source)
+      tags.visibility = VISIBLE
+    } else if (!TextUtils.isNullOrEmpty(noteTimestamp)) {
       tags.setTextColor(ContextCompat.getColor(context, R.color.light_hint_text))
-      tags.text = data.displayTime
+      tags.text = noteTimestamp
+      tags.visibility = VISIBLE
+    } else {
+      tags.visibility = GONE
     }
 
     view.setOnClickListener { viewClick(data, extra) }