Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions Calendar/CalendarKit/CalendarLogic.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class CalendarLogic: Hashable {
var dates = [Date]()
let numberOfDaysInMonth = baseDate.numberOfDaysInMonth
let component = baseDate.monthDayAndYearComponents
for var i = 1; i <= numberOfDaysInMonth; i++ {
for i in 1 ... numberOfDaysInMonth {
dates.append(Date(day: i, month: component.month, year: component.year))
}
return dates
Expand All @@ -107,9 +107,13 @@ class CalendarLogic: Hashable {
let numberOfVisibleDays = numberOfDaysInPreviousPartialWeek
let parts = date.monthDayAndYearComponents

for var i = numberOfDaysInMonth - (numberOfVisibleDays - 1); i <= numberOfDaysInMonth; i++ {
dates.append(Date(day: i, month: parts.month, year: parts.year))
// If 'numberOfVisibleDays' is equal to 0, the range fails, because -(-1) makes the start > end
if (numberOfDaysInMonth - (numberOfVisibleDays - 1)) < numberOfDaysInMonth {
for i in (numberOfDaysInMonth - (numberOfVisibleDays - 1)) ... numberOfDaysInMonth {
dates.append(Date(day: i, month: parts.month, year: parts.year))
}
}

return dates
}

Expand All @@ -120,7 +124,7 @@ class CalendarLogic: Hashable {
let numberOfDays = numberOfVisibleDaysforFollowingMonth
let parts = date.monthDayAndYearComponents

for var i = 1; i <= numberOfDays; i++ {
for i in 1 ... numberOfDays {
dates.append(Date(day: i, month: parts.month, year: parts.year))
}
return dates
Expand Down
4 changes: 2 additions & 2 deletions Calendar/CalendarKit/CalendarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CalendarView: UIView, UICollectionViewDataSource, UICollectionViewDelegate
var set = Set<CalendarLogic>()
set.insert(CalendarLogic(date: baseDate!))
// advance one year
for var i = 0; i < kMonthRange; i++ {
for _ in 0 ..< kMonthRange {
dateIter1 = dateIter1.firstDayOfFollowingMonth
dateIter2 = dateIter2.firstDayOfPreviousMonth

Expand Down Expand Up @@ -138,7 +138,7 @@ class CalendarView: UIView, UICollectionViewDataSource, UICollectionViewDelegate

func moveToSelectedDate(animated: Bool) {
var index = -1
for var i = 0; i < collectionData.count; i++ {
for i in 0 ..< collectionData.count {
let logic = collectionData[i]
if logic.containsDate(selectedDate!) {
index = i
Expand Down
2 changes: 1 addition & 1 deletion Calendar/CalendarKit/WeekHeaderView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class WeekHeaderView: UICollectionReusableView {

override func awakeFromNib() {
if labels.count == formatter.weekdaySymbols.count {
for var i = 0; i < formatter.weekdaySymbols.count; i++ {
for i in 0 ..< formatter.weekdaySymbols.count {
let weekDayString = formatter.weekdaySymbols[i]

labels[i].text = weekDayString.substringToIndex(weekDayString.startIndex.advancedBy(3)).uppercaseString
Expand Down