Fix bug show days of month for 31 days

maximbilan · Nov 11, 2017 · 2b9efe4 · 2b9efe4
1 parent b5adc8c
commit 2b9efe4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ios_calendar/Sources/CalendarView.m b/ios_calendar/Sources/CalendarView.m
@@ -436,8 +436,11 @@ - (void) generatePersianDayRects{
     NSInteger plusRow = startDayOfMonth == 7?2:1;
     NSInteger weeks = (lastDayOfMonth / 7)+plusRow;
     NSInteger minimumDayOfWeek = 1;
-    startDayOfMonth = kCalendarViewDaysInWeek - (startDayOfMonth-1);
-
+    if (startDayOfMonth > 0) {
+        startDayOfMonth = kCalendarViewDaysInWeek - (startDayOfMonth-1);
+    } else {
+        startDayOfMonth = kCalendarViewDaysInWeek;
+    }
     NSMutableArray *daysOfMonth = [[NSMutableArray alloc] init];
     for (int i = 1; i <= weeks; i++) {
         NSMutableArray *arrayOfEachWeek = [[NSMutableArray alloc] init];
@@ -458,7 +461,7 @@ - (void) generatePersianDayRects{
     [components setDay:currentDay];
     currentDate = [calendar dateFromComponents:components];
     NSInteger weekday = [currentDate getWeekdayOfFirstDayOfMonthForCalendar:calendar];
-
+    weekday = weekday == 0 ? 1:weekday;
     const CGFloat yOffSet = [self getEffectiveDaysYOffset];
     const CGFloat w = self.dayCellWidth;
     const CGFloat h = self.dayCellHeight;