zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Use shortest possible timestamp on notifications

Browse Source 
Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification
This commit is contained in:
shannon 2025-03-10 12:18:36 -04:00
parent 552a844582
commit 53db7079b4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
View File

@ -602,7 +602,7 @@ struct NotificationRowView: View {
Text(string) Text(string)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
case .timeSinceLabel(let date): case .timeSinceLabel(let date):
Text(date.localizedAbbreviatedSlowedTimeAgoSinceNow) Text(date.localizedExtremelyAbbreviatedTimeElapsedUntilNow)
.font(.subheadline) .font(.subheadline)
.frame(height: actionSuperheaderHeight) .frame(height: actionSuperheaderHeight)
.fixedSize(horizontal: true, vertical: false) .fixedSize(horizontal: true, vertical: false)
@ -628,7 +628,7 @@ struct NotificationRowView: View {
HStack(alignment: .top, spacing: 2) { HStack(alignment: .top, spacing: 2) {
Text(string) Text(string)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
Text(date.localizedAbbreviatedSlowedTimeAgoSinceNow) Text(date.localizedExtremelyAbbreviatedTimeElapsedUntilNow)
.font(.subheadline) .font(.subheadline)
.frame(height: actionSuperheaderHeight) .frame(height: actionSuperheaderHeight)
.fixedSize(horizontal: true, vertical: false) .fixedSize(horizontal: true, vertical: false)

13
MastodonSDK/Sources/MastodonUI/Extension/Date.swift
View File

@ -9,6 +9,14 @@ import Foundation
import MastodonAsset import MastodonAsset
import MastodonLocalization import MastodonLocalization
let extremeDateAbbreviatingFormatter: DateComponentsFormatter = {
let formatter = DateComponentsFormatter()
formatter.allowedUnits = [.year, .month, .day, .hour, .minute, .second]
formatter.unitsStyle = .abbreviated
formatter.maximumUnitCount = 1
return formatter
}()
extension Date { extension Date {
static let calendar = Calendar(identifier: .gregorian) static let calendar = Calendar(identifier: .gregorian)
@ -35,6 +43,11 @@ extension Date {
public var localizedAbbreviatedSlowedTimeAgoSinceNow: String { public var localizedAbbreviatedSlowedTimeAgoSinceNow: String {
return Date.relativeTimestampFormatter.localizedString(for: self, relativeTo: Date()) return Date.relativeTimestampFormatter.localizedString(for: self, relativeTo: Date())
} }
public var localizedExtremelyAbbreviatedTimeElapsedUntilNow: String {
let interval = Date.now.timeIntervalSince(self)
return extremeDateAbbreviatingFormatter.string(from: interval) ?? ""
}
} }
extension Date { extension Date {