Skip to content

Commit e901934

Browse files
committed
Allow gestures to mix.
1 parent 5c76142 commit e901934

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

Camera/ListViewViewController.swift

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import AVKit
1111
import AVFoundation
1212
import RealmSwift
1313

14-
class ListViewViewController: UIViewController, UICollectionViewDataSource, UICollectionViewDelegate, UIScrollViewDelegate {
14+
class ListViewViewController: UIViewController, UICollectionViewDataSource, UICollectionViewDelegate, UIScrollViewDelegate, UIGestureRecognizerDelegate {
1515

1616
@IBOutlet var mainView: UIView!
1717
@IBOutlet weak var backgroundView: UIView!
1818
@IBOutlet weak var clipCollection: UICollectionView!
1919
@IBOutlet weak var bgImageView: UIImageView!
2020

2121
var screenEdgeRecognizer: UIScreenEdgePanGestureRecognizer!
22+
var deleteGesture: UIPanGestureRecognizer!
2223

2324
var lightboxTransition: LightboxTransition!
2425

@@ -56,6 +57,12 @@ class ListViewViewController: UIViewController, UICollectionViewDataSource, UICo
5657
screenEdgeRecognizer.edges = .Left
5758
view.addGestureRecognizer(screenEdgeRecognizer)
5859

60+
let deleteAction = Selector("deleteCell:")
61+
deleteGesture = UIPanGestureRecognizer(target: self, action: deleteAction)
62+
63+
screenEdgeRecognizer.delegate = self
64+
deleteGesture.delegate = self
65+
5966
lightboxTransition = LightboxTransition()
6067

6168
blurView.frame = self.view.bounds
@@ -70,6 +77,10 @@ class ListViewViewController: UIViewController, UICollectionViewDataSource, UICo
7077
updateTableView()
7178
}
7279

80+
func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWithGestureRecognizer otherGestureRecognizer: UIGestureRecognizer) -> Bool {
81+
return true
82+
}
83+
7384
override func viewDidLayoutSubviews() {
7485
super.viewDidLayoutSubviews()
7586

@@ -167,16 +178,10 @@ class ListViewViewController: UIViewController, UICollectionViewDataSource, UICo
167178
player!.muted = true
168179
players.append(player)
169180
playerLayers.append(playerLayer)
170-
171-
///
172-
173-
let deleteAction = Selector("deleteCell:")
174-
let deleteGesture = UIPanGestureRecognizer(target: self, action: deleteAction)
181+
175182
cell.addGestureRecognizer(deleteGesture)
176183
// deleteGesture.enabled = false
177184

178-
///
179-
180185
NSNotificationCenter.defaultCenter().addObserver(self, selector: "playerDidReachEndNotificationHandler:", name: "AVPlayerItemDidPlayToEndTimeNotification", object: player!.currentItem)
181186

182187
return cell

0 commit comments

Comments
 (0)