Decrease the chance of double-flip.

norman93sun · Feb 15, 2017 · a5320da · a5320da
1 parent 6185cf3
commit a5320da
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/FSPageSliderExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj b/FSPageSliderExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj
@@ -18,7 +18,6 @@
 		F9C694311E40C583007084B6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F9C694261E40C583007084B6 /* LaunchScreen.storyboard */; };
 		F9C694321E40C583007084B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F9C694281E40C583007084B6 /* Main.storyboard */; };
 		F9C694331E40C583007084B6 /* BasicExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C6942A1E40C583007084B6 /* BasicExampleViewController.swift */; };
-		F9C694341E40C583007084B6 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F9C6942B1E40C583007084B6 /* Info.plist */; };
 		F9C694351E40C583007084B6 /* PageControlExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C6942C1E40C583007084B6 /* PageControlExampleViewController.swift */; };
 		F9C694361E40C583007084B6 /* TransformerExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C6942E1E40C583007084B6 /* TransformerExampleViewController.swift */; };
 		F9C6945A1E40C720007084B6 /* FSPagerViewExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9C694591E40C720007084B6 /* FSPagerViewExampleUITests.swift */; };
@@ -292,7 +291,6 @@
 				F9C694731E40C8DA007084B6 /* 1_2.jpg in Resources */,
 				F9C694301E40C583007084B6 /* Assets.xcassets in Resources */,
 				F9C6947A1E40C8DA007084B6 /* 3.jpg in Resources */,
-				F9C694341E40C583007084B6 /* Info.plist in Resources */,
 				F9C694721E40C8DA007084B6 /* 1_1.jpg in Resources */,
 				F9C6947D1E40C8DA007084B6 /* 6.jpg in Resources */,
 				F9C6947C1E40C8DA007084B6 /* 5.jpg in Resources */,

diff --git a/...roj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FSPageSliderExample-Swift/FSPagerViewExample/BasicExampleViewController.swift b/FSPageSliderExample-Swift/FSPagerViewExample/BasicExampleViewController.swift
@@ -121,7 +121,6 @@ class BasicExampleViewController: UIViewController,UITableViewDataSource,UITable
     }
 
     func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        let collectionView: UICollectionView!
         return self.sectionTitles[section]
     }
 

diff --git a/FSPagerView/FSPageViewLayout.swift b/FSPagerView/FSPageViewLayout.swift
@@ -145,18 +145,20 @@ class FSPagerViewLayout: UICollectionViewLayout {
         guard let collectionView = self.collectionView else {
             return proposedContentOffset
         }
+        var proposedContentOffset = proposedContentOffset
         let proposedContentOffsetX: CGFloat = {
+            let translation = -collectionView.panGestureRecognizer.translation(in: collectionView).x
             var offset: CGFloat = round(proposedContentOffset.x/self.itemSpan)*self.itemSpan
-            let translation = collectionView.panGestureRecognizer.translation(in: collectionView).x
             let minFlippingDistance = min(0.5 * self.itemSpan,150)
+            let originalContentOffsetX = collectionView.contentOffset.x - translation
             if abs(translation) <= minFlippingDistance {
-                if abs(velocity.x) >= 0.3 {
+                if abs(velocity.x) >= 0.3 && abs(proposedContentOffset.x-originalContentOffsetX) <= self.itemSpan*0.5 {
                     offset += self.itemSpan * (velocity.x)/abs(velocity.x)
                 }
             }
             return offset
         }()
-        let proposedContentOffset = CGPoint(x: proposedContentOffsetX, y: proposedContentOffset.y)
+        proposedContentOffset = CGPoint(x: proposedContentOffsetX, y: proposedContentOffset.y)
         return proposedContentOffset
     }
 

diff --git a/...roj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-            let collectionView: UICollectionView!
             return self.sectionTitles[section]
         }
@@ Expand Down @@