Merge pull request #1 from WenchaoD/master

合并原库代码
mg459046365 · Jan 10, 2020 · dcaa322 · dcaa322
2 parents fb0910f + ee0a887
commit dcaa322
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 17 deletions.
diff --git a/Example-Objc/FSCalendar.xcodeproj/project.pbxproj b/Example-Objc/FSCalendar.xcodeproj/project.pbxproj
@@ -141,7 +141,7 @@
 		30A495521DCAD9E6000B2F31 /* FSCalendarWeekdayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarWeekdayView.h; sourceTree = "<group>"; };
 		30A495531DCAD9E6000B2F31 /* FSCalendarWeekdayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarWeekdayView.m; sourceTree = "<group>"; };
 		30B0BABF1B8D8E22004B9476 /* FSCalendar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendar.h; sourceTree = "<group>"; };
-		30B0BAC01B8D8E22004B9476 /* FSCalendar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FSCalendar.m; sourceTree = "<group>"; };
+		30B0BAC01B8D8E22004B9476 /* FSCalendar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FSCalendar.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		30B0BAC11B8D8E22004B9476 /* FSCalendarAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarAppearance.h; sourceTree = "<group>"; };
 		30B0BAC21B8D8E22004B9476 /* FSCalendarAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarAppearance.m; sourceTree = "<group>"; };
 		30B0BAC31B8D8E22004B9476 /* FSCalendarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = FSCalendarCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -591,6 +591,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				ja,
@@ -933,6 +934,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wenchaod.FSCalendar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -955,6 +957,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wenchaod.FSCalendar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/Example-Objc/FSCalendarExampleUITests/FSCalendarExampleUITests.m b/Example-Objc/FSCalendarExampleUITests/FSCalendarExampleUITests.m
@@ -64,8 +64,8 @@ - (void)testPrevNextButtons
 {
     XCUIApplication *application = [[XCUIApplication alloc] init];
     [[application.tables elementBoundByIndex:0].cells[@"Prev-Next Buttons"] tap];
-    XCUIElement *prevButton = [application.buttons elementBoundByIndex:2];
-    XCUIElement *nextButton = [application.buttons elementBoundByIndex:3];
+    XCUIElement *prevButton = [application.buttons elementBoundByIndex:1];
+    XCUIElement *nextButton = [application.buttons elementBoundByIndex:2];
     NSInteger count = 3;
     for (int i = 0; i < count; i++) {
         [prevButton tap];
@@ -199,7 +199,7 @@ - (void)testStoryboard
     CGVector vector1 = CGVectorMake(columnWidth * 3.5, cellStart + rowHeight * 2.5);
     CGVector vector2 = CGVectorMake(columnWidth * 4.5, cellStart + rowHeight * 2.5);
 
-    XCUIElement *configureButton = [application.buttons elementBoundByIndex:2];
+    XCUIElement *configureButton = [application.buttons elementBoundByIndex:1];
 
     [NSThread sleepForTimeInterval:0.5];
     [configureButton tap];

diff --git a/Example-Objc/FSCalendarScopeExampleViewController.m b/Example-Objc/FSCalendarScopeExampleViewController.m
@@ -49,7 +49,6 @@ - (void)viewDidLoad
     if ([[UIDevice currentDevice].model hasPrefix:@"iPad"]) {
         self.calendarHeightConstraint.constant = 400;
     }
-    [self.calendar selectDate:[NSDate date] scrollToDate:YES];
 
     UIPanGestureRecognizer *panGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self.calendar action:@selector(handleScopeGesture:)];
     panGesture.delegate = self;
@@ -65,6 +64,8 @@ - (void)viewDidLoad
     self.calendar.placeholderType = FSCalendarPlaceholderTypeNone;
     self.calendar.scope = FSCalendarScopeWeek;
 
+    [self.calendar selectDate:[NSDate date] scrollToDate:YES];
+
     // For UITest
     self.calendar.accessibilityIdentifier = @"calendar";
 

diff --git a/Example-Swift/FSCalendarSwiftExample.xcodeproj/project.pbxproj b/Example-Swift/FSCalendarSwiftExample.xcodeproj/project.pbxproj
@@ -62,7 +62,7 @@
 		30F4C91E1E07C3AD00D2EC4D /* FSCalendarAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarAppearance.m; sourceTree = "<group>"; };
 		30F4C91F1E07C3AD00D2EC4D /* FSCalendarCalculator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCalculator.h; sourceTree = "<group>"; };
 		30F4C9201E07C3AD00D2EC4D /* FSCalendarCalculator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarCalculator.m; sourceTree = "<group>"; };
-		30F4C9211E07C3AD00D2EC4D /* FSCalendarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		30F4C9211E07C3AD00D2EC4D /* FSCalendarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCell.h; sourceTree = "<group>"; };
 		30F4C9221E07C3AD00D2EC4D /* FSCalendarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarCell.m; sourceTree = "<group>"; };
 		30F4C9231E07C3AD00D2EC4D /* FSCalendarCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCollectionView.h; sourceTree = "<group>"; };
 		30F4C9241E07C3AD00D2EC4D /* FSCalendarCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarCollectionView.m; sourceTree = "<group>"; };

diff --git a/FSCalendar.podspec b/FSCalendar.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name             = "FSCalendar"
-  s.version          = "2.8.0"
+  s.version          = "2.8.1"
   s.summary          = "A superiorly awesome iOS7+ calendar control, compatible with Objective-C and Swift."
 
   s.homepage         = "https://github.com/WenchaoD/FSCalendar"

diff --git a/FSCalendar/FSCalendar.m b/FSCalendar/FSCalendar.m
@@ -153,7 +153,7 @@ - (void)initialize
     _formatter = [[NSDateFormatter alloc] init];
     _formatter.dateFormat = @"yyyy-MM-dd";
     _locale = [NSLocale currentLocale];
-    _timeZone = [NSTimeZone localTimeZone];
+    _timeZone = [NSTimeZone defaultTimeZone];
     _firstWeekday = 1;
     [self invalidateDateTools];
 

diff --git a/FSCalendar/FSCalendarCalculator.m b/FSCalendar/FSCalendarCalculator.m
@@ -221,7 +221,7 @@ - (NSInteger)numberOfRowsInMonth:(NSDate *)month
     if (self.calendar.placeholderType == FSCalendarPlaceholderTypeFillSixRows) return 6;
 
     NSNumber *rowCount = self.rowCounts[month];
-    if (!rowCount) {
+    if (rowCount == nil) {
         NSDate *firstDayOfMonth = [self.gregorian fs_firstDayOfMonth:month];
         NSInteger weekdayOfFirstDay = [self.gregorian component:NSCalendarUnitWeekday fromDate:firstDayOfMonth];
         NSInteger numberOfDaysInMonth = [self.gregorian fs_numberOfDaysInMonth:month];

diff --git a/FSCalendar/FSCalendarCell.m b/FSCalendar/FSCalendarCell.m
@@ -387,7 +387,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         self.contentView = view;
 
         self.eventLayers = [NSPointerArray weakObjectsPointerArray];
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < FSCalendarMaximumNumberOfEvents; i++) {
             CALayer *layer = [CALayer layer];
             layer.backgroundColor = [UIColor clearColor].CGColor;
             [self.contentView.layer addSublayer:layer];
@@ -450,7 +450,7 @@ - (void)setColor:(id)color
 - (void)setNumberOfEvents:(NSInteger)numberOfEvents
 {
     if (_numberOfEvents != numberOfEvents) {
-        _numberOfEvents = MIN(MAX(numberOfEvents,0),3);
+        _numberOfEvents = MIN(MAX(numberOfEvents,0),FSCalendarMaximumNumberOfEvents);
         [self setNeedsLayout];
     }
 }

diff --git a/FSCalendar/FSCalendarConstants.h b/FSCalendar/FSCalendarConstants.h
@@ -29,6 +29,7 @@ CG_EXTERN CGFloat const FSCalendarStandardHeaderTextSize;
 CG_EXTERN CGFloat const FSCalendarMaximumEventDotDiameter;
 
 UIKIT_EXTERN NSInteger const FSCalendarDefaultHourComponent;
+UIKIT_EXTERN NSInteger const FSCalendarMaximumNumberOfEvents;
 
 UIKIT_EXTERN NSString * const FSCalendarDefaultCellReuseIdentifier;
 UIKIT_EXTERN NSString * const FSCalendarBlankCellReuseIdentifier;

diff --git a/FSCalendar/FSCalendarConstants.m b/FSCalendar/FSCalendarConstants.m
@@ -26,6 +26,7 @@
 CGFloat const FSCalendarMaximumEventDotDiameter = 4.8;
 
 NSInteger const FSCalendarDefaultHourComponent = 0;
+NSInteger const FSCalendarMaximumNumberOfEvents = 3;
 
 NSString * const FSCalendarDefaultCellReuseIdentifier = @"_FSCalendarDefaultCellReuseIdentifier";
 NSString * const FSCalendarBlankCellReuseIdentifier = @"_FSCalendarBlankCellReuseIdentifier";

diff --git a/FSCalendar/FSCalendarDynamicHeader.h b/FSCalendar/FSCalendarDynamicHeader.h
@@ -31,7 +31,6 @@
 @property (readonly, nonatomic) NSArray *visibleStickyHeaders;
 @property (readonly, nonatomic) CGFloat preferredHeaderHeight;
 @property (readonly, nonatomic) CGFloat preferredWeekdayHeight;
-@property (readonly, nonatomic) UIView *bottomBorder;
 
 @property (readonly, nonatomic) NSCalendar *gregorian;
 @property (readonly, nonatomic) NSDateFormatter *formatter;
@@ -41,13 +40,9 @@
 
 @property (assign, nonatomic) BOOL needsAdjustingViewFrame;
 
-- (void)invalidateHeaders;
 - (void)adjustMonthPosition;
 - (void)configureAppearance;
 
-- (BOOL)isPageInRange:(NSDate *)page;
-- (BOOL)isDateInRange:(NSDate *)date;
-
 - (CGSize)sizeThatFits:(CGSize)size scope:(FSCalendarScope)scope;
 
 @end

diff --git a/FSCalendar/FSCalendarExtensions.m b/FSCalendar/FSCalendarExtensions.m
@@ -195,6 +195,11 @@ - (nullable NSDate *)fs_middleDayOfWeek:(NSDate *)week
     NSDateComponents *weekdayComponents = [self components:NSCalendarUnitWeekday fromDate:week];
     NSDateComponents *componentsToSubtract = self.fs_privateComponents;
     componentsToSubtract.day = - (weekdayComponents.weekday - self.firstWeekday) + 3;
+    // Fix https://github.com/WenchaoD/FSCalendar/issues/1100 and https://github.com/WenchaoD/FSCalendar/issues/1102
+    // If firstWeekday is not 1, and weekday is less than firstWeekday, the middleDayOfWeek will be the middle day of next week
+    if (weekdayComponents.weekday < self.firstWeekday) {
+        componentsToSubtract.day = componentsToSubtract.day - 7;
+    }
     NSDate *middleDayOfWeek = [self dateByAddingComponents:componentsToSubtract toDate:week options:0];
     NSDateComponents *components = [self components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitHour fromDate:middleDayOfWeek];
     middleDayOfWeek = [self dateFromComponents:components];

diff --git a/FSCalendar/Info.plist b/FSCalendar/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>