Skip to content

Reuse log date formatters #105

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
jovalle02 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reuse log date formatters #105

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
50 changes: 30 additions & 20 deletions app/dime/Views/LogView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2207,6 +2207,32 @@ struct MonthStepperView: View {
}
}

private enum LogDateFormatters {
static let sectionDateWithYear: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "EEE, d MMM yy"
return dateFormatter
}()

static let sectionDate: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "EEE, d MMM"
return dateFormatter
}()

static let accessibilityDate: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "EEE, d MMM yyyy"
return dateFormatter
}()

static let accessibilityTime: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "h:mm a"
return dateFormatter
}()
}

func dateConverter(date: Date) -> String {
let calendar = Calendar.current

Expand All @@ -2219,20 +2245,12 @@ func dateConverter(date: Date) -> String {
} else if calendar.isDateInYesterday(date) {
return String(localized: "yesterday")
} else if startOfCurrentYear > date {
let dateFormatter = DateFormatter()

dateFormatter.dateFormat = "EEE, d MMM yy"

var string = dateFormatter.string(from: date)
var string = LogDateFormatters.sectionDateWithYear.string(from: date)
string.insert("'", at: string.index(string.endIndex, offsetBy: -2))

return string
} else {
let dateFormatter = DateFormatter()

dateFormatter.dateFormat = "EEE, d MMM"

return dateFormatter.string(from: date)
return LogDateFormatters.sectionDate.string(from: date)
}
}

Expand All @@ -2244,20 +2262,12 @@ func dateConverterAccessibilityLabel(date: Date) -> String {
} else if calendar.isDateInYesterday(date) {
return "yesterday"
} else {
let dateFormatter = DateFormatter()

dateFormatter.dateFormat = "EEE, d MMM yyyy"

return "on " + dateFormatter.string(from: date)
return "on " + LogDateFormatters.accessibilityDate.string(from: date)
}
}

func timeConverterAccessibilityLabel(date: Date) -> String {
let dateFormatter = DateFormatter()

dateFormatter.dateFormat = "h:mm a"

return dateFormatter.string(from: date)
return LogDateFormatters.accessibilityTime.string(from: date)
}

func dayTotal(dayTransaction: [Transaction]) -> Double {
Expand Down