FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-22 23:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a masking subview so that the image appears to slide under the nav and toolbars

Browse Source
This commit is contained in:
Maurice Parker 2019-10-16 19:32:33 -05:00
parent cb6490222f
commit 6c562f93b5
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
iOS/Article/ArticleViewController.swift
View File

@ -441,6 +441,7 @@ private extension ArticleViewController {
if let imageData = Data(base64Encoded: base64Image), let image = UIImage(data: imageData) { if let imageData = Data(base64Encoded: base64Image), let image = UIImage(data: imageData) {
let rect = CGRect(x: CGFloat(clickMessage.x), y: CGFloat(clickMessage.y), width: CGFloat(clickMessage.width), height: CGFloat(clickMessage.height)) let rect = CGRect(x: CGFloat(clickMessage.x), y: CGFloat(clickMessage.y), width: CGFloat(clickMessage.width), height: CGFloat(clickMessage.height))
transition.originFrame = webView.convert(rect, to: nil) transition.originFrame = webView.convert(rect, to: nil)
transition.maskFrame = webView.convert(webView.frame, to: nil)
transition.originImage = image transition.originImage = image
let imageVC = UIStoryboard.main.instantiateController(ofType: ImageViewController.self) let imageVC = UIStoryboard.main.instantiateController(ofType: ImageViewController.self)

14
iOS/Article/ImageTransition.swift
View File

@ -14,6 +14,7 @@ class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning {
private let duration = 0.4 private let duration = 0.4
var presenting = true var presenting = true
var originFrame: CGRect! var originFrame: CGRect!
var maskFrame: CGRect!
var originImage: UIImage! var originImage: UIImage!
init(controller: ArticleViewController) { init(controller: ArticleViewController) {
@ -67,11 +68,22 @@ class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning {
imageView.frame = imageController.zoomedFrame imageView.frame = imageController.zoomedFrame
let fromView = transitionContext.view(forKey: .from)! let fromView = transitionContext.view(forKey: .from)!
let windowFrame = fromView.window!.frame
fromView.removeFromSuperview() fromView.removeFromSuperview()
let toView = transitionContext.view(forKey: .to)! let toView = transitionContext.view(forKey: .to)!
transitionContext.containerView.addSubview(toView) transitionContext.containerView.addSubview(toView)
transitionContext.containerView.addSubview(imageView)
let maskingView = UIView()
let fullMaskFrame = CGRect(x: windowFrame.minX, y: maskFrame.minY, width: windowFrame.width, height: maskFrame.height)
let path = UIBezierPath(rect: fullMaskFrame)
let maskLayer = CAShapeLayer()
maskLayer.path = path.cgPath
maskingView.layer.mask = maskLayer
maskingView.addSubview(imageView)
transitionContext.containerView.addSubview(maskingView)
UIView.animate( UIView.animate(
withDuration: duration, withDuration: duration,