Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history 
* development:
  Replace private extension with NSCalendar category
  FSCalendarSeparators
  Fix issue #463
  Add ISSUE_TEMPLATE.md
  calendar.appearance.weekdayBackground
  • Loading branch information
@WenchaoD
WenchaoD committed Oct 28, 2016
2 parents f471392 + 1999cde commit be6c807
Show file tree
Hide file tree
Showing 35 changed files with 698 additions and 619 deletions.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE.md.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

## The following informations are requested in a bug report
* A brief bug description.
* Stack trace.
* Integration method.`(manually/cocoapods/carthage)`
* Full steps to reproduce.
* Device modal and iOS version. `e.g. iPhone 5s iOS8.1`
* Xcode version. `e.g. Xcode 8.0`
* FSCalendar version. `e.g. FSCalenda 2.4.0`
* Does this happen in the demo project? Which one? Or a link to another demo project.
26 changes: 7 additions & 19 deletions DynamicTodayExtensionExample/DynamicTodayExtensionExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,17 @@
305233411D8170B20070AAFE /* DynamicTodayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233401D8170B20070AAFE /* DynamicTodayViewController.m */; };
305233431D8170C60070AAFE /* Image.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 305233421D8170C60070AAFE /* Image.xcassets */; };
305233671D8170E50070AAFE /* FSCalendar+Deprecated.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233481D8170E50070AAFE /* FSCalendar+Deprecated.m */; };
305233681D8170E50070AAFE /* FSCalendar+IBExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052334A1D8170E50070AAFE /* FSCalendar+IBExtension.m */; };
305233691D8170E50070AAFE /* FSCalendar.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052334C1D8170E50070AAFE /* FSCalendar.m */; };
3052336A1D8170E50070AAFE /* FSCalendarAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052334E1D8170E50070AAFE /* FSCalendarAnimator.m */; };
3052336B1D8170E50070AAFE /* FSCalendarAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233501D8170E50070AAFE /* FSCalendarAppearance.m */; };
3052336C1D8170E50070AAFE /* FSCalendarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233521D8170E50070AAFE /* FSCalendarCell.m */; };
3052336D1D8170E50070AAFE /* FSCalendarCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233541D8170E50070AAFE /* FSCalendarCollectionView.m */; };
3052336F1D8170E50070AAFE /* FSCalendarEventIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233591D8170E50070AAFE /* FSCalendarEventIndicator.m */; };
305233701D8170E50070AAFE /* FSCalendarFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052335B1D8170E50070AAFE /* FSCalendarFlowLayout.m */; };
305233711D8170E50070AAFE /* FSCalendarHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052335D1D8170E50070AAFE /* FSCalendarHeader.m */; };
305233721D8170E50070AAFE /* FSCalendarScopeHandle.m in Sources */ = {isa = PBXBuildFile; fileRef = 3052335F1D8170E50070AAFE /* FSCalendarScopeHandle.m */; };
305233731D8170E50070AAFE /* FSCalendarStickyHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 305233611D8170E50070AAFE /* FSCalendarStickyHeader.m */; };
305233741D8170E50070AAFE /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 305233621D8170E50070AAFE /* Info.plist */; };
3055B1CB1DA933AD002AFA13 /* FSCalendarExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3055B1CA1DA933AD002AFA13 /* FSCalendarExtensions.m */; };
30623F701DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 30623F6F1DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.m */; };
30A33A0B1DB1CA640039BEA3 /* FSCalendarConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 30A33A0A1DB1CA640039BEA3 /* FSCalendarConstants.m */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -78,8 +76,6 @@
305233401D8170B20070AAFE /* DynamicTodayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DynamicTodayViewController.m; sourceTree = "<group>"; };
305233421D8170C60070AAFE /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = "<group>"; };
305233481D8170E50070AAFE /* FSCalendar+Deprecated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FSCalendar+Deprecated.m"; sourceTree = "<group>"; };
305233491D8170E50070AAFE /* FSCalendar+IBExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FSCalendar+IBExtension.h"; sourceTree = "<group>"; };
3052334A1D8170E50070AAFE /* FSCalendar+IBExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FSCalendar+IBExtension.m"; sourceTree = "<group>"; };
3052334B1D8170E50070AAFE /* FSCalendar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendar.h; sourceTree = "<group>"; };
3052334C1D8170E50070AAFE /* FSCalendar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendar.m; sourceTree = "<group>"; };
3052334D1D8170E50070AAFE /* FSCalendarAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarAnimator.h; sourceTree = "<group>"; };
Expand All @@ -91,10 +87,6 @@
305233531D8170E50070AAFE /* FSCalendarCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCollectionView.h; sourceTree = "<group>"; };
305233541D8170E50070AAFE /* FSCalendarCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarCollectionView.m; sourceTree = "<group>"; };
305233571D8170E50070AAFE /* FSCalendarDynamicHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarDynamicHeader.h; sourceTree = "<group>"; };
305233581D8170E50070AAFE /* FSCalendarEventIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarEventIndicator.h; sourceTree = "<group>"; };
305233591D8170E50070AAFE /* FSCalendarEventIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarEventIndicator.m; sourceTree = "<group>"; };
3052335A1D8170E50070AAFE /* FSCalendarFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarFlowLayout.h; sourceTree = "<group>"; };
3052335B1D8170E50070AAFE /* FSCalendarFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarFlowLayout.m; sourceTree = "<group>"; };
3052335C1D8170E50070AAFE /* FSCalendarHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarHeader.h; sourceTree = "<group>"; };
3052335D1D8170E50070AAFE /* FSCalendarHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarHeader.m; sourceTree = "<group>"; };
3052335E1D8170E50070AAFE /* FSCalendarScopeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarScopeHandle.h; sourceTree = "<group>"; };
Expand All @@ -104,6 +96,8 @@
305233621D8170E50070AAFE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3055B1C91DA933AD002AFA13 /* FSCalendarExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarExtensions.h; sourceTree = "<group>"; };
3055B1CA1DA933AD002AFA13 /* FSCalendarExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarExtensions.m; sourceTree = "<group>"; };
30623F6E1DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarCollectionViewLayout.h; sourceTree = "<group>"; };
30623F6F1DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarCollectionViewLayout.m; sourceTree = "<group>"; };
30A33A091DB1CA640039BEA3 /* FSCalendarConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarConstants.h; sourceTree = "<group>"; };
30A33A0A1DB1CA640039BEA3 /* FSCalendarConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarConstants.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -206,11 +200,8 @@
305233541D8170E50070AAFE /* FSCalendarCollectionView.m */,
30A33A091DB1CA640039BEA3 /* FSCalendarConstants.h */,
30A33A0A1DB1CA640039BEA3 /* FSCalendarConstants.m */,
305233571D8170E50070AAFE /* FSCalendarDynamicHeader.h */,
305233581D8170E50070AAFE /* FSCalendarEventIndicator.h */,
305233591D8170E50070AAFE /* FSCalendarEventIndicator.m */,
3052335A1D8170E50070AAFE /* FSCalendarFlowLayout.h */,
3052335B1D8170E50070AAFE /* FSCalendarFlowLayout.m */,
30623F6E1DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.h */,
30623F6F1DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.m */,
3052335C1D8170E50070AAFE /* FSCalendarHeader.h */,
3052335D1D8170E50070AAFE /* FSCalendarHeader.m */,
3052335E1D8170E50070AAFE /* FSCalendarScopeHandle.h */,
Expand All @@ -219,9 +210,8 @@
305233611D8170E50070AAFE /* FSCalendarStickyHeader.m */,
3055B1C91DA933AD002AFA13 /* FSCalendarExtensions.h */,
3055B1CA1DA933AD002AFA13 /* FSCalendarExtensions.m */,
305233571D8170E50070AAFE /* FSCalendarDynamicHeader.h */,
305233481D8170E50070AAFE /* FSCalendar+Deprecated.m */,
305233491D8170E50070AAFE /* FSCalendar+IBExtension.h */,
3052334A1D8170E50070AAFE /* FSCalendar+IBExtension.m */,
305233621D8170E50070AAFE /* Info.plist */,
);
name = FSCalendar;
Expand Down Expand Up @@ -342,16 +332,14 @@
buildActionMask = 2147483647;
files = (
30A33A0B1DB1CA640039BEA3 /* FSCalendarConstants.m in Sources */,
305233681D8170E50070AAFE /* FSCalendar+IBExtension.m in Sources */,
305233721D8170E50070AAFE /* FSCalendarScopeHandle.m in Sources */,
30623F701DC1F46800FA31B3 /* FSCalendarCollectionViewLayout.m in Sources */,
305233691D8170E50070AAFE /* FSCalendar.m in Sources */,
305233671D8170E50070AAFE /* FSCalendar+Deprecated.m in Sources */,
3052336B1D8170E50070AAFE /* FSCalendarAppearance.m in Sources */,
305233731D8170E50070AAFE /* FSCalendarStickyHeader.m in Sources */,
305233711D8170E50070AAFE /* FSCalendarHeader.m in Sources */,
305233701D8170E50070AAFE /* FSCalendarFlowLayout.m in Sources */,
3055B1CB1DA933AD002AFA13 /* FSCalendarExtensions.m in Sources */,
3052336F1D8170E50070AAFE /* FSCalendarEventIndicator.m in Sources */,
3052336C1D8170E50070AAFE /* FSCalendarCell.m in Sources */,
3052336D1D8170E50070AAFE /* FSCalendarCollectionView.m in Sources */,
305233411D8170B20070AAFE /* DynamicTodayViewController.m in Sources */,
Expand Down
3 changes: 1 addition & 2 deletions Example/Base.lproj/Main_iPad.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="8Tn-uw-jyK">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="8Tn-uw-jyK">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand Down Expand Up @@ -293,7 +293,6 @@
<userDefinedRuntimeAttribute type="number" keyPath="fakedSelectedDay">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="autoAdjustTitleSize" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="dataSource" destination="Nko-Kc-zB0" id="zta-WZ-dEA"/>
Expand Down
2 changes: 1 addition & 1 deletion Example/Base.lproj/Main_iPhone.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="x1V-gv-tFA">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="x1V-gv-tFA">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand Down
Loading

0 comments on commit be6c807

Please sign in to comment.