Merge pull request WenchaoD#998 from drbill-github/master

Ability to specify the timezone for the fscalendar.
ronaldo-avalos · Feb 17, 2023 · 2a1bdab · 2a1bdab
2 parents 76afe50 + f42f56e
commit 2a1bdab
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/...SCalendarSwiftExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...SCalendarSwiftExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/FSCalendar/FSCalendar.h b/FSCalendar/FSCalendar.h
@@ -242,6 +242,11 @@ NS_ASSUME_NONNULL_BEGIN
 IB_DESIGNABLE
 @interface FSCalendar : UIView
 
+/**
+ * The timezone of the calendar. `defaultTimeZone` by default.
+ */
+@property (strong, nonatomic) NSTimeZone *timeZone;
+
 /**
  * The object that acts as the delegate of the calendar.
  */

diff --git a/FSCalendar/FSCalendar.m b/FSCalendar/FSCalendar.m
@@ -50,7 +50,6 @@ @interface FSCalendar ()<UICollectionViewDataSource,UICollectionViewDelegate,FSC
 
 @property (strong, nonatomic) NSCalendar *gregorian;
 @property (strong, nonatomic) NSDateFormatter *formatter;
-@property (strong, nonatomic) NSTimeZone *timeZone;
 
 @property (weak  , nonatomic) UIView                     *contentView;
 @property (weak  , nonatomic) UIView                     *daysContainer;
@@ -280,6 +279,12 @@ - (void)setValue:(id)value forUndefinedKey:(NSString *)key
 
 }
 
+- (void)setTimeZone:(NSTimeZone *)tz
+{
+    _timeZone = tz;
+    [self invalidateDateTools];
+}
+
 - (void)layoutSubviews
 {
     [super layoutSubviews];
@@ -701,7 +706,7 @@ - (void)setToday:(NSDate *)today
         _today = nil;
     } else {
         FSCalendarAssertDateInBounds(today,self.gregorian,self.minimumDate,self.maximumDate);
-        _today = [self.gregorian startOfDayForDate:today];
+        [self updateToday];
     }
     if (self.hasValidateVisibleLayout) {
         [self.visibleCells makeObjectsPerformSelector:@selector(setDateIsToday:) withObject:nil];
@@ -1272,6 +1277,19 @@ - (void)invalidateDateTools
     _formatter.calendar = _gregorian;
     _formatter.timeZone = _timeZone;
     _formatter.locale = _locale;
+
+    [self updateToday];
+}
+
+- (void)updateToday
+{
+    NSDateComponents *dateComponents = [self.gregorian components:(NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:[NSDate date]];
+    dateComponents.hour = 0;
+    dateComponents.minute = 0;
+    dateComponents.second = 0;
+    dateComponents.timeZone = self.timeZone;
+
+    _today = [self.gregorian dateFromComponents:dateComponents];
 }
 
 - (void)invalidateLayout