Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

Ready for Swift 4 / Xcode 9 #10

Open
nikans wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ready for Swift 4 / Xcode 9 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e09eb21
Swift 4
nikans Nov 16, 2017
cffdc01
deleted seem not to work
nikans Nov 16, 2017
f64a5c9
HFCardCollectionView added to project
nikans Nov 16, 2017
34ca1c5
opening HFCardCollectionView
nikans Nov 16, 2017
2b1a3f2
opening HFCardCollectionView
nikans Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions HFCardCollectionViewLayout.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */; };
416D2D731E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */; };
416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */; };
D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -22,6 +23,7 @@
416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayout.swift; path = Source/HFCardCollectionViewLayout.swift; sourceTree = SOURCE_ROOT; };
416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionViewLayoutDelegate.swift; path = Source/HFCardCollectionViewLayoutDelegate.swift; sourceTree = SOURCE_ROOT; };
416D2D701E5F117500D8A570 /* UICollectionViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UICollectionViewExtensions.swift; path = Source/UICollectionViewExtensions.swift; sourceTree = SOURCE_ROOT; };
D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HFCardCollectionView.swift; path = Source/HFCardCollectionView.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -54,6 +56,7 @@
416D2D641E5F113600D8A570 /* HFCardCollectionViewLayout */ = {
isa = PBXGroup;
children = (
D0F827041FBDECAF00A0902D /* HFCardCollectionView.swift */,
416D2D6D1E5F117500D8A570 /* HFCardCollectionViewCell.swift */,
416D2D6E1E5F117500D8A570 /* HFCardCollectionViewLayout.swift */,
416D2D6F1E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift */,
Expand Down Expand Up @@ -145,6 +148,7 @@
buildActionMask = 2147483647;
files = (
416D2D741E5F117500D8A570 /* UICollectionViewExtensions.swift in Sources */,
D0F827051FBDECAF00A0902D /* HFCardCollectionView.swift in Sources */,
416D2D721E5F117500D8A570 /* HFCardCollectionViewLayout.swift in Sources */,
416D2D711E5F117500D8A570 /* HFCardCollectionViewCell.swift in Sources */,
416D2D731E5F117500D8A570 /* HFCardCollectionViewLayoutDelegate.swift in Sources */,
Expand Down
13 changes: 3 additions & 10 deletions Source/HFCardCollectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,13 @@

import UIKit

class HFCardCollectionView: UICollectionView {
open class HFCardCollectionView: UICollectionView {

override func insertItems(at indexPaths: [IndexPath]) {
override open func insertItems(at indexPaths: [IndexPath]) {
if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout {
collectionViewLayout.willInsert(indexPaths: indexPaths)
}
super.insertItems(at: indexPaths)
}

override func deleteItems(at indexPaths: [IndexPath]) {
if let collectionViewLayout = self.collectionViewLayout as? HFCardCollectionViewLayout {
collectionViewLayout.willDelete(indexPaths: indexPaths)
}
super.deleteItems(at: indexPaths)
}


}
85 changes: 26 additions & 59 deletions Source/HFCardCollectionViewLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,21 +225,18 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
/// Default: false
@IBInspectable open var collapseAllCards: Bool = false {
didSet {
self.flipRevealedCardBack(completion: {
self.collectionView?.isScrollEnabled = !self.collapseAllCards
var previousRevealedIndex = -1
let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate
if(self.revealedIndex >= 0) {
previousRevealedIndex = self.revealedIndex
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex)
self.revealedIndex = -1
self.collectionView?.isScrollEnabled = !self.collapseAllCards
var previousRevealedIndex = -1
let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate
if(self.revealedIndex >= 0) {
previousRevealedIndex = self.revealedIndex
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex)
self.revealedIndex = -1
}
self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: {(finished) in
if(previousRevealedIndex >= 0) {
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: previousRevealedIndex)
}
self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: {(finished) in
if(previousRevealedIndex >= 0) {

collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: previousRevealedIndex)
}
})
})
}
}
Expand Down Expand Up @@ -318,14 +315,12 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: self.revealedIndex)
}
if index >= 0 {
self.revealedIndex = index
if(collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, canRevealCardAtIndex: index) == false) {
self.revealedIndex = -1
self.collectionView?.isScrollEnabled = true
self.deinitializeRevealedCard()
return
}
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willRevealCardAtIndex: index)
self.revealedIndex = index
_ = self.initializeRevealedCard()
self.collectionView?.isScrollEnabled = false

