From 1eed6e49864a8f9d566552d837f12c7d07cbb65e Mon Sep 17 00:00:00 2001 From: CMK Date: Tue, 11 May 2021 16:11:00 +0800 Subject: [PATCH] fix: media photo preview transition top and bottom bar missing mask issue --- .../mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist | 4 ++-- .../Transition/MediaPreview/MediaPreviewTransitionItem.swift | 2 ++ .../MediaPreview/MediaPreviewableViewController.swift | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist index 326857269..f092f9734 100644 --- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ CoreDataStack.xcscheme_^#shared#^_ orderHint - 14 + 15 Mastodon - RTL.xcscheme_^#shared#^_ @@ -32,7 +32,7 @@ NotificationService.xcscheme_^#shared#^_ orderHint - 15 + 14 SuppressBuildableAutocreation diff --git a/Mastodon/Scene/Transition/MediaPreview/MediaPreviewTransitionItem.swift b/Mastodon/Scene/Transition/MediaPreview/MediaPreviewTransitionItem.swift index 47fdd215d..7024d3056 100644 --- a/Mastodon/Scene/Transition/MediaPreview/MediaPreviewTransitionItem.swift +++ b/Mastodon/Scene/Transition/MediaPreview/MediaPreviewTransitionItem.swift @@ -30,6 +30,8 @@ class MediaPreviewTransitionItem: Identifiable { var snapshotRaw: UIView? var snapshotTransitioning: UIView? var touchOffset: CGVector = CGVector.zero + var interactiveTransitionMaskView: UIView? + var interactiveTransitionMaskLayer: CAShapeLayer? init(id: UUID = UUID(), source: Source, previewableViewController: MediaPreviewableViewController) { self.id = id diff --git a/Mastodon/Scene/Transition/MediaPreview/MediaPreviewableViewController.swift b/Mastodon/Scene/Transition/MediaPreview/MediaPreviewableViewController.swift index 8029c09da..63cf10c3e 100644 --- a/Mastodon/Scene/Transition/MediaPreview/MediaPreviewableViewController.swift +++ b/Mastodon/Scene/Transition/MediaPreview/MediaPreviewableViewController.swift @@ -7,7 +7,7 @@ import UIKit -protocol MediaPreviewableViewController: AnyObject { +protocol MediaPreviewableViewController: UIViewController { var mediaPreviewTransitionController: MediaPreviewTransitionController { get } func sourceFrame(transitionItem: MediaPreviewTransitionItem, index: Int) -> CGRect? }