Change [JTCalendarManager init] to accept locale and timezone

jonathantribouharet · Feb 1, 2018 · 3fac861 · 3fac861
1 parent 8be2473
commit 3fac861
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/Example/Example/CustomViewController.m b/Example/Example/CustomViewController.m
@@ -33,15 +33,14 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    _calendarManager = [JTCalendarManager new];
+    _calendarManager = [[JTCalendarManager alloc] initWithLocale:[NSLocale localeWithLocaleIdentifier:@"fr_FR"] andTimeZone:[NSTimeZone localTimeZone]];
     _calendarManager.delegate = self;
 
     // Generate random events sort by date using a dateformatter for the demonstration
     [self createRandomEvents];
 
     _calendarMenuView.contentRatio = .75;
     _calendarManager.settings.weekDayFormat = JTCalendarWeekDayFormatSingle;
-    _calendarManager.dateHelper.calendar.locale = [NSLocale localeWithLocaleIdentifier:@"fr_FR"];
 
     [_calendarManager setMenuView:_calendarMenuView];
     [_calendarManager setContentView:_calendarContentView];

diff --git a/JTCalendar/JTCalendarManager.h b/JTCalendar/JTCalendarManager.h
@@ -33,8 +33,7 @@
 @property (nonatomic, readonly) JTCalendarDelegateManager *delegateManager;
 @property (nonatomic, readonly) JTCalendarScrollManager *scrollManager;
 
-// Use for override
-- (void)commonInit;
+- (instancetype)initWithLocale:(NSLocale *)locale andTimeZone:(NSTimeZone *)timeZone;
 
 - (NSDate *)date;
 - (void)setDate:(NSDate *)date;

diff --git a/JTCalendar/JTCalendarManager.m b/JTCalendar/JTCalendarManager.m
@@ -12,20 +12,24 @@
 @implementation JTCalendarManager
 
 - (instancetype)init
+{
+    return [self initWithLocale:[NSLocale currentLocale] andTimeZone:[NSTimeZone localTimeZone]];
+}
+
+- (instancetype)initWithLocale:(NSLocale *)locale andTimeZone:(NSTimeZone *)timeZone
 {
     self = [super init];
     if(!self){
         return nil;
     }
-
-    [self commonInit];
+    [self commonInit:locale andTimeZone:timeZone];
 
     return self;
 }
 
-- (void)commonInit
+- (void)commonInit:(NSLocale *)locale andTimeZone:(NSTimeZone *)timeZone
 {
-    _dateHelper = [JTDateHelper new];
+    _dateHelper = [[JTDateHelper alloc] initWithLocale:locale andTimeZone:timeZone];
     _settings = [JTCalendarSettings new];
 
     _delegateManager = [JTCalendarDelegateManager new];

diff --git a/JTCalendar/JTDateHelper.h b/JTCalendar/JTDateHelper.h
@@ -9,6 +9,8 @@
 
 @interface JTDateHelper : NSObject
 
+- initWithLocale:(NSLocale *)locale andTimeZone:(NSTimeZone *)timeZone;
+
 - (NSCalendar *)calendar;
 - (NSDateFormatter *)createDateFormatter;
 

diff --git a/JTCalendar/JTDateHelper.m b/JTCalendar/JTDateHelper.m
@@ -9,12 +9,24 @@
 
 @interface JTDateHelper (){
     NSCalendar *_calendar;
+    NSLocale *_locale;
+    NSTimeZone *_timeZone;
 }
 
 @end
 
 @implementation JTDateHelper
 
+- (instancetype)initWithLocale:(NSLocale *)locale andTimeZone:(NSTimeZone *)timeZone
+{
+    self = [super init];
+    if (self) {
+        _locale = locale;
+        _timeZone = timeZone;
+    }
+    return self;
+}
+
 - (NSCalendar *)calendar
 {
     if(!_calendar){
@@ -23,8 +35,8 @@ - (NSCalendar *)calendar
 #else
         _calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
 #endif
-        _calendar.timeZone = [NSTimeZone localTimeZone];
-        _calendar.locale = [NSLocale currentLocale];
+        _calendar.timeZone = _timeZone;
+        _calendar.locale = _locale;
     }
 
     return _calendar;