mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-20 18:21:12 +02:00
Better timeAgo formatting
This commit is contained in:
@@ -87,7 +87,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
|
|||||||
|
|
||||||
if (note.event !is RepostEvent) {
|
if (note.event !is RepostEvent) {
|
||||||
Text(
|
Text(
|
||||||
" " + timeAgo(note.event?.createdAt),
|
timeAgo(note.event?.createdAt),
|
||||||
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
|
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
@@ -14,5 +14,24 @@ fun timeAgo(mills: Long?): String {
|
|||||||
if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
|
if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
|
||||||
humanReadable = "now";
|
humanReadable = "now";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return " • " + humanReadable
|
||||||
|
.replace(" hr. ago", "h")
|
||||||
|
.replace(" min. ago", "m")
|
||||||
|
}
|
||||||
|
|
||||||
|
fun timeAgoLong(mills: Long?): String {
|
||||||
|
if (mills == null) return " "
|
||||||
|
|
||||||
|
var humanReadable = DateUtils.getRelativeTimeSpanString(
|
||||||
|
mills * 1000,
|
||||||
|
System.currentTimeMillis(),
|
||||||
|
DateUtils.MINUTE_IN_MILLIS,
|
||||||
|
DateUtils.FORMAT_SHOW_TIME
|
||||||
|
).toString()
|
||||||
|
if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
|
||||||
|
humanReadable = "now";
|
||||||
|
}
|
||||||
|
|
||||||
return humanReadable
|
return humanReadable
|
||||||
}
|
}
|
@@ -58,6 +58,7 @@ import com.vitorpamplona.amethyst.ui.note.NoteCompose
|
|||||||
import com.vitorpamplona.amethyst.ui.note.ReactionsRowState
|
import com.vitorpamplona.amethyst.ui.note.ReactionsRowState
|
||||||
import com.vitorpamplona.amethyst.ui.note.UserDisplay
|
import com.vitorpamplona.amethyst.ui.note.UserDisplay
|
||||||
import com.vitorpamplona.amethyst.ui.note.timeAgo
|
import com.vitorpamplona.amethyst.ui.note.timeAgo
|
||||||
|
import com.vitorpamplona.amethyst.ui.note.timeAgoLong
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@@ -201,7 +202,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
|
|||||||
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Text(
|
Text(
|
||||||
timeAgo(note.event?.createdAt),
|
timeAgoLong(note.event?.createdAt),
|
||||||
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
|
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user