Expand All @@ -335,7 +330,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
})
} else if(self.revealedIndex >= 0) {
self.revealedIndex = index
self.collectionView?.isScrollEnabled = false
self.collectionView?.isScrollEnabled = true
self.collectionView?.performBatchUpdates({ self.collectionView?.reloadData() }, completion: { (finished) in
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: oldRevealedIndex)
completion?()
Expand Down Expand Up @@ -421,38 +416,16 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
}
}

private var TEMPTOP: CGFloat = 0

open func willInsert(indexPaths: [IndexPath]) {
for indexPath in indexPaths {
if(indexPath.section == 0) {
if(indexPath.item <= self.revealedIndex) {
TEMPTOP += self.cardHeadHeight
self.revealedIndex += 1
}
}
}
}

open func willDelete(indexPaths: [IndexPath]) {
let collectionViewLayoutDelegate = self.collectionView?.delegate as? HFCardCollectionViewLayoutDelegate
for indexPath in indexPaths {
if(indexPath.section == 0) {
if(indexPath.item == self.revealedIndex) {
self.revealedIndex = -1
self.collectionView?.isScrollEnabled = true
self.deinitializeRevealedCard()
collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, willUnrevealCardAtIndex: indexPath.item)
//collectionViewLayoutDelegate?.cardCollectionViewLayout?(self, didUnrevealCardAtIndex: indexPath.item)
}
if(indexPath.item <= self.revealedIndex) {
TEMPTOP -= self.cardHeadHeight
self.revealedIndex -= 1
}
}
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////
////////// Private //////////
////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -497,11 +470,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz

private var contentInset: UIEdgeInsets {
get {
if #available(iOS 11, *) {
return self.collectionView!.adjustedContentInset
} else {
return self.collectionView!.contentInset
}
return self.collectionView!.contentInset
}
}

Expand Down Expand Up @@ -549,11 +518,11 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
self.collectionView?.addGestureRecognizer(self.collectionViewTapGestureRecognizer!)
}

