marinofaggiana 4 years ago
parent
commit
bf40492eec

+ 4 - 1
iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1218,6 +1218,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             
         } else {
             
+            /*
             NCViewer.init(navigationController: self.navigationController!, metadata: metadataTouch!)
             return
             
@@ -1243,9 +1244,11 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                 }
                 return
             }
+            */
             
             if CCUtility.fileProviderStorageExists(metadataTouch?.ocId, fileNameView: metadataTouch?.fileNameView) {
-                performSegue(withIdentifier: "segueDetail", sender: self)
+                guard let metadataTouch = metadataTouch else { return }
+                _ = NCViewer.init(viewController: self, metadata: metadataTouch)
             } else {
                 NCNetworking.shared.download(metadata: metadataTouch!, selector: selectorLoadFileView) { (_) in }
             }

+ 1 - 1
iOSClient/Networking/NCNetworkingNotificationCenter.swift

@@ -77,7 +77,7 @@ import Foundation
                                 
                             } else {
                                 
-                                segueMetadata(metadata)
+                                _ = NCViewer.init(viewController: self.appDelegate.activeViewController, metadata: metadata)
                             }
                         }
                         

+ 4 - 2
iOSClient/Viewer/NCViewer.swift

@@ -27,9 +27,11 @@ class NCViewer: NSObject {
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
-    init(navigationController: UINavigationController, metadata: tableMetadata) {
+    init(viewController: UIViewController, metadata: tableMetadata) {
         super.init()
-                
+
+        guard let navigationController = viewController.navigationController else { return }
+        
         if metadata.typeFile == k_metadataTypeFile_document {
                 
             // PDF

+ 1 - 1
iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift

@@ -92,7 +92,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
         pageView.heightAnchor.constraint(equalToConstant: 30).isActive = true
         pageViewWidthAnchor = pageView.widthAnchor.constraint(equalToConstant: 10)
         pageViewWidthAnchor?.isActive = true
-        pageView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 10).isActive = true
+        pageView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 7).isActive = true
         pageView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 7).isActive = true
         
         pageViewLabel.translatesAutoresizingMaskIntoConstraints = false