TouchInstinct
/
FSPagerView
308
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decrease the chance of double-flip.

This commit is contained in:
WenchaoD 2017-02-15 09:54:53 +08:00
parent 6185cf3ec8
commit a5320da5ff
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FSPageSliderExample-Swift/FSPagerViewExample.xcodeproj/project.pbxproj
View File

@ -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 */,

BIN
FSPageSliderExample-Swift/FSPagerViewExample.xcodeproj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

1
FSPageSliderExample-Swift/FSPagerViewExample/BasicExampleViewController.swift
View File

@ -121,7 +121,6 @@ class BasicExampleViewController: UIViewController,UITableViewDataSource,UITable
}
func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
let collectionView: UICollectionView!
return self.sectionTitles[section]
}

8
FSPagerView/FSPageViewLayout.swift
View File

@ -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
}

BIN
FSPagerViewExample-Objc/FSPagerViewExample-Objc.xcodeproj/project.xcworkspace/xcuserdata/wenchaoding.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.