Refactor refresh method to goToToday

setCurrentDate in refresh method
maximbilan · Nov 11, 2017 · 59cd4cc · 59cd4cc
1 parent 2b9efe4
commit 59cd4cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ios_calendar/Sources/CalendarView.h b/ios_calendar/Sources/CalendarView.h
@@ -59,7 +59,7 @@ typedef NS_ENUM(NSInteger, CalendarEvent)
 
 - (instancetype)initWithPosition:(CGFloat)x y:(CGFloat)y;
 - (void)setMode:(NSInteger)m;
-- (void)refresh;
+- (void)goToToday;
 - (void)reload;
 - (void)advanceCalendarContents;
 - (void)rewindCalendarContents;

diff --git a/ios_calendar/Sources/CalendarView.m b/ios_calendar/Sources/CalendarView.m
@@ -233,10 +233,6 @@ - (void)setup
     NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:self.calendarIdentifier];
     NSDateComponents *components = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:now];
 
-    currentDay = [components day];
-    currentMonth = [components month];
-    currentYear = [components year];
-
     todayDay = [components day];
     todayMonth = [components month];
     todayYear = [components year];
@@ -299,13 +295,16 @@ - (NSLocale *) locale{
 
 #pragma mark - reload
 
-- (void) reload{
+- (void) goToToday{
     [self setup];
 }
 #pragma mark - Refresh
 
 - (void)refresh
 {
+    NSDate *now = [NSDate date];
+    [self setCurrentDate:now];
+
     if (self.calendarIdentifier == NSCalendarIdentifierPersian) {
         [self generatePersianDayRects];
     } else {