shadowfacts
/
frenzy-ios
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add haptic feedback to cell selection

This commit is contained in:
Shadowfacts 2022-01-11 14:28:04 -05:00
parent c9b12a6b70
commit 703b936676
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Reader/Screens/Home/HomeViewController.swift
View File

@ -214,6 +214,7 @@ extension HomeViewController: UICollectionViewDelegate {
let vc = ItemsViewController(fetchRequest: item.fetchRequest, fervorController: fervorController) let vc = ItemsViewController(fetchRequest: item.fetchRequest, fervorController: fervorController)
vc.title = item.title vc.title = item.title
show(vc, sender: nil) show(vc, sender: nil)
UISelectionFeedbackGenerator().selectionChanged()
} }
func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? { func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {

30
Reader/Screens/Items/ItemCollectionViewCell.swift
View File

@ -19,10 +19,12 @@ class ItemCollectionViewCell: UICollectionViewListCell {
private let titleLabel = UILabel() private let titleLabel = UILabel()
private let feedTitleLabel = UILabel() private let feedTitleLabel = UILabel()
private let contentLabel = UILabel() private let contentLabel = UILabel()
private var shouldHighlight = true private var shouldInteractOnNextTouch = true
private var item: Item! private var item: Item!
private lazy var feedbackGenerator = UISelectionFeedbackGenerator()
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
@ -55,7 +57,7 @@ class ItemCollectionViewCell: UICollectionViewListCell {
]) ])
let doubleTap = DoubleTapRecognizer(target: self, action: #selector(cellDoubleTapped)) let doubleTap = DoubleTapRecognizer(target: self, action: #selector(cellDoubleTapped))
doubleTap.onTouchesBegan = highlightCell doubleTap.onTouchesBegan = onDoubleTapBegan
addGestureRecognizer(doubleTap) addGestureRecognizer(doubleTap)
let singleTap = UITapGestureRecognizer(target: self, action: #selector(cellSingleTapped)) let singleTap = UITapGestureRecognizer(target: self, action: #selector(cellSingleTapped))
@ -108,13 +110,10 @@ class ItemCollectionViewCell: UICollectionViewListCell {
} }
} }
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) { private func onDoubleTapBegan() {
highlightCell() guard shouldInteractOnNextTouch else { return }
} shouldInteractOnNextTouch = false
feedbackGenerator.prepare()
@objc private func highlightCell() {
guard shouldHighlight else { return }
shouldHighlight = false
UIView.animateKeyframes(withDuration: 0.4, delay: 0, options: .allowUserInteraction) { UIView.animateKeyframes(withDuration: 0.4, delay: 0, options: .allowUserInteraction) {
UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) { UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) {
self.backgroundColor = .appCellHighlightBackground self.backgroundColor = .appCellHighlightBackground
@ -127,12 +126,14 @@ class ItemCollectionViewCell: UICollectionViewListCell {
@objc private func cellDoubleTapped() { @objc private func cellDoubleTapped() {
setRead(!item.read, animated: true) setRead(!item.read, animated: true)
shouldHighlight = true shouldInteractOnNextTouch = true
feedbackGenerator.selectionChanged()
} }
@objc private func cellSingleTapped() { @objc private func cellSingleTapped() {
delegate?.itemCellSelected(cell: self, item: item) delegate?.itemCellSelected(cell: self, item: item)
shouldHighlight = true shouldInteractOnNextTouch = true
feedbackGenerator.selectionChanged()
} }
} }
@ -149,5 +150,12 @@ private class DoubleTapRecognizer: UITapGestureRecognizer {
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) { override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
super.touchesBegan(touches, with: event) super.touchesBegan(touches, with: event)
onTouchesBegan() onTouchesBegan()
// shorten the delay before the single tap is recognized
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(300)) { [weak self] in
guard let self = self else { return }
if self.state != .recognized {
self.state = .failed
}
}
} }
} }