Skip to content

Commit

Permalink
Simplify 'delay execution' mechanism.
Browse files Browse the repository at this point in the history
Remove redundant project.
  • Loading branch information
WenchaoD committed Oct 10, 2018
1 parent 79156d8 commit e9dc2ed
Show file tree
Hide file tree
Showing 83 changed files with 155 additions and 1,354 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -5,5 +5,4 @@ script:

- xcodebuild -project Example-Objc/FSCalendar.xcodeproj -sdk iphonesimulator -alltargets
- xcodebuild -project Example-Swift/FSCalendarSwiftExample.xcodeproj -sdk iphonesimulator -alltargets
- xcodebuild -project Example-TodayExtension1/Example-TodayExtension.xcodeproj -sdk iphonesimulator -alltargets
- xcodebuild -project Example-TodayExtension2/Example-TodayExtension.xcodeproj -sdk iphonesimulator -alltargets
- xcodebuild -project Example-TodayExtension/Example-TodayExtension.xcodeproj -sdk iphonesimulator -alltargets
10 changes: 10 additions & 0 deletions Example-Objc/FSCalendar.xcodeproj/project.pbxproj
Expand Up @@ -58,6 +58,9 @@
30FCB3961BAAD112002B87AD /* FSCalendarStickyHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 30FCB3941BAAD112002B87AD /* FSCalendarStickyHeader.h */; settings = {ATTRIBUTES = (Private, ); }; };
30FCB3971BAAD112002B87AD /* FSCalendarStickyHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 30FCB3951BAAD112002B87AD /* FSCalendarStickyHeader.m */; };
30FCB3981BAAD112002B87AD /* FSCalendarStickyHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 30FCB3951BAAD112002B87AD /* FSCalendarStickyHeader.m */; };
50F2ADE8216D954A00CC481F /* FSCalendarSeparatorDecorationView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F2ADE6216D954A00CC481F /* FSCalendarSeparatorDecorationView.h */; };
50F2ADE9216D954A00CC481F /* FSCalendarSeparatorDecorationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F2ADE7216D954A00CC481F /* FSCalendarSeparatorDecorationView.m */; };
50F2ADEA216D954A00CC481F /* FSCalendarSeparatorDecorationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F2ADE7216D954A00CC481F /* FSCalendarSeparatorDecorationView.m */; };
EE52AE181B91E68A00016662 /* FSCalendarScopeExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE52AE171B91E68A00016662 /* FSCalendarScopeExampleViewController.m */; };
EE638CC31B89DB6E0006DD1A /* LoadViewExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE638CC21B89DB6E0006DD1A /* LoadViewExampleViewController.m */; };
EE638CC91B89DB940006DD1A /* CalendarConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE638CC81B89DB940006DD1A /* CalendarConfigViewController.m */; };
Expand Down Expand Up @@ -157,6 +160,8 @@
30F4C90E1E07C12B00D2EC4D /* FSCalendarDelegationFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarDelegationFactory.m; sourceTree = "<group>"; };
30FCB3941BAAD112002B87AD /* FSCalendarStickyHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarStickyHeader.h; sourceTree = "<group>"; };
30FCB3951BAAD112002B87AD /* FSCalendarStickyHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarStickyHeader.m; sourceTree = "<group>"; };
50F2ADE6216D954A00CC481F /* FSCalendarSeparatorDecorationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FSCalendarSeparatorDecorationView.h; sourceTree = "<group>"; };
50F2ADE7216D954A00CC481F /* FSCalendarSeparatorDecorationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FSCalendarSeparatorDecorationView.m; sourceTree = "<group>"; };
EE0D7FC71B89C5D3003C287B /* FSCalendarExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FSCalendarExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
EE0D7FCB1B89C5D3003C287B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EE52AE161B91E68A00016662 /* FSCalendarScopeExampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarScopeExampleViewController.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -268,6 +273,8 @@
EEC9C0381BDC9E7000383A07 /* FSCalendarCollectionView.m */,
3095398D1C38D66C00BD37AA /* FSCalendarCollectionViewLayout.h */,
3095398E1C38D66C00BD37AA /* FSCalendarCollectionViewLayout.m */,
50F2ADE6216D954A00CC481F /* FSCalendarSeparatorDecorationView.h */,
50F2ADE7216D954A00CC481F /* FSCalendarSeparatorDecorationView.m */,
30B0BAC61B8D8E22004B9476 /* FSCalendarHeaderView.h */,
30B0BAC71B8D8E22004B9476 /* FSCalendarHeaderView.m */,
30A495521DCAD9E6000B2F31 /* FSCalendarWeekdayView.h */,
Expand Down Expand Up @@ -456,6 +463,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
50F2ADE8216D954A00CC481F /* FSCalendarSeparatorDecorationView.h in Headers */,
30B0BAFC1B8D9AD4004B9476 /* FSCalendar.h in Headers */,
30B0BB011B8D9B6C004B9476 /* FSCalendarAppearance.h in Headers */,
3092253A1B905C4300123031 /* FSCalendarConstants.h in Headers */,
Expand Down Expand Up @@ -662,6 +670,7 @@
EE638CD31B89DBE90006DD1A /* AppDelegate.m in Sources */,
30A495551DCAD9E6000B2F31 /* FSCalendarWeekdayView.m in Sources */,
3092253B1B905C4300123031 /* FSCalendarConstants.m in Sources */,
50F2ADE9216D954A00CC481F /* FSCalendarSeparatorDecorationView.m in Sources */,
30F4C9101E07C12B00D2EC4D /* FSCalendarDelegationFactory.m in Sources */,
309539901C38D66C00BD37AA /* FSCalendarCollectionViewLayout.m in Sources */,
30FCB3971BAAD112002B87AD /* FSCalendarStickyHeader.m in Sources */,
Expand Down Expand Up @@ -695,6 +704,7 @@
EEC9C03B1BDC9E7000383A07 /* FSCalendarCollectionView.m in Sources */,
30B0BAF71B8D9AC1004B9476 /* FSCalendarCell.m in Sources */,
30DBE3C61DC641AD005A22B7 /* FSCalendarCalculator.m in Sources */,
50F2ADEA216D954A00CC481F /* FSCalendarSeparatorDecorationView.m in Sources */,
30A495561DCAD9E6000B2F31 /* FSCalendarWeekdayView.m in Sources */,
30B0BAF81B8D9AC1004B9476 /* FSCalendarHeaderView.m in Sources */,
3092253C1B905C4300123031 /* FSCalendarConstants.m in Sources */,
Expand Down
Expand Up @@ -59,7 +59,7 @@
<outlet property="delegate" destination="M4Y-Lb-cyx" id="fbj-GS-VOb"/>
</connections>
</view>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQJ-NX-RmL">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQJ-NX-RmL">
<rect key="frame" x="28" y="8" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="qMi-C1-Iy1"/>
Expand All @@ -71,7 +71,7 @@
<action selector="prevClicked:" destination="M4Y-Lb-cyx" eventType="touchUpInside" id="vFe-pk-Hqs"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5xc-iY-5SS">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5xc-iY-5SS">
<rect key="frame" x="262" y="8" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="lAc-cg-RCf"/>
Expand Down
Expand Up @@ -31,15 +31,17 @@ - (void)viewDidLoad
// Do any additional setup after loading the view from its nib.
self.calendar.today = nil;
self.calendar.locale = [NSLocale localeWithLocaleIdentifier:@"zh-CN"];
self.calendar.adjustsBoundingRectWhenChangingMonths = NO;
self.calendar.placeholderType = FSCalendarPlaceholderTypeNone;
self.calendar.appearance.headerMinimumDissolvedAlpha = 0;
self.lunarCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierChinese];
self.lunarCalendar.locale = [NSLocale localeWithLocaleIdentifier:@"zh-CN"];
self.lunarChars = @[@"初一",@"初二",@"初三",@"初四",@"初五",@"初六",@"初七",@"初八",@"初九",@"初十",@"十一",@"十二",@"十三",@"十四",@"十五",@"十六",@"十七",@"十八",@"十九",@"二十",@"二一",@"二二",@"二三",@"二四",@"二五",@"二六",@"二七",@"二八",@"二九",@"三十"];
self.gregorian = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];

