mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-22 00:01:00 +00:00
Code Issues Projects Releases Wiki Activity

Focal points

Browse source
This commit is contained in:
Justin Mazzocchi 2021-01-03 23:17:38 -08:00
parent 9cfb1b3ef9
commit 9c768c82e0
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
4 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Transitions/ZoomAnimator.swift
View file

@ -50,6 +50,7 @@ private extension ZoomAnimator {
if transitionView == nil, let transitionView = (fromReferenceView as? ZoomAnimatableView)?.transitionView() {
transitionView.frame = fromReferenceViewFrame
transitionView.layer.contentsRect = fromReferenceView.layer.contentsRect
self.transitionView = transitionView
transitionContext.containerView.addSubview(transitionView)
}
@ -65,6 +66,7 @@ private extension ZoomAnimator {
initialSpringVelocity: 0,
options: [.transitionCrossDissolve]) {
self.transitionView?.frame = finalTransitionSize
self.transitionView?.layer.contentsRect = .defaultContentsRect
toVC.view.alpha = 1.0
fromVC.tabBarController?.tabBar.alpha = 0
} completion: { _ in
@ -114,6 +116,8 @@ private extension ZoomAnimator {
self.transitionView?.alpha = 0
}
self.transitionView?.layer.contentsRect = toReferenceView?.layer.contentsRect ?? .defaultContentsRect
toVC.tabBarController?.tabBar.alpha = 1
} completion: { _ in
self.transitionView?.removeFromSuperview()

2
Transitions/ZoomDismissalInteractionController.swift
View file

@ -83,6 +83,8 @@ final class ZoomDismissalInteractionController: NSObject {
transitionView.alpha = 0
}
transitionView.layer.contentsRect = toReferenceView?.layer.contentsRect ?? .defaultContentsRect
toVC.tabBarController?.tabBar.alpha = 1
} completion: { _ in
transitionView.removeFromSuperview()

37
Views/Status/StatusAttachmentView.swift
View file

@ -39,6 +39,37 @@ final class StatusAttachmentView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func layoutSubviews() {
super.layoutSubviews()
if let focus = viewModel.attachment.meta?.focus {
let viewsAndSizes: [(UIView, CGSize?)] = [
(imageView, imageView.image?.size),
(playerView, playerView.player?.currentItem?.presentationSize)]
for (view, size) in viewsAndSizes {
guard let size = size else { continue }
let aspectRatio = size.width / size.height
let viewAspectRatio = view.frame.width / view.frame.height
var origin = CGPoint.zero
if viewAspectRatio > aspectRatio {
let mediaProportionalHeight = size.height * view.frame.width / size.width
let maxPan = (mediaProportionalHeight - view.frame.height) / (2 * mediaProportionalHeight)
origin.y = CGFloat(-focus.y) * maxPan
} else {
let mediaProportionalWidth = size.width * view.frame.height / size.height
let maxPan = (mediaProportionalWidth - view.frame.width) / (2 * mediaProportionalWidth)
origin.x = CGFloat(focus.x) * maxPan
}
view.layer.contentsRect = .init(origin: origin, size: CGRect.defaultContentsRect.size)
}
}
}
}
extension StatusAttachmentView {
@ -114,7 +145,11 @@ private extension StatusAttachmentView {
switch viewModel.attachment.type {
case .image, .video, .gifv:
imageView.kf.setImage(with: viewModel.attachment.previewUrl)
imageView.kf.setImage(
with: viewModel.attachment.previewUrl,
completionHandler: { [weak self] _ in
self?.layoutSubviews()
})
case .audio:
playImageView.image = UIImage(systemName: "waveform.circle",
withConfiguration: UIImage.SymbolConfiguration(textStyle: .largeTitle))

4
Views/ViewConstants.swift
View file

@ -15,6 +15,10 @@ extension CGFloat {
static let newStatusButtonShadowRadius: CGFloat = 2
}
extension CGRect {
static let defaultContentsRect = Self(origin: .zero, size: .init(width: 1, height: 1))
}
extension TimeInterval {
static let defaultAnimationDuration: Self = 0.5
static let shortAnimationDuration = defaultAnimationDuration / 2