Skip to content

Commit

Permalink
Merge pull request #79 from zjfjack/fix-scrollPaginationEffect
Browse files Browse the repository at this point in the history
Fix scroll pagination effect
  • Loading branch information
zjfjack authored May 26, 2019
2 parents 22f52d5 + 3857860 commit 5192f1f
Show file tree
Hide file tree
Showing 15 changed files with 703 additions and 454 deletions.
4 changes: 2 additions & 2 deletions Example/JZCalendarWeekViewExample/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.3</string>
<string>0.7.0</string>
<key>CFBundleVersion</key>
<string>19042801</string>
<string>19052601</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
2 changes: 1 addition & 1 deletion JZCalendarWeekView.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JZCalendarWeekView"
s.version = "0.6.3"
s.version = "0.7.0"
s.summary = "Calendar Week & Day View in iOS Swift"
s.homepage = "https://github.com/zjfjack/JZCalendarWeekView"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand Down
20 changes: 16 additions & 4 deletions JZCalendarWeekView.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
1F2F29B522959B16004B7CA1 /* JZBaseWeekViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2F29B422959B16004B7CA1 /* JZBaseWeekViewTests.swift */; };
1F2F29B722959B6C004B7CA1 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2F29B622959B6C004B7CA1 /* Constants.swift */; };
1F2F29B922959C1E004B7CA1 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2F29B822959C1E004B7CA1 /* Helpers.swift */; };
1FB6140D2130FE7400F08ACD /* JZCurrentTimelinePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FB6140C2130FE7400F08ACD /* JZCurrentTimelinePage.swift */; };
8E023C78206C6E4B00C523BE /* JZWeekViewTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E023C77206C6E4B00C523BE /* JZWeekViewTest.swift */; };
8E023C78206C6E4B00C523BE /* JZLongPressWeekViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E023C77206C6E4B00C523BE /* JZLongPressWeekViewTests.swift */; };
8E023C7A206C6E4B00C523BE /* JZCalendarWeekView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E1BA94A206B4329007BE13C /* JZCalendarWeekView.framework */; };
8E023C84206C732300C523BE /* JZBaseEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E023C83206C732300C523BE /* JZBaseEvent.swift */; };
8E023C86206C956F00C523BE /* JZWeekViewColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E023C85206C956F00C523BE /* JZWeekViewColors.swift */; };
Expand Down Expand Up @@ -46,9 +49,12 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1F2F29B422959B16004B7CA1 /* JZBaseWeekViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZBaseWeekViewTests.swift; sourceTree = "<group>"; };
1F2F29B622959B6C004B7CA1 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
1F2F29B822959C1E004B7CA1 /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
1FB6140C2130FE7400F08ACD /* JZCurrentTimelinePage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZCurrentTimelinePage.swift; sourceTree = "<group>"; };
8E023C75206C6E4B00C523BE /* JZCalendarWeekViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JZCalendarWeekViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8E023C77206C6E4B00C523BE /* JZWeekViewTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZWeekViewTest.swift; sourceTree = "<group>"; };
8E023C77206C6E4B00C523BE /* JZLongPressWeekViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZLongPressWeekViewTests.swift; sourceTree = "<group>"; };
8E023C79206C6E4B00C523BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8E023C83206C732300C523BE /* JZBaseEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZBaseEvent.swift; sourceTree = "<group>"; };
8E023C85206C956F00C523BE /* JZWeekViewColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JZWeekViewColors.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -99,8 +105,11 @@
8E023C76206C6E4B00C523BE /* Tests */ = {
isa = PBXGroup;
children = (
8E023C77206C6E4B00C523BE /* JZWeekViewTest.swift */,
1F2F29B422959B16004B7CA1 /* JZBaseWeekViewTests.swift */,
8E023C77206C6E4B00C523BE /* JZLongPressWeekViewTests.swift */,
8E5BB3FA2073154F00FA853F /* WeekViewHelperTest.swift */,
1F2F29B822959C1E004B7CA1 /* Helpers.swift */,
1F2F29B622959B6C004B7CA1 /* Constants.swift */,
8E023C79206C6E4B00C523BE /* Info.plist */,
);
path = Tests;
Expand Down Expand Up @@ -283,7 +292,10 @@
buildActionMask = 2147483647;
files = (
8E5BB3FB2073154F00FA853F /* WeekViewHelperTest.swift in Sources */,
8E023C78206C6E4B00C523BE /* JZWeekViewTest.swift in Sources */,
8E023C78206C6E4B00C523BE /* JZLongPressWeekViewTests.swift in Sources */,
1F2F29B522959B16004B7CA1 /* JZBaseWeekViewTests.swift in Sources */,
1F2F29B922959C1E004B7CA1 /* Helpers.swift in Sources */,
1F2F29B722959B6C004B7CA1 /* Constants.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion JZCalendarWeekView/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.6.2</string>
<string>0.7.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion JZCalendarWeekView/JZBaseEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ open class JZBaseEvent: NSObject, NSCopying {
self.intraEndDate = endDate
}

// Must be overrided
// Must be overridden
// Shadow copy is enough for JZWeekViewHelper to create multiple events for cross-day events
open func copy(with zone: NSZone? = nil) -> Any {
return JZBaseEvent(id: id, startDate: startDate, endDate: endDate)
Expand Down
Loading

0 comments on commit 5192f1f

Please sign in to comment.