func keyboardWillShow(_ notification: Notification) {
@objc func keyboardWillShow(_ notification: Notification) {
self.collectionViewIgnoreBottomContentOffsetChanges = true
}

func keyboardDidHide(_ notification: Notification) {
@objc func keyboardDidHide(_ notification: Notification) {
self.collectionViewIgnoreBottomContentOffsetChanges = false
}

Expand Down Expand Up @@ -609,7 +578,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
/// - Parameter proposedContentOffset: The proposed point (in the collection view’s content view) at which to stop scrolling. This is the value at which scrolling would naturally stop if no adjustments were made. The point reflects the upper-left corner of the visible content.
/// - Parameter velocity: The current scrolling velocity along both the horizontal and vertical axes. This value is measured in points per second.
override open func targetContentOffset(forProposedContentOffset proposedContentOffset: CGPoint, withScrollingVelocity velocity: CGPoint) -> CGPoint {
let proposedContentOffsetY = proposedContentOffset.y + self.contentInset.top
let proposedContentOffsetY = proposedContentOffset.y + self.collectionView!.contentInset.top
if(self.spaceAtTopShouldSnap == true && self.spaceAtTopForBackgroundView > 0) {
if(proposedContentOffsetY > 0 && proposedContentOffsetY < self.spaceAtTopForBackgroundView) {
let scrollToTopY = self.spaceAtTopForBackgroundView * 0.5
Expand Down Expand Up @@ -673,7 +642,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz

// MARK: Private Functions for UICollectionViewLayout

internal func collectionViewTapGestureHandler() {
@objc internal func collectionViewTapGestureHandler() {
if let tapLocation = self.collectionViewTapGestureRecognizer?.location(in: self.collectionView) {
if let indexPath = self.collectionView?.indexPathForItem(at: tapLocation) {
self.collectionView?.delegate?.collectionView?(self.collectionView!, didSelectItemAt: indexPath)
Expand All @@ -698,8 +667,8 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
shouldReloadAllItems = true
}

var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView + TEMPTOP) / self.cardHeadHeight) - 10
var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height + TEMPTOP) / self.cardHeadHeight) + 5
var startIndex = Int((self.collectionView!.contentOffset.y + self.contentInset.top - self.spaceAtTopForBackgroundView) / self.cardHeadHeight) - 10
var endBeforeIndex = Int((self.collectionView!.contentOffset.y + self.collectionView!.frame.size.height) / self.cardHeadHeight) + 5

if(startIndex < 0) {
startIndex = 0
Expand All @@ -721,8 +690,6 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
cardLayoutAttribute.zIndex = itemIndex

if self.revealedIndex < 0 && self.collapseAllCards == false {
self.collectionView!.contentOffset.y += TEMPTOP
TEMPTOP = 0
self.generateNonRevealedCardsAttribute(cardLayoutAttribute)
} else if self.revealedIndex == itemIndex && self.collapseAllCards == false {
self.generateRevealedCardAttribute(cardLayoutAttribute)
Expand All @@ -744,7 +711,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
if self.collapseAllCards == false {
return []
} else {
let startIndex: Int = Int(self.contentOffsetTop + TEMPTOP / self.cardHeadHeight)
let startIndex: Int = Int(self.contentOffsetTop / self.cardHeadHeight)
let endIndex = max(0, startIndex + self.bottomNumberOfStackedCards - 2)
return Array(startIndex...endIndex)
}
Expand Down Expand Up @@ -778,7 +745,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
private func generateNonRevealedCardsAttribute(_ attribute: HFCardCollectionViewLayoutAttributes) {
let cardHeadHeight = self.calculateCardHeadHeight()

let startIndex = Int((self.contentOffsetTop + TEMPTOP - self.spaceAtTopForBackgroundView) / cardHeadHeight)
let startIndex = Int((self.contentOffsetTop - self.spaceAtTopForBackgroundView) / cardHeadHeight)
let currentIndex = attribute.indexPath.item
if(currentIndex == self.movingCardSelectedIndex) {
attribute.alpha = 0.0
Expand Down Expand Up @@ -893,7 +860,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
}
}

internal func revealedCardPanGestureHandler() {
@objc internal func revealedCardPanGestureHandler() {
if self.collectionViewItemCount == 1 || self.revealedCardIsFlipped == true {
return
}
Expand Down Expand Up @@ -933,7 +900,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz

// MARK: Moving Card

internal func movingCardGestureHandler() {
@objc internal func movingCardGestureHandler() {
let moveUpOffset: CGFloat = 20

if let movingCardGestureRecognizer = self.movingCardGestureRecognizer {
Expand Down Expand Up @@ -1088,7 +1055,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
self.autoscrollDisplayLink = nil
}

internal func autoscrollHandler(displayLink: CADisplayLink) {
@objc internal func autoscrollHandler(displayLink: CADisplayLink) {
let direction = self.autoscrollDirection
if(direction == .unknown) {
return
Expand All @@ -1098,7 +1065,7 @@ open class HFCardCollectionViewLayout: UICollectionViewLayout, UIGestureRecogniz
let frameSize = self.collectionView!.frame.size
let contentSize = self.collectionView!.contentSize
let contentOffset = self.collectionView!.contentOffset
let contentInset = self.contentInset
let contentInset = self.collectionView!.contentInset
var distance: CGFloat = CGFloat(rint(scrollMultiplier * displayLink.duration))
var translation = CGPoint.zero

Expand Down