Proton/ios-mail
1
0
Fork 0
mirror of https://github.com/ProtonMail/ios-mail.git synced 2026-06-14 09:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify date formatting by using newer API

Browse Source 
New API https://developer.apple.com/documentation/foundation/date/formatted(_:)
This commit is contained in:
Mateusz Szklarek
2025-07-30 12:34:04 +00:00
committed by MargeBot
parent b438b5285d
commit ca960552b0
2 changed files with 32 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/InboxCore/Sources/Formatters+Environment.swift
-17
View File
@@ -35,20 +35,3 @@ extension DateFormatter {
}
extension DateIntervalFormatter {
public static func withEnvCalendar() -> Self {
let formatter = Self()
formatter.locale = DateEnvironment.calendar.locale
formatter.timeZone = DateEnvironment.calendar.timeZone
return formatter
}
public static func withGMTCalendar() -> Self {
let formatter = Self()
formatter.locale = DateEnvironment.calendarGMT.locale
formatter.timeZone = DateEnvironment.calendarGMT.timeZone
return formatter
}
}
Modules/InboxRSVP/Sources/RSVPDateFormatter.swift
+32 -32
View File
@@ -42,52 +42,52 @@ enum RSVPDateFormatter {
let now = DateEnvironment.currentDate()
let realNow = Date()
var dateForStringFetching: Date?
var relativeDate: Date?
if calendar.isDate(fromDate, inSameDayAs: now) {
dateForStringFetching = realNow
relativeDate = realNow
} else if calendar.isDateInTomorrow(fromDate) {
dateForStringFetching = calendar.nextDay(after: realNow)
relativeDate = calendar.nextDay(after: realNow)
} else if calendar.isDateInYesterday(fromDate) {
dateForStringFetching = calendar.previousDay(before: realNow)
relativeDate = calendar.previousDay(before: realNow)
}
if let effectiveDate = dateForStringFetching {
return relativeFormatter.string(from: effectiveDate)
if let relativeDate {
return relativeFormatter.string(from: relativeDate)
}
return allDayDateFormatter.string(from: fromDate)
let allDayStyle = Date.FormatStyle(
date: .abbreviated,
time: .omitted,
locale: calendar.locale!,
calendar: calendar,
timeZone: calendar.timeZone
)
return fromDate.formatted(allDayStyle)
}
return allDayDateIntervalFormatter.string(from: fromDate, to: adjustedToDate)
let allDayIntervalStyle = Date.IntervalFormatStyle.init(
date: .abbreviated,
time: .omitted,
locale: calendar.locale!,
calendar: calendar,
timeZone: calendar.timeZone
)
return allDayIntervalStyle.format(fromDate..<adjustedToDate)
case .dateTime:
return partDayDateIntervalFormatter.string(from: fromDate, to: toDate)
let calendar = DateEnvironment.calendar
let dateTimeStyle = Date.IntervalFormatStyle.init(
date: .abbreviated,
time: .shortened,
locale: calendar.locale!,
timeZone: calendar.timeZone
)
return dateTimeStyle.format(fromDate..<toDate)
}
}
// MARK: - Private
private static let partDayDateIntervalFormatter: DateIntervalFormatter = {
let formatter = DateIntervalFormatter.withEnvCalendar()
formatter.dateStyle = .medium
formatter.timeStyle = .short
return formatter
}()
private static let allDayDateIntervalFormatter: DateIntervalFormatter = {
let formatter = DateIntervalFormatter.withGMTCalendar()
formatter.dateStyle = .medium
formatter.timeStyle = .none
return formatter
}()
private static let allDayDateFormatter: DateFormatter = {
let formatter = DateFormatter.withGMTCalendar()
formatter.dateStyle = .medium
formatter.timeStyle = .none
return formatter
}()
private static let relativeFormatter: DateFormatter = {
let formatter = DateFormatter.withGMTCalendar()
formatter.dateStyle = .medium