Fixes peek & pop deprecation warnings

This commit is contained in:
Riley Testut
2023-03-02 15:48:33 -06:00
committed by Magesh K
parent e4dfe1125a
commit 8695c412d7
5 changed files with 32 additions and 10 deletions

View File

@@ -14,7 +14,7 @@ import Roxas
import Nuke
class BrowseViewController: UICollectionViewController
class BrowseViewController: UICollectionViewController, PeekPopPreviewing
{
private lazy var dataSource = self.makeDataSource()
private lazy var placeholderView = RSTPlaceholderView(frame: .zero)
@@ -47,7 +47,7 @@ class BrowseViewController: UICollectionViewController
self.collectionView.dataSource = self.dataSource
self.collectionView.prefetchDataSource = self.dataSource
self.registerForPreviewing(with: self, sourceView: self.collectionView)
(self as PeekPopPreviewing).registerForPreviewing(with: self, sourceView: self.collectionView)
self.update()
}
@@ -373,6 +373,7 @@ extension BrowseViewController: UICollectionViewDelegateFlowLayout
extension BrowseViewController: UIViewControllerPreviewingDelegate
{
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController?
{
guard
@@ -388,6 +389,7 @@ extension BrowseViewController: UIViewControllerPreviewingDelegate
return appViewController
}
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController)
{
self.navigationController?.pushViewController(viewControllerToCommit, animated: true)

View File

@@ -32,7 +32,7 @@ extension MyAppsViewController
}
}
final class MyAppsViewController: UICollectionViewController
class MyAppsViewController: UICollectionViewController, PeekPopPreviewing
{
private let coordinator = NSFileCoordinator()
private let operationQueue = OperationQueue()
@@ -115,11 +115,7 @@ final class MyAppsViewController: UICollectionViewController
self.sideloadingProgressView.bottomAnchor.constraint(equalTo: navigationBar.bottomAnchor)])
}
if #available(iOS 13, *) {}
else
{
self.registerForPreviewing(with: self, sourceView: self.collectionView)
}
(self as PeekPopPreviewing).registerForPreviewing(with: self, sourceView: self.collectionView)
}
override func viewWillAppear(_ animated: Bool)
@@ -2230,6 +2226,7 @@ extension MyAppsViewController: UIDocumentPickerDelegate
extension MyAppsViewController: UIViewControllerPreviewingDelegate
{
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController?
{
guard
@@ -2253,6 +2250,7 @@ extension MyAppsViewController: UIViewControllerPreviewingDelegate
}
}
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController)
{
let point = CGPoint(x: previewingContext.sourceRect.midX, y: previewingContext.sourceRect.midY)

View File

@@ -41,7 +41,7 @@ private final class AppBannerFooterView: UICollectionReusableView
}
}
final class NewsViewController: UICollectionViewController
class NewsViewController: UICollectionViewController, PeekPopPreviewing
{
private lazy var dataSource = self.makeDataSource()
private lazy var placeholderView = RSTPlaceholderView(frame: .zero)
@@ -77,7 +77,7 @@ final class NewsViewController: UICollectionViewController
self.collectionView.register(NewsCollectionViewCell.nib, forCellWithReuseIdentifier: RSTCellContentGenericCellIdentifier)
self.collectionView.register(AppBannerFooterView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "AppBanner")
self.registerForPreviewing(with: self, sourceView: self.collectionView)
(self as PeekPopPreviewing).registerForPreviewing(with: self, sourceView: self.collectionView)
self.update()
}
@@ -492,6 +492,7 @@ extension NewsViewController: UICollectionViewDelegateFlowLayout
extension NewsViewController: UIViewControllerPreviewingDelegate
{
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController?
{
if let indexPath = self.collectionView.indexPathForItem(at: location), let cell = self.collectionView.cellForItem(at: indexPath)
@@ -538,6 +539,7 @@ extension NewsViewController: UIViewControllerPreviewingDelegate
}
}
@available(iOS, deprecated: 13.0)
func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController)
{
if let safariViewController = viewControllerToCommit as? SFSafariViewController

View File

@@ -0,0 +1,16 @@
//
// PeekPopPreviewing.swift
// AltStore
//
// Created by Riley Testut on 3/2/23.
// Copyright © 2023 Riley Testut. All rights reserved.
//
import UIKit
// Conforming UIViewControllers to PeekPopPreviewing allows us to call deprecated registerForPreviewing(with:sourceView:) without warnings.
protocol PeekPopPreviewing
{
@discardableResult
func registerForPreviewing(with delegate: UIViewControllerPreviewingDelegate, sourceView: UIView) -> UIViewControllerPreviewing
}