From cc3bb461300cd8a7bd1c530ff4328c363cb976fc Mon Sep 17 00:00:00 2001 From: Roy Marmelstein Date: Sun, 14 Feb 2016 09:18:46 +0100 Subject: [PATCH] Preview clean up --- FileBrowser/FileList.swift | 12 +++--------- FileBrowser/FilePreview.swift | 7 +++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/FileBrowser/FileList.swift b/FileBrowser/FileList.swift index 1b610b7..12436d5 100644 --- a/FileBrowser/FileList.swift +++ b/FileBrowser/FileList.swift @@ -7,7 +7,6 @@ // import Foundation -import QuickLook class FileList: UIViewController, UIViewControllerPreviewingDelegate { @@ -198,10 +197,8 @@ extension FileList: UITableViewDataSource, UITableViewDelegate { didSelectFile(file) } else { - let quickLook = QLPreviewController() - previewManager.filePath = file.filePath - quickLook.dataSource = previewManager - self.navigationController?.pushViewController(quickLook, animated: true) + let filePreview = previewManager.previewViewControllerForFile(file) + self.navigationController?.pushViewController(filePreview, animated: true) } } tableView.deselectRowAtIndexPath(indexPath, animated: true) @@ -223,10 +220,7 @@ extension FileList: UITableViewDataSource, UITableViewDelegate { if file.isDirectory { return nil } - let quickLook = QLPreviewController() - previewManager.filePath = file.filePath - quickLook.dataSource = previewManager - return quickLook + return previewManager.previewViewControllerForFile(file) } } return nil diff --git a/FileBrowser/FilePreview.swift b/FileBrowser/FilePreview.swift index a58a0e9..5e7e957 100644 --- a/FileBrowser/FilePreview.swift +++ b/FileBrowser/FilePreview.swift @@ -13,6 +13,13 @@ class PreviewManager: NSObject, QLPreviewControllerDataSource { var filePath: NSURL? + func previewViewControllerForFile(file: File) -> UIViewController { + let quickLook = QLPreviewController() + quickLook.dataSource = self + self.filePath = file.filePath + return quickLook + } + func numberOfPreviewItemsInPreviewController(controller: QLPreviewController) -> Int { return 1 }