min · peterpaulis · Nov 16, 2013
diff --git a/MNCalendarView/MNCalendarHeaderView.h b/MNCalendarView/MNCalendarHeaderView.h
diff --git a/MNCalendarView/MNCalendarHeaderView.m b/MNCalendarView/MNCalendarHeaderView.m
diff --git a/MNCalendarView/MNCalendarView-Prefix.pch b/MNCalendarView/MNCalendarView-Prefix.pch
diff --git a/MNCalendarView/MNCalendarView.h b/MNCalendarView/MNCalendarView.h
@@ -33,6 +33,8 @@
 @property(nonatomic,strong) Class weekdayCellClass;
 @property(nonatomic,strong) Class dayCellClass;
 
+@property(nonatomic, assign) BOOL inversed;
+
 - (void)reloadData;
 - (void)registerUICollectionViewClasses; 
 

diff --git a/MNCalendarView/MNCalendarView.m b/MNCalendarView/MNCalendarView.m
@@ -108,14 +108,19 @@ - (void)setSelectedDate:(NSDate *)selectedDate {
 - (void)reloadData {
   NSMutableArray *monthDates = @[].mutableCopy;
   MNFastDateEnumeration *enumeration =
-    [[MNFastDateEnumeration alloc] initWithFromDate:[self.fromDate mn_firstDateOfMonth:self.calendar]
-                                             toDate:[self.toDate mn_firstDateOfMonth:self.calendar]
+    [[MNFastDateEnumeration alloc] initWithFromDate:[self.fromDate firstDateOfMonthWithCalendar:self.calendar]
+                                             toDate:[self.toDate lastDateOfMonthWithCalendar:self.calendar]
                                            calendar:self.calendar
                                                unit:NSMonthCalendarUnit];
   for (NSDate *date in enumeration) {
     [monthDates addObject:date];
   }
-  self.monthDates = monthDates;
+
+  if (self.inversed) {
+      self.monthDates = [[monthDates reverseObjectEnumerator] allObjects];
+  } else {
+      self.monthDates = monthDates;
+  }
 
   NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
   formatter.calendar = self.calendar;
@@ -138,26 +143,32 @@ - (void)registerUICollectionViewClasses {
 }
 
 - (NSDate *)firstVisibleDateOfMonth:(NSDate *)date {
-  date = [date mn_firstDateOfMonth:self.calendar];
-
-  NSDateComponents *components =
-    [self.calendar components:NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit|NSWeekdayCalendarUnit
-                fromDate:date];
-
-  return
-    [[date mn_dateWithDay:-((components.weekday - 1) % self.daysInWeek) calendar:self.calendar] dateByAddingTimeInterval:MN_DAY];
+
+    return [[date firstDateOfMonthWithCalendar:self.calendar] firstDateOfWeekWithCalendar:self.calendar];
+
+//  date = [date mn_firstDateOfMonth:self.calendar];
+//  
+//  NSDateComponents *components =
+//    [self.calendar components:NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit|NSWeekdayCalendarUnit
+//                fromDate:date];
+//  
+//  return
+//    [[date mn_dateWithDay:-((components.weekday - 1) % self.daysInWeek) calendar:self.calendar] dateByAddingTimeInterval:MN_DAY];
 }
 
 - (NSDate *)lastVisibleDateOfMonth:(NSDate *)date {
-  date = [date mn_lastDateOfMonth:self.calendar];
-
-  NSDateComponents *components =
-    [self.calendar components:NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit|NSWeekdayCalendarUnit
-                     fromDate:date];
-
-  return
-    [date mn_dateWithDay:components.day + (self.daysInWeek - 1) - ((components.weekday - 1) % self.daysInWeek)
-                calendar:self.calendar];
+
+    return [[date lastDateOfMonthWithCalendar:self.calendar] lastDateOfWeekWithCalendar:self.calendar];
+
+//  date = [date mn_lastDateOfMonth:self.calendar];
+//  
+//  NSDateComponents *components =
+//    [self.calendar components:NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit|NSWeekdayCalendarUnit
+//                     fromDate:date];
+//  
+//  return
+//    [date mn_dateWithDay:components.day + (self.daysInWeek - 1) - ((components.weekday - 1) % self.daysInWeek)
+//                calendar:self.calendar];
 }
 
 - (void)applyConstraints {
@@ -236,9 +247,11 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
     MNCalendarViewWeekdayCell *cell =
       [collectionView dequeueReusableCellWithReuseIdentifier:MNCalendarViewWeekdayCellIdentifier
                                                 forIndexPath:indexPath];
-
+
+    NSInteger adjustedIndexOfDayInWeek = (indexPath.item + self.calendar.firstWeekday - 1) % self.daysInWeek;
+
     cell.backgroundColor = self.collectionView.backgroundColor;
-    cell.titleLabel.text = self.weekdaySymbols[indexPath.item];
+    cell.titleLabel.text = self.weekdaySymbols[adjustedIndexOfDayInWeek];
     cell.separatorColor = self.separatorColor;
     return cell;
   }
@@ -252,6 +265,15 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
 
   NSUInteger day = indexPath.item - self.daysInWeek;
 
+  if (self.inversed) {
+
+      NSInteger numberOfDaysInMonth = ([self.collectionView numberOfItemsInSection:indexPath.section] - self.daysInWeek) - 1;
+      NSInteger r = day / self.daysInWeek;
+      NSInteger c = day % self.daysInWeek;
+      day = numberOfDaysInMonth - (r * self.daysInWeek + (self.daysInWeek - c)) + 1;
+
+  }
+
   NSDateComponents *components =
     [self.calendar components:NSDayCalendarUnit|NSMonthCalendarUnit|NSYearCalendarUnit
                      fromDate:firstDateInMonth];

diff --git a/MNCalendarView/MNCalendarViewCell.h b/MNCalendarView/MNCalendarViewCell.h
diff --git a/MNCalendarView/MNCalendarViewCell.m b/MNCalendarView/MNCalendarViewCell.m
diff --git a/MNCalendarView/MNCalendarViewDayCell.h b/MNCalendarView/MNCalendarViewDayCell.h
diff --git a/MNCalendarView/MNCalendarViewDayCell.m b/MNCalendarView/MNCalendarViewDayCell.m
@@ -36,8 +36,8 @@ - (void)setDate:(NSDate *)date
   [self.calendar components:NSMonthCalendarUnit
                    fromDate:self.month];
 
-  self.weekday = components.weekday;
-  self.titleLabel.text = [NSString stringWithFormat:@"%d", components.day];
+  self.weekday = (components.weekday + self.calendar.firstWeekday - 1) % 7;
+  self.titleLabel.text = [NSString stringWithFormat:@"%ld", (long)components.day];
   self.enabled = monthComponents.month == components.month;
 
   [self setNeedsDisplay];

diff --git a/MNCalendarView/MNCalendarViewLayout.h b/MNCalendarView/MNCalendarViewLayout.h
diff --git a/MNCalendarView/MNCalendarViewLayout.m b/MNCalendarView/MNCalendarViewLayout.m
diff --git a/MNCalendarView/MNCalendarViewWeekdayCell.h b/MNCalendarView/MNCalendarViewWeekdayCell.h
diff --git a/MNCalendarView/MNCalendarViewWeekdayCell.m b/MNCalendarView/MNCalendarViewWeekdayCell.m
diff --git a/MNCalendarView/MNFastDateEnumeration.h b/MNCalendarView/MNFastDateEnumeration.h
diff --git a/MNCalendarView/MNFastDateEnumeration.m b/MNCalendarView/MNFastDateEnumeration.m
diff --git a/MNCalendarView/NSDate+MNAdditions.h b/MNCalendarView/NSDate+MNAdditions.h
@@ -10,10 +10,18 @@
 
 @interface NSDate (MNAdditions)
 
-- (instancetype)mn_firstDateOfMonth:(NSCalendar *)calendar;
+- (NSDate *)firstDateOfWeekWithCalendar:(NSCalendar *)calendar;
 
-- (instancetype)mn_lastDateOfMonth:(NSCalendar *)calendar;
+- (NSDate *)lastDateOfWeekWithCalendar:(NSCalendar *)calendar;
 
+- (NSDate *)firstDateOfMonthWithCalendar:(NSCalendar *)calendar;
+
+- (NSDate *)lastDateOfMonthWithCalendar:(NSCalendar *)calendar;
+
+//- (instancetype)mn_firstDateOfMonth:(NSCalendar *)calendar;
+//
+//- (instancetype)mn_lastDateOfMonth:(NSCalendar *)calendar;
+//
 - (instancetype)mn_beginningOfDay:(NSCalendar *)calendar;
 
 - (instancetype)mn_dateWithDay:(NSUInteger)day calendar:(NSCalendar *)calendar;

diff --git a/MNCalendarView/NSDate+MNAdditions.m b/MNCalendarView/NSDate+MNAdditions.m
@@ -55,4 +55,35 @@ - (instancetype)mn_dateWithDay:(NSUInteger)day calendar:(NSCalendar *)calendar {
   return [calendar dateFromComponents:components];
 }
 
+- (NSDate *)firstDateOfWeekWithCalendar:(NSCalendar *)calendar; {
+
+    NSDate *startOfWeek;
+    [calendar rangeOfUnit:NSWeekOfYearCalendarUnit startDate:&startOfWeek interval:NULL forDate:self];
+    return startOfWeek;
+
+}
+
+- (NSDate *)firstDateOfMonthWithCalendar:(NSCalendar *)calendar; {
+
+    NSDate *startOfMonth;
+    [calendar rangeOfUnit:NSMonthCalendarUnit startDate:&startOfMonth interval:NULL forDate:self];
+    return startOfMonth;
+
+}
+
+- (NSDate *)lastDateOfWeekWithCalendar:(NSCalendar *)calendar; {
+
+    NSDateComponents * oneWeek = [[NSDateComponents alloc] init];
+    [oneWeek setWeek:1];
+    return [[calendar dateByAddingComponents:oneWeek toDate:[self firstDateOfWeekWithCalendar:calendar] options:0] dateByAddingTimeInterval:-1];
+
+}
+
+- (NSDate *)lastDateOfMonthWithCalendar:(NSCalendar *)calendar; {
+
+    NSRange days = [calendar rangeOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:self];
+    return [[self firstDateOfMonthWithCalendar:calendar] dateByAddingTimeInterval:(days.length * 24 * 60 * 60) - 1];
+
+}
+
 @end