dev

iOSClient/Main/NCDetailViewController.swift

@@ -37,9 +37,9 @@ class NCDetailViewController: UIViewController {
     @objc var offlineFilterImage: Bool = false
 
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
-    private var mediaBrowser: NCViewerImageViewController?
+    private var viewerImageViewController: NCViewerImageViewController?
     private var metadatas = [tableMetadata]()
-    private var mediaBrowserIndexStart = 0
+    private var viewerImageViewControllerIndexStart = 0
         
     //MARK: -
 
@@ -132,7 +132,7 @@ class NCDetailViewController: UIViewController {
    
     @objc func changeDisplayMode() {
        
-        NCViewerImageCommon.shared.imageChangeSizeView(mediaBrowser: mediaBrowser, size: self.backgroundView.frame.size, metadata: metadata)
+        NCViewerImageCommon.shared.imageChangeSizeView(viewerImageViewController: viewerImageViewController, size: self.backgroundView.frame.size, metadata: metadata)
     }
     
     @objc func moveFile(_ notification: NSNotification) {
@@ -150,11 +150,11 @@ class NCDetailViewController: UIViewController {
                 if errorCode != 0 { return }
                 
                 // IMAGE
-                if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
+                if viewerImageViewController != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
                         
                     if let metadatas = NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, favoriteDatasorce: favoriteFilterImage, mediaDatasorce: mediaFilterImage, offLineDatasource: offlineFilterImage) {
                                 
-                        var index = mediaBrowser!.index - 1
+                        var index = viewerImageViewController!.index - 1
                         if index < 0 { index = 0}
                         self.metadata = metadatas[index]
                         
@@ -180,7 +180,7 @@ class NCDetailViewController: UIViewController {
                 if errorCode != 0 { return }
                 
                 // IMAGE
-                if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
+                if viewerImageViewController != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
                     if NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, favoriteDatasorce: favoriteFilterImage, mediaDatasorce: mediaFilterImage, offLineDatasource: offlineFilterImage) != nil {
                         viewImage()
                     } else {
@@ -197,7 +197,7 @@ class NCDetailViewController: UIViewController {
                 if errorCode != 0 { return }
                 
                 // IMAGE
-                if mediaBrowser != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
+                if viewerImageViewController != nil && metadata.account == self.metadata?.account && metadata.serverUrl == self.metadata?.serverUrl && metadata.typeFile == k_metadataTypeFile_image {
                     if NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, favoriteDatasorce: favoriteFilterImage, mediaDatasorce: mediaFilterImage, offLineDatasource: offlineFilterImage) != nil {
                         viewImage()
                     } else {
@@ -376,7 +376,7 @@ class NCDetailViewController: UIViewController {
     }
 }
 
-//MARK: - MediaBrowser - Delegate/DataSource
+//MARK: - viewerImageViewController - Delegate/DataSource
 
 extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerImageViewControllerDataSource {
     
@@ -388,53 +388,53 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                             
             var counter = 0
             for metadata in metadatas {
-                if metadata.ocId == self.metadata!.ocId { mediaBrowserIndexStart = counter }
+                if metadata.ocId == self.metadata!.ocId { viewerImageViewControllerIndexStart = counter }
                 counter += 1
             }
             self.metadatas = metadatas
             
-            mediaBrowser = NCViewerImageViewController(index: mediaBrowserIndexStart, dataSource: self, delegate: self)
-            if mediaBrowser != nil {
+            viewerImageViewController = NCViewerImageViewController(index: viewerImageViewControllerIndexStart, dataSource: self, delegate: self)
+            if viewerImageViewController != nil {
                            
                 self.backgroundView.image = nil
 
-                mediaBrowser!.view.isHidden = true
+                viewerImageViewController!.view.isHidden = true
                 
-                mediaBrowser!.enableInteractiveDismissal = true
+                viewerImageViewController!.enableInteractiveDismissal = true
                 
-                addChild(mediaBrowser!)
-                backgroundView.addSubview(mediaBrowser!.view)
+                addChild(viewerImageViewController!)
+                backgroundView.addSubview(viewerImageViewController!.view)
                 
-                mediaBrowser!.view.frame = CGRect(x: 0, y: 0, width: backgroundView.frame.width, height: backgroundView.frame.height)
-                mediaBrowser!.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+                viewerImageViewController!.view.frame = CGRect(x: 0, y: 0, width: backgroundView.frame.width, height: backgroundView.frame.height)
+                viewerImageViewController!.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
                 
-                mediaBrowser!.didMove(toParent: self)
+                viewerImageViewController!.didMove(toParent: self)
                 
                 DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
-                    self.mediaBrowser!.changeInViewSize(to: self.backgroundView.frame.size)
-                    self.mediaBrowser!.view.isHidden = false
+                    self.viewerImageViewController!.changeInViewSize(to: self.backgroundView.frame.size)
+                    self.viewerImageViewController!.view.isHidden = false
                 }
             }
         }
     }
     
-    func numberOfItems(in mediaBrowser: NCViewerImageViewController) -> Int {
+    func numberOfItems(in viewerImageViewController: NCViewerImageViewController) -> Int {
         return metadatas.count
     }
 
-    func mediaBrowser(_ mediaBrowser: NCViewerImageViewController, imageAt index: Int, completion: @escaping NCViewerImageViewControllerDataSource.CompletionBlock) {
+    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, imageAt index: Int, completion: @escaping NCViewerImageViewControllerDataSource.CompletionBlock) {
         
         if index >= metadatas.count { return }
         let metadata = metadatas[index]
         
         // Refresh self metadata && title
-        if mediaBrowser.index < metadatas.count {
-            self.metadata = metadatas[mediaBrowser.index]
+        if viewerImageViewController.index < metadatas.count {
+            self.metadata = metadatas[viewerImageViewController.index]
             self.navigationController?.navigationBar.topItem?.title = self.metadata!.fileNameView
         }
         
         // Original only for the first
-        if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) > 0 && index == mediaBrowserIndexStart {
+        if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) > 0 && index == viewerImageViewControllerIndexStart {
                 
             if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
                 DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
@@ -474,7 +474,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         }
     }
     
-    func mediaBrowser(_ mediaBrowser: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView) {
+    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView) {
         
         if index >= metadatas.count { return }
         let metadata = metadatas[index]
@@ -488,7 +488,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         }
     }
     
-    func mediaBrowserTap(_ mediaBrowser: NCViewerImageViewController) {
+    func viewerImageViewControllerTap(_ viewerImageViewController: NCViewerImageViewController) {
         guard let navigationController = self.navigationController else { return }
         
         if navigationController.isNavigationBarHidden {
@@ -499,10 +499,10 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
             view.backgroundColor = .black
         }
         
-        NCViewerImageCommon.shared.imageChangeSizeView(mediaBrowser: mediaBrowser, size: self.backgroundView.frame.size, metadata: metadata)
+        NCViewerImageCommon.shared.imageChangeSizeView(viewerImageViewController: viewerImageViewController, size: self.backgroundView.frame.size, metadata: metadata)
     }
     
-    func mediaBrowserDismiss() {
+    func viewerImageViewControllerDismiss() {
         viewUnload()
     }
     

iOSClient/Viewer/NCViewerImage/NCViewerImageCommon.swift

@@ -78,12 +78,12 @@ class NCViewerImageCommon: NSObject {
         return image
     }
     
-    func imageChangeSizeView(mediaBrowser: NCViewerImageViewController?, size: CGSize, metadata: tableMetadata?) {
-        guard let mediaBrowser = mediaBrowser else { return }
+    func imageChangeSizeView(viewerImageViewController: NCViewerImageViewController?, size: CGSize, metadata: tableMetadata?) {
+        guard let viewerImageViewController = viewerImageViewController else { return }
         
         var image: UIImage?
         var contentViewSaved : NCViewerImageContentView?
-        for contentView in mediaBrowser.contentViews {
+        for contentView in viewerImageViewController.contentViews {
             if contentView.position == 0 && contentView.isLoading == false {
                 image = contentView.image
                 contentViewSaved = contentView
@@ -96,7 +96,7 @@ class NCViewerImageCommon: NSObject {
         }
         DispatchQueue.main.async {
         //DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
-            mediaBrowser.changeInViewSize(to: size)
+            viewerImageViewController.changeInViewSize(to: size)
             if image != nil {
                 contentViewSaved?.image = image
             }

iOSClient/Viewer/NCViewerImage/NCViewerImageDismissAnimationController.swift

@@ -186,7 +186,7 @@ internal class NCViewerImageDismissAnimationController: NSObject {
         let directionalPosition = (gestureDirection == .horizontal) ? relativePosition.y : relativePosition.x
         if directionalPosition != 0.0 {
             viewController?.dismiss(animated: false, completion: {
-                self.viewController?.delegate?.mediaBrowserDismiss()
+                self.viewController?.delegate?.viewerImageViewControllerDismiss()
             })
         } else {
             viewController?.mediaContainerView.isHidden = false

iOSClient/Viewer/NCViewerImage/NCViewerImageViewController.swift

@@ -39,32 +39,32 @@ public protocol NCViewerImageViewControllerDataSource: class {
 
     /**
      Method to supply number of items to be shown in media browser.
-     - parameter mediaBrowser: Reference to media browser object.
+     - parameter viewerImageViewController: Reference to media browser object.
      - returns: An integer with number of items to be shown in media browser.
      */
-    func numberOfItems(in mediaBrowser: NCViewerImageViewController) -> Int
+    func numberOfItems(in viewerImageViewController: NCViewerImageViewController) -> Int
 
     /**
      Method to supply image for specific index.
-     - parameter mediaBrowser: Reference to media browser object.
+     - parameter viewerImageViewController: Reference to media browser object.
      - parameter index: Index of the requested media.
      - parameter completion: Completion block to be executed on fetching the media image.
      */
-    func mediaBrowser(_ mediaBrowser: NCViewerImageViewController, imageAt index: Int, completion: @escaping CompletionBlock)
+    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, imageAt index: Int, completion: @escaping CompletionBlock)
 
     /**
      This method is used to get the target frame into which the browser will perform the dismiss transition.
-     - parameter mediaBrowser: Reference to media browser object.
+     - parameter viewerImageViewController: Reference to media browser object.
 
      - note:
         If this method is not implemented, the media browser will perform slide up/down transition on dismissal.
     */
-    func targetFrameForDismissal(_ mediaBrowser: NCViewerImageViewController) -> CGRect?
+    func targetFrameForDismissal(_ viewerImageViewController: NCViewerImageViewController) -> CGRect?
 }
 
 extension NCViewerImageViewControllerDataSource {
 
-    public func targetFrameForDismissal(_ mediaBrowser: NCViewerImageViewController) -> CGRect? { return nil }
+    public func targetFrameForDismissal(_ viewerImageViewController: NCViewerImageViewController) -> CGRect? { return nil }
 }
 
 // MARK: - NCViewerImageViewControllerDelegate protocol
@@ -73,21 +73,21 @@ public protocol NCViewerImageViewControllerDelegate: class {
 
     /**
      Method invoked on scrolling to next/previous media items.
-     - parameter mediaBrowser: Reference to media browser object.
+     - parameter viewerImageViewController: Reference to media browser object.
      - parameter index: Index of the newly focussed media item.
      - note:
         This method will not be called on first load, and will be called only on swiping left and right.
      */
-    func mediaBrowser(_ mediaBrowser: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView)
+    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView)
     
-    func mediaBrowserTap(_ mediaBrowser: NCViewerImageViewController)
+    func viewerImageViewControllerTap(_ viewerImageViewController: NCViewerImageViewController)
 
-    func mediaBrowserDismiss()
+    func viewerImageViewControllerDismiss()
 }
 
 extension NCViewerImageViewControllerDelegate {
 
-    public func mediaBrowser(_ mediaBrowser: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView) {}
+    public func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView) {}
 }
 
 public class NCViewerImageViewController: UIViewController {
@@ -491,7 +491,7 @@ extension NCViewerImageViewController {
             mediaView.zoomScaleOne()
         }
 
-        self.delegate?.mediaBrowserTap(self)
+        self.delegate?.viewerImageViewControllerTap(self)
     }
 }
 
@@ -583,7 +583,7 @@ extension NCViewerImageViewController {
                 mediaContainerView.sendSubviewToBack(previousView)
             }
 
-            delegate?.mediaBrowser(self, didChangeFocusTo: index, view: nextView)
+            delegate?.viewerImageViewController(self, didChangeFocusTo: index, view: nextView)
 
         } else if middleView.position > (1 + normalizedGap - normalizedCenter) {
 
@@ -604,7 +604,7 @@ extension NCViewerImageViewController {
                 mediaContainerView.bringSubviewToFront(nextView)
             }
 
-            delegate?.mediaBrowser(self, didChangeFocusTo: index, view: previousView)
+            delegate?.viewerImageViewController(self, didChangeFocusTo: index, view: previousView)
         }
     }
 
@@ -639,7 +639,7 @@ extension NCViewerImageViewController {
         contentView.image = nil
         let convertedIndex = sanitizeIndex(contentView.index)
         contentView.isLoading = true
-        dataSource?.mediaBrowser(
+        dataSource?.viewerImageViewController(
             self,
             imageAt: convertedIndex,
             completion: { [weak self] (index, image, zoom, _) in