shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Fix double-tap to zoom in gallery not working 

Closes #256
This commit is contained in:
Shadowfacts 2022-11-20 15:48:29 -05:00
parent 11e81acbc1
commit 0a8d50cc27
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tusker/Screens/Large Image/LargeImageContentView.swift
View File

@ -14,6 +14,7 @@ import VisionKit
protocol LargeImageContentView: UIView { protocol LargeImageContentView: UIView {
var animationImage: UIImage? { get } var animationImage: UIImage? { get }
var activityItemsForSharing: [Any] { get } var activityItemsForSharing: [Any] { get }
var owner: LargeImageViewController? { get set }
func setControlsVisible(_ controlsVisible: Bool) func setControlsVisible(_ controlsVisible: Bool)
func grayscaleStateChanged() func grayscaleStateChanged()
} }
@ -29,17 +30,14 @@ class LargeImageImageContentView: UIImageView, LargeImageContentView {
#endif #endif
var animationImage: UIImage? { image! } var animationImage: UIImage? { image! }
var activityItemsForSharing: [Any] { var activityItemsForSharing: [Any] {
[image!] [image!]
} }
weak var owner: LargeImageViewController?
private var sourceData: Data? private var sourceData: Data?
private weak var owner: UIViewController?
init(image: UIImage, owner: UIViewController?) {
self.owner = owner
init(image: UIImage) {
super.init(image: image) super.init(image: image)
contentMode = .scaleAspectFit contentMode = .scaleAspectFit
@ -109,11 +107,11 @@ extension LargeImageImageContentView: ImageAnalysisInteractionDelegate {
class LargeImageGifContentView: GIFImageView, LargeImageContentView { class LargeImageGifContentView: GIFImageView, LargeImageContentView {
var animationImage: UIImage? { image } var animationImage: UIImage? { image }
var activityItemsForSharing: [Any] { var activityItemsForSharing: [Any] {
// todo: should gifs share the data? // todo: should gifs share the data?
[image].compactMap { $0 } [image].compactMap { $0 }
} }
weak var owner: LargeImageViewController?
init(gifController: GIFController) { init(gifController: GIFController) {
super.init(image: gifController.lastFrame?.image) super.init(image: gifController.lastFrame?.image)
@ -144,6 +142,7 @@ class LargeImageGifvContentView: GifvAttachmentView, LargeImageContentView {
// some SO posts indicate that just sharing a URL to the video should work, but that may need to be a local URL? // some SO posts indicate that just sharing a URL to the video should work, but that may need to be a local URL?
[] []
} }
weak var owner: LargeImageViewController?
private let asset: AVURLAsset private let asset: AVURLAsset

6
Tusker/Screens/Large Image/LargeImageViewController.swift
View File

@ -103,15 +103,19 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
dismissInteractionController = LargeImageInteractionController(viewController: self) dismissInteractionController = LargeImageInteractionController(viewController: self)
} }
view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(scrollViewPressed(_:)))) let singleTap = UITapGestureRecognizer(target: self, action: #selector(scrollViewPressed(_:)))
let doubleTap = UITapGestureRecognizer(target: self, action: #selector(scrollViewDoubleTapped(_:))) let doubleTap = UITapGestureRecognizer(target: self, action: #selector(scrollViewDoubleTapped(_:)))
doubleTap.numberOfTapsRequired = 2 doubleTap.numberOfTapsRequired = 2
// this requirement is needed to make sure the double tap is ever recognized
singleTap.require(toFail: doubleTap)
view.addGestureRecognizer(singleTap)
view.addGestureRecognizer(doubleTap) view.addGestureRecognizer(doubleTap)
NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
} }
private func setupContentView() { private func setupContentView() {
contentView.owner = self
contentView.translatesAutoresizingMaskIntoConstraints = false contentView.translatesAutoresizingMaskIntoConstraints = false
scrollView.addSubview(contentView) scrollView.addSubview(contentView)
contentViewLeadingConstraint = contentView.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor) contentViewLeadingConstraint = contentView.leadingAnchor.constraint(equalTo: scrollView.leadingAnchor)

6
Tusker/Screens/Large Image/LoadingLargeImageViewController.swift
View File

@ -138,9 +138,9 @@ class LoadingLargeImageViewController: UIViewController, LargeImageAnimatableVie
content = LargeImageGifContentView(gifController: gifController) content = LargeImageGifContentView(gifController: gifController)
} else { } else {
if let transformedImage = ImageGrayscalifier.convertIfNecessary(url: url, image: image) { if let transformedImage = ImageGrayscalifier.convertIfNecessary(url: url, image: image) {
content = LargeImageImageContentView(image: transformedImage, owner: self) content = LargeImageImageContentView(image: transformedImage)
} else { } else {
content = LargeImageImageContentView(image: image, owner: self) content = LargeImageImageContentView(image: image)
} }
} }
@ -167,7 +167,7 @@ class LoadingLargeImageViewController: UIViewController, LargeImageAnimatableVie
let grayscale = ImageGrayscalifier.convert(url: nil, cgImage: source) { let grayscale = ImageGrayscalifier.convert(url: nil, cgImage: source) {
image = grayscale image = grayscale
} }
setContent(LargeImageImageContentView(image: image, owner: self)) setContent(LargeImageImageContentView(image: image))
} }
} }