Improve relative time formatting in the notification activity.

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/notifications/NotificationActivity.kt

@@ -7,7 +7,6 @@ import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
-import android.text.format.DateUtils
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -380,7 +379,7 @@ class NotificationActivity : BaseActivity() {
                 }
             }
 
-            binding.notificationTime.text = DateUtils.getRelativeTimeSpanString(n.date().time, System.currentTimeMillis(), 0L)
+            binding.notificationTime.text = DateUtil.formatRelativeTime(n.instant())
             binding.notificationTime.setTextColor(if (n.isUnread) primaryColor else inactiveColor)
             binding.notificationOverflowMenu.imageTintList = if (n.isUnread) primaryColor else inactiveColor
 

app/src/main/java/org/wikipedia/notifications/NotificationViewModel.kt

@@ -61,7 +61,7 @@ class NotificationViewModel : ViewModel() {
             }
         }
         // Sort them by descending date...
-        notificationList.sortByDescending { it.date() }
+        notificationList.sortByDescending { it.instant() }
 
         // Filtered the tab selection
         val tabSelectedList = notificationList

app/src/main/java/org/wikipedia/notifications/db/Notification.kt

@@ -11,8 +11,8 @@ import org.wikipedia.Constants
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.Namespace
-import org.wikipedia.util.DateUtil
 import org.wikipedia.util.UriUtil
+import java.time.Instant
 import java.util.*
 
 @Serializable
@@ -40,8 +40,8 @@ class Notification(var id: Long = 0,
         return id + wiki.hashCode()
     }
 
-    fun date(): Date {
-        return timestamp?.date() ?: Date()
+    fun instant(): Instant {
+        return timestamp?.instant ?: Instant.now()
     }
 
     override fun toString(): String {
@@ -69,12 +69,9 @@ class Notification(var id: Long = 0,
     }
 
     @Serializable
-    class Timestamp {
-
-        val utciso8601: String? = null
-
-        fun date(): Date {
-            return DateUtil.iso8601DateParse(utciso8601!!)
+    class Timestamp(val utciso8601: String) {
+        val instant: Instant by lazy {
+            Instant.parse(utciso8601)
         }
     }
 

app/src/main/java/org/wikipedia/util/DateUtil.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.icu.text.RelativeDateTimeFormatter
 import android.os.Build
 import android.text.format.DateFormat
+import android.text.format.DateUtils
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.feed.model.UtcDate
@@ -15,6 +16,7 @@ import java.time.ZoneId
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
+import java.time.temporal.ChronoUnit
 import java.time.temporal.TemporalAccessor
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
@@ -184,4 +186,11 @@ object DateUtil {
             else targetResource.getQuantityString(R.plurals.diff_years, diffInYears, diffInYears)
         }
     }
+
+    fun formatRelativeTime(instant: Instant): CharSequence {
+        val localDate = LocalDateTime.ofInstant(instant, ZoneId.systemDefault()).toLocalDate()
+        val weeks = localDate.until(LocalDate.now(), ChronoUnit.WEEKS)
+        val flags = if (weeks in 1..10) DateUtils.WEEK_IN_MILLIS else 0L
+        return DateUtils.getRelativeTimeSpanString(instant.toEpochMilli(), System.currentTimeMillis(), flags)
+    }
 }