Skip to content

fix: respect system 24-hour format for message timestamps #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feather2222 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

fix: respect system 24-hour format for message timestamps #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import com.github.gotify.databinding.MessageItemBinding
import com.github.gotify.databinding.MessageItemCompactBinding
import com.github.gotify.messages.provider.MessageWithImage
import io.noties.markwon.Markwon
import java.text.DateFormat
import java.time.OffsetDateTime
import java.util.Date

Expand Down Expand Up @@ -158,9 +157,13 @@ internal class ListMessageAdapter(
val time = dateTime.toInstant().toEpochMilli()
val date = Date(time)
if (DateUtils.isToday(time)) {
DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
android.text.format.DateFormat.getTimeFormat(itemView.context).format(date)
} else {
DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT).format(date)
val datePart = android.text.format.DateFormat.getDateFormat(itemView.context)
.format(date)
val timePart = android.text.format.DateFormat.getTimeFormat(itemView.context)
.format(date)
"$datePart $timePart"
}
}

Expand Down