Skip to content
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

Fixes #45 CurrentValueView displaying selected date range wrong when using a custom calendar. #46

Closed
wants to merge 1 commit into from
+2 −1
Closed

Fixes #45 CurrentValueView displaying selected date range wrong when using a custom calendar. #46

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
3 changes: 2 additions & 1 deletion Sources/Views/CurrentValueView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ final class CurrentValueView<Value: FastisValue>: UIView {
formatter.locale = self.calendar.locale
formatter.dateFormat = self.config.format
formatter.calendar = self.calendar
formatter.timeZone = self.calendar.timeZone
return formatter
}()

Expand Down Expand Up @@ -127,7 +128,7 @@ final class CurrentValueView<Value: FastisValue>: UIView {
self.clearButton.alpha = 1
self.clearButton.isUserInteractionEnabled = true

if value.onSameDay {
if value.fromDate.isInSameDay(in: self.calendar ,date: value.toDate) {
self.label.text = self.dateFormatter.string(from: value.fromDate)
} else {
self.label.text = self.dateFormatter.string(from: value.fromDate) + " – " + self.dateFormatter.string(from: value.toDate)
Expand Down