Adding modified times. Fixes #46

Author: dessalines

app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt

@@ -43,6 +43,7 @@ fun CommentNodeHeader(
         score = score,
         myVote = myVote,
         published = commentView.comment.published,
+        updated = commentView.comment.updated,
         onPersonClick = onPersonClick,
         isPostCreator = isPostCreator(commentView),
         isModerator = isModerator,

app/src/main/java/com/jerboa/ui/components/common/AppBars.kt

@@ -140,6 +140,7 @@ fun CommentOrPostNodeHeader(
     score: Int,
     myVote: Int?,
     published: String,
+    updated: String?,
     onPersonClick: (personId: Int) -> Unit = {},
     isPostCreator: Boolean,
     isModerator: Boolean,
@@ -171,7 +172,7 @@ fun CommentOrPostNodeHeader(
                 color = scoreColor(myVote = myVote)
             )
             DotSpacer(0.dp)
-            TimeAgo(dateStr = published)
+            TimeAgo(published = published, updated = updated)
         }
     }
 }

app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt

@@ -1,7 +1,9 @@
 package com.jerboa.ui.components.common
 
+import androidx.compose.foundation.layout.Row
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import com.jerboa.datatypes.samplePersonSafe
 import com.jerboa.prettyTime
@@ -11,28 +13,50 @@ import java.time.Instant
 import java.util.*
 
 @Composable
-fun TimeAgo(dateStr: String, precedingString: String? = null, includeAgo: Boolean = false) {
-    val then = Date.from(Instant.parse(dateStr + "Z"))
-    val pt = prettyTime.formatDuration(then)
+fun TimeAgo(
+    published: String,
+    updated: String? = null,
+    precedingString: String? = null,
+    includeAgo: Boolean = false
+) {
+    val publishedPretty = dateStringToPretty(published, includeAgo)
 
-    val pretty = if (includeAgo) {
-        pt
-    } else {
-        prettyTimeShortener(pt)
+    val afterPreceding = precedingString?.let {
+        "$it $publishedPretty ago"
+    } ?: run { publishedPretty }
+
+    Row {
+        Text(
+            text = afterPreceding,
+            color = Muted,
+        )
+
+        updated?.also {
+            val updatedPretty = dateStringToPretty(it, includeAgo)
+
+            DotSpacer()
+            Text(
+                text = "($updatedPretty)",
+                color = Muted,
+                fontStyle = FontStyle.Italic,
+            )
+        }
     }
+}
 
-    val afterPreceding = precedingString?.let {
-        "$it $pretty ago"
-    } ?: run { pretty }
+fun dateStringToPretty(dateStr: String, includeAgo: Boolean = false): String {
+    val publishedDate = Date.from(Instant.parse(dateStr + "Z"))
+    val prettyPublished = prettyTime.formatDuration(publishedDate)
 
-    Text(
-        text = afterPreceding,
-        color = Muted,
-    )
+    return if (includeAgo) {
+        prettyPublished
+    } else {
+        prettyTimeShortener(prettyPublished)
+    }
 }
 
 @Preview
 @Composable
 fun TimeAgoPreview() {
-    TimeAgo(samplePersonSafe.published)
+    TimeAgo(samplePersonSafe.published, samplePersonSafe.updated)
 }

app/src/main/java/com/jerboa/ui/components/home/Sidebar.kt

@@ -46,7 +46,7 @@ fun Sidebar(siteView: SiteView) {
         TimeAgo(
             precedingString = "Created",
             includeAgo = true,
-            dateStr = site.published
+            published = site.published
         )
         CommentsAndPosts(siteView = siteView)
         site.sidebar?.also {

app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt

@@ -59,7 +59,7 @@ fun PersonProfileTopSection(
                 TimeAgo(
                     precedingString = "Joined",
                     includeAgo = true,
-                    dateStr = personView.person.published
+                    published = personView.person.published
                 )
                 CommentsAndPosts(personView)
                 personView.person.bio?.also {

app/src/main/java/com/jerboa/ui/components/post/PostListing.kt

@@ -63,7 +63,10 @@ fun PostHeaderLine(
             }
         }
 
-        TimeAgo(dateStr = postView.post.published)
+        TimeAgo(
+            published = postView.post.published,
+            updated = postView.post.updated,
+        )
     }
 }
 
@@ -85,6 +88,7 @@ fun PostNodeHeader(
         score = postView.counts.score,
         myVote = postView.my_vote,
         published = postView.post.published,
+        updated = postView.post.updated,
         onPersonClick = onPersonClick,
         isPostCreator = true,
         isModerator = isModerator,

app/src/main/java/com/jerboa/ui/components/private_message/PrivateMessage.kt

@@ -58,7 +58,10 @@ fun PrivateMessageHeader(
             )
         }
 
-        TimeAgo(dateStr = privateMessageView.private_message.published)
+        TimeAgo(
+            published = privateMessageView.private_message.published,
+            updated = privateMessageView.private_message.updated,
+        )
     }
 }