-
-
Notifications
You must be signed in to change notification settings - Fork 27
Allow option for full date display #274
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // SmartDateFormatter.swift | ||
| // Thunderbird | ||
| // | ||
| // Created by Ashley Soucar on 3/6/26. | ||
| // | ||
| import SwiftUI | ||
|
|
||
| @MainActor | ||
| public struct SmartDateFormatter { | ||
|
|
||
| func dateFormatter(date: Date, isSmartDate: Bool) -> String { | ||
| if isSmartDate { | ||
| return smartDate(date: date) | ||
| } | ||
| return fullDateFormatter(date: date) | ||
| } | ||
|
|
||
| private func fullDateFormatter(date: Date) -> String { | ||
| return date.formatted(date: .numeric, time: .omitted) | ||
| } | ||
|
|
||
| private func smartDate(date: Date) -> String { | ||
| if Calendar.autoupdatingCurrent.isDateInToday(date) { | ||
| return date.formatted(date: .omitted, time: .shortened) | ||
| } else if Calendar.autoupdatingCurrent.isDateInYesterday(date) { | ||
| let relativeDateFormatter = RelativeDateTimeFormatter() | ||
| return relativeDateFormatter.localizedString(for: date, relativeTo: Date()) | ||
| } else if !Calendar.autoupdatingCurrent.isDate(date, equalTo: Date(), toGranularity: .year) { | ||
| return date.formatted(.dateTime.month(.abbreviated).day().year()) | ||
| } else { | ||
| return date.formatted(.dateTime.month(.abbreviated).day()) | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
Thunderbird/ThunderbirdTests/UtilTests/SmartDateFormatterTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // | ||
| // SmartDateFormatterTests.swift | ||
| // ThunderbirdTests | ||
| // | ||
| // Created by Ashley Soucar on 3/6/26. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Testing | ||
|
|
||
| @MainActor @Suite("Smart Date Formatter tests") struct SmartDateFormatterTests { | ||
| var oldDate: Date | ||
| var thisYearDate: Date | ||
| var yesterdayDate: Date | ||
| var todayDate: Date | ||
|
|
||
| init() async throws { | ||
| let calendar = Calendar.autoupdatingCurrent | ||
| let year = calendar.component(.year, from: Date()) | ||
| var dateCompon = DateComponents() | ||
| dateCompon.day = 1 | ||
| dateCompon.month = 1 | ||
| dateCompon.year = year | ||
| dateCompon.timeZone = TimeZone.autoupdatingCurrent | ||
|
|
||
| thisYearDate = calendar.date(from: dateCompon)! //Same Calendar year as now | ||
| oldDate = Date(timeIntervalSinceReferenceDate: 51_556_900) // Aug 20, 2002 | ||
| yesterdayDate = Date(timeIntervalSinceNow: -86400) // 24 hours previous | ||
| todayDate = Date(timeIntervalSinceNow: -300) // 5 minutes ago | ||
| } | ||
|
|
||
| @Test func smartDate_OldDateTest() async throws { | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: oldDate, isSmartDate: true) | ||
| == oldDate | ||
| .formatted(date: .abbreviated, time: .omitted) | ||
| ) | ||
| } | ||
|
|
||
| @Test func smartDate_ThisYearTest() async throws { | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: thisYearDate, isSmartDate: true) | ||
| == thisYearDate | ||
| .formatted(.dateTime.day().month(.abbreviated)) | ||
| ) | ||
| } | ||
|
|
||
| @Test func smartDate_YesterdayTest() async throws { | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: yesterdayDate, isSmartDate: true) == "1 day ago") | ||
| } | ||
|
|
||
| @Test func smartDate_TodayTest() async throws { | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: todayDate, isSmartDate: true) | ||
| == todayDate | ||
| .formatted(date: .omitted, time: .shortened)) | ||
| } | ||
|
|
||
| @Test func fullDate_AllDatesTest() async throws { | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: oldDate, isSmartDate: false) == oldDate.formatted(date: .numeric, time: .omitted)) | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: thisYearDate, isSmartDate: false) | ||
| == thisYearDate | ||
| .formatted(date: .numeric, time: .omitted)) | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: yesterdayDate, isSmartDate: false) | ||
| == yesterdayDate | ||
| .formatted(date: .numeric, time: .omitted)) | ||
| #expect( | ||
| SmartDateFormatter() | ||
| .dateFormatter(date: todayDate, isSmartDate: false) | ||
| == todayDate | ||
| .formatted(date: .numeric, time: .omitted)) | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.