if ([self.extensionContext respondsToSelector:@selector(setWidgetLargestAvailableDisplayMode:)]) {
self.extensionContext.widgetLargestAvailableDisplayMode = NCWidgetDisplayModeExpanded;
} else {
self.preferredContentSize = CGSizeMake(320, self.calendarHeight.constant);
self.preferredContentSize = CGSizeMake(0, self.calendarHeight.constant);
}

}
Expand All @@ -48,16 +50,11 @@ - (void)widgetActiveDisplayModeDidChange:(NCWidgetDisplayMode)activeDisplayMode
{
if (activeDisplayMode == NCWidgetDisplayModeCompact) {
[self.calendar setScope:FSCalendarScopeWeek animated:YES];
self.calendar.appearance.headerMinimumDissolvedAlpha = 0;
self.prevButton.hidden = NO;
self.nextButton.hidden = NO;
self.preferredContentSize = maxSize;
} else if (activeDisplayMode == NCWidgetDisplayModeExpanded) {
[self.calendar setScope:FSCalendarScopeMonth animated:YES];
self.calendar.appearance.headerMinimumDissolvedAlpha = 0.5;
self.prevButton.hidden = YES;
self.nextButton.hidden = YES;
self.preferredContentSize = CGSizeMake(maxSize.width, self.calendarHeight.constant);
}
self.preferredContentSize = CGSizeMake(320, self.calendarHeight.constant);
}

- (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))completionHandler
Expand All @@ -80,6 +77,7 @@ - (void)calendar:(FSCalendar *)calendar boundingRectWillChange:(CGRect)bounds an
{
self.calendarHeight.constant = CGRectGetHeight(bounds);
[self.view layoutIfNeeded];
self.preferredContentSize = CGSizeMake(calendar.frame.size.width, self.calendarHeight.constant);
}

- (UIColor *)calendar:(FSCalendar *)calendar appearance:(FSCalendarAppearance *)appearance borderDefaultColorForDate:(NSDate *)date
Expand Down

0 comments on commit e9dc2ed

Please sign in to comment.