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

Add pointer interactions to gallery controls

This commit is contained in:
Shadowfacts 2024-03-30 15:17:26 -04:00
parent 841c08be2c
commit eda552c7c9
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift
View File

@ -97,6 +97,10 @@ class GalleryItemViewController: UIViewController {
shareConfig.image = UIImage(systemName: "square.and.arrow.up") shareConfig.image = UIImage(systemName: "square.and.arrow.up")
shareButton = UIButton(configuration: shareConfig) shareButton = UIButton(configuration: shareConfig)
shareButton.addTarget(self, action: #selector(shareButtonPressed), for: .touchUpInside) shareButton.addTarget(self, action: #selector(shareButtonPressed), for: .touchUpInside)
shareButton.isPointerInteractionEnabled = true
shareButton.pointerStyleProvider = { button, effect, shape in
return UIPointerStyle(effect: .highlight(effect.preview), shape: .roundedRect(button.frame))
}
shareButton.translatesAutoresizingMaskIntoConstraints = false shareButton.translatesAutoresizingMaskIntoConstraints = false
updateShareButton() updateShareButton()
topControlsView.addSubview(shareButton) topControlsView.addSubview(shareButton)
@ -108,6 +112,10 @@ class GalleryItemViewController: UIViewController {
closeConfig.image = UIImage(systemName: "xmark") closeConfig.image = UIImage(systemName: "xmark")
let closeButton = UIButton(configuration: closeConfig) let closeButton = UIButton(configuration: closeConfig)
closeButton.addTarget(self, action: #selector(closeButtonPressed), for: .touchUpInside) closeButton.addTarget(self, action: #selector(closeButtonPressed), for: .touchUpInside)
closeButton.isPointerInteractionEnabled = true
closeButton.pointerStyleProvider = { button, effect, shape in
return UIPointerStyle(effect: .highlight(effect.preview), shape: .roundedRect(button.frame))
}
closeButton.translatesAutoresizingMaskIntoConstraints = false closeButton.translatesAutoresizingMaskIntoConstraints = false
topControlsView.addSubview(closeButton) topControlsView.addSubview(closeButton)

4
Tusker/Screens/Gallery/VideoControlsViewController.swift
View File

@ -348,6 +348,8 @@ private class MuteButton: UIControl {
imageView.centerXAnchor.constraint(equalTo: centerXAnchor), imageView.centerXAnchor.constraint(equalTo: centerXAnchor),
imageView.centerYAnchor.constraint(equalTo: centerYAnchor), imageView.centerYAnchor.constraint(equalTo: centerYAnchor),
]) ])
addInteraction(UIPointerInteraction(delegate: nil))
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
@ -395,6 +397,8 @@ private class MenuButton: UIControl {
isContextMenuInteractionEnabled = true isContextMenuInteractionEnabled = true
showsMenuAsPrimaryAction = true showsMenuAsPrimaryAction = true
addInteraction(UIPointerInteraction(delegate: nil))
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {

33
Tusker/Screens/Gallery/VideoOverlayViewController.swift
View File

@ -158,6 +158,8 @@ private class VideoOverlayButton: UIControl {
imageView.topAnchor.constraint(equalTo: topAnchor, constant: 8), imageView.topAnchor.constraint(equalTo: topAnchor, constant: 8),
imageView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -8), imageView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -8),
]) ])
addInteraction(UIPointerInteraction(delegate: self))
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
@ -175,19 +177,23 @@ private class VideoOverlayButton: UIControl {
} }
override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool { override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
UIView.animate(withDuration: 0.2) { if touch.type != .indirectPointer {
self.backgroundView.alpha = 1 UIView.animate(withDuration: 0.2) {
self.backgroundView.transform = CGAffineTransform(scaleX: 1/0.8, y: 1/0.8) self.backgroundView.alpha = 1
self.transform = CGAffineTransform(scaleX: 0.8, y: 0.8) self.backgroundView.transform = CGAffineTransform(scaleX: 1/0.8, y: 1/0.8)
self.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
}
} }
return super.beginTracking(touch, with: event) return super.beginTracking(touch, with: event)
} }
override func endTracking(_ touch: UITouch?, with event: UIEvent?) { override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
UIView.animate(withDuration: 0.2) { if touch?.type != .indirectPointer {
self.backgroundView.alpha = 0 UIView.animate(withDuration: 0.2) {
self.backgroundView.transform = .identity self.backgroundView.alpha = 0
self.transform = .identity self.backgroundView.transform = .identity
self.transform = .identity
}
} }
} }
@ -198,3 +204,14 @@ private class VideoOverlayButton: UIControl {
return true return true
} }
} }
extension VideoOverlayButton: UIPointerInteractionDelegate {
func pointerInteraction(_ interaction: UIPointerInteraction, regionFor request: UIPointerRegionRequest, defaultRegion: UIPointerRegion) -> UIPointerRegion? {
return UIPointerRegion(rect: bounds)
}
func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
let preview = UITargetedPreview(view: self)
return UIPointerStyle(effect: .highlight(preview), shape: .path(UIBezierPath(ovalIn: frame)))
}
}