Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always display relative date in the timeline

This commit is contained in:
Thomas Ricouard 2023-01-22 20:14:05 +01:00
parent 88ac6e1de5
commit ce41e6b000
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift
View File

@ -31,7 +31,7 @@ struct ConversationsListRow: View {
.foregroundColor(theme.tintColor)
.frame(width: 10, height: 10)
}
Text(conversation.lastStatus.createdAt.formatted)
Text(conversation.lastStatus.createdAt.relativeFormatted)
.font(.scaledFootnote)
}
Text(conversation.lastStatus.content.asRawText)

6
Packages/Models/Sources/Models/Alias/ServerDate.swift
View File

@ -29,14 +29,10 @@ extension ServerDate {
Self.createdAtDateFormatter.date(from: self)!
}
public var formatted: String {
if Self.calendar.numberOfDaysBetween(asDate, and: Date()) > 1 {
return Self.createdAtShortDateFormatted.string(from: asDate)
} else {
public var relativeFormatted: String {
return Self.createdAtRelativeFormatter.localizedString(for: asDate, relativeTo: Date())
}
}
}
extension Calendar {
func numberOfDaysBetween(_ from: Date, and to: Date) -> Int {

2
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View File

@ -62,7 +62,7 @@ struct NotificationRowView: View {
.font(.scaledFootnote)
.fontWeight(.regular)
.foregroundColor(.gray) +
Text(notification.createdAt.formatted)
Text(notification.createdAt.relativeFormatted)
.font(.scaledFootnote)
.fontWeight(.regular)
.foregroundColor(.gray)

2
Packages/Status/Sources/Status/Embed/StatusEmbededView.swift
View File

@ -41,7 +41,7 @@ public struct StatusEmbeddedView: View {
Group {
Text("@\(account.acct)") +
Text(" ⸱ ") +
Text(status.reblog?.createdAt.formatted ?? status.createdAt.formatted)
Text(status.reblog?.createdAt.relativeFormatted ?? status.createdAt.relativeFormatted)
}
.font(.scaledCaption)
.foregroundColor(.gray)

4
Packages/Status/Sources/Status/Row/StatusRowView.swift
View File

@ -197,7 +197,7 @@ public struct StatusRowView: View {
.accessibilityHidden(true)
}
.accessibilityElement()
.accessibilityLabel(Text("\(status.account.displayName), \(status.createdAt.formatted)"))
.accessibilityLabel(Text("\(status.account.displayName), \(status.createdAt.relativeFormatted)"))
}
makeStatusContentView(status: status)
.contentShape(Rectangle())
@ -266,7 +266,7 @@ public struct StatusRowView: View {
Group {
Text("@\(status.account.acct)") +
Text(" ⸱ ") +
Text(status.createdAt.formatted) +
Text(status.createdAt.relativeFormatted) +
Text(" ⸱ ") +
Text(Image(systemName: viewModel.status.visibility.iconName))
}