new view image

Nextcloud.xcodeproj/project.pbxproj

@@ -41,8 +41,8 @@
 		F70753E32542A99100972D44 /* NCZoomTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753E02542A99100972D44 /* NCZoomTransitionController.swift */; };
 		F70753E42542A99100972D44 /* NCZoomDismissalInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753E12542A99100972D44 /* NCZoomDismissalInteractionController.swift */; };
 		F70753E52542A99100972D44 /* NCZoomAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753E22542A99100972D44 /* NCZoomAnimator.swift */; };
-		F70753EB2542A99800972D44 /* NCPhotoPageContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753EA2542A99800972D44 /* NCPhotoPageContainerViewController.swift */; };
-		F70753F12542A9A200972D44 /* NCPhotoZoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753F02542A9A200972D44 /* NCPhotoZoomViewController.swift */; };
+		F70753EB2542A99800972D44 /* NCViewerImagePageContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753EA2542A99800972D44 /* NCViewerImagePageContainer.swift */; };
+		F70753F12542A9A200972D44 /* NCViewerImageZoom.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753F02542A9A200972D44 /* NCViewerImageZoom.swift */; };
 		F70753F72542A9C000972D44 /* NCViewerImage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F70753F62542A9C000972D44 /* NCViewerImage.storyboard */; };
 		F707C26521A2DC5200F6181E /* NCStoreReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = F707C26421A2DC5200F6181E /* NCStoreReview.swift */; };
 		F70968A424212C4E00ED60E5 /* NCLivePhoto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70968A324212C4E00ED60E5 /* NCLivePhoto.swift */; };
@@ -383,8 +383,8 @@
 		F70753E02542A99100972D44 /* NCZoomTransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCZoomTransitionController.swift; sourceTree = "<group>"; };
 		F70753E12542A99100972D44 /* NCZoomDismissalInteractionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCZoomDismissalInteractionController.swift; sourceTree = "<group>"; };
 		F70753E22542A99100972D44 /* NCZoomAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCZoomAnimator.swift; sourceTree = "<group>"; };
-		F70753EA2542A99800972D44 /* NCPhotoPageContainerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCPhotoPageContainerViewController.swift; sourceTree = "<group>"; };
-		F70753F02542A9A200972D44 /* NCPhotoZoomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCPhotoZoomViewController.swift; sourceTree = "<group>"; };
+		F70753EA2542A99800972D44 /* NCViewerImagePageContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerImagePageContainer.swift; sourceTree = "<group>"; };
+		F70753F02542A9A200972D44 /* NCViewerImageZoom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerImageZoom.swift; sourceTree = "<group>"; };
 		F70753F62542A9C000972D44 /* NCViewerImage.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerImage.storyboard; sourceTree = "<group>"; };
 		F707C26421A2DC5200F6181E /* NCStoreReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCStoreReview.swift; sourceTree = "<group>"; };
 		F70968A324212C4E00ED60E5 /* NCLivePhoto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCLivePhoto.swift; sourceTree = "<group>"; };
@@ -1126,8 +1126,8 @@
 			isa = PBXGroup;
 			children = (
 				F70753F62542A9C000972D44 /* NCViewerImage.storyboard */,
-				F70753EA2542A99800972D44 /* NCPhotoPageContainerViewController.swift */,
-				F70753F02542A9A200972D44 /* NCPhotoZoomViewController.swift */,
+				F70753EA2542A99800972D44 /* NCViewerImagePageContainer.swift */,
+				F70753F02542A9A200972D44 /* NCViewerImageZoom.swift */,
 				F70753DF2542A99100972D44 /* Animation */,
 			);
 			path = NCViewerImage;
@@ -2079,7 +2079,7 @@
 				F769454622E9F1B0000A798A /* NCShareCommon.swift in Sources */,
 				F7B0C1751EE839A30033AC24 /* NCAutoUpload.m in Sources */,
 				F738E8421F90FFD100F95C8E /* NCManageEndToEndEncryption.m in Sources */,
-				F70753F12542A9A200972D44 /* NCPhotoZoomViewController.swift in Sources */,
+				F70753F12542A9A200972D44 /* NCViewerImageZoom.swift in Sources */,
 				F7A80BCB252624C100C7CD01 /* NCFileViewInFolder.swift in Sources */,
 				F78A18B823CDE2B300F681F3 /* NCViewerRichWorkspace.swift in Sources */,
 				F78A18B623CDD07D00F681F3 /* NCViewerRichWorkspaceWebView.swift in Sources */,
@@ -2156,7 +2156,7 @@
 				F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */,
 				F7E0E1DC22327885006B0911 /* NCAudioRecorderViewController.swift in Sources */,
 				F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */,
-				F70753EB2542A99800972D44 /* NCPhotoPageContainerViewController.swift in Sources */,
+				F70753EB2542A99800972D44 /* NCViewerImagePageContainer.swift in Sources */,
 				F74C0436253F1CDC009762AB /* NCShares.swift in Sources */,
 				F7AE00F5230D5F9E007ACF8A /* NCLoginWeb.swift in Sources */,
 				F7B2DEF01F976854007CF4D2 /* NYMnemonic.m in Sources */,

iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1663,9 +1663,9 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
     }
 }
 
-extension NCCollectionViewCommon: PhotoPageContainerViewControllerDelegate {
+extension NCCollectionViewCommon: NCViewerImagePageContainerDelegate {
  
-    func containerViewController(_ containerViewController: PhotoPageContainerViewController, indexDidUpdate currentIndex: Int) {
+    func containerViewController(_ containerViewController: NCViewerImagePageContainer, indexDidUpdate currentIndex: Int) {
         self.selectedIndexPath = IndexPath(row: currentIndex, section: 0)
         self.collectionView.scrollToItem(at: self.selectedIndexPath, at: .centeredVertically, animated: false)
     }

iOSClient/Viewer/NCViewer.swift

@@ -60,19 +60,19 @@ class NCViewer: NSObject {
             
             if let navigationController = getPushNavigationController(viewController: viewController, serverUrl: metadata.serverUrl) {
                 
-                let vcImageView:PhotoPageContainerViewController = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateInitialViewController() as! PhotoPageContainerViewController
+                let viewerImagePageContainer:NCViewerImagePageContainer = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateInitialViewController() as! NCViewerImagePageContainer
             
-                navigationController.delegate = vcImageView.transitionController
-                vcImageView.transitionController.toDelegate = vcImageView
+                navigationController.delegate = viewerImagePageContainer.transitionController
+                viewerImagePageContainer.transitionController.toDelegate = viewerImagePageContainer
                 if viewController is NCFiles {
                     let viewController: NCFiles = viewController as! NCFiles
-                    vcImageView.transitionController.fromDelegate = viewController
-                    vcImageView.transitionController.toDelegate = vcImageView
-                    vcImageView.delegate = viewController
-                    vcImageView.currentIndex = viewController.selectedIndexPath.row
-                    vcImageView.photos = viewController.photos
+                    viewerImagePageContainer.transitionController.fromDelegate = viewController
+                    viewerImagePageContainer.transitionController.toDelegate = viewerImagePageContainer
+                    viewerImagePageContainer.delegate = viewController
+                    viewerImagePageContainer.currentIndex = viewController.selectedIndexPath.row
+                    viewerImagePageContainer.photos = viewController.photos
                     
-                    navigationController.pushViewController(vcImageView, animated: true)
+                    navigationController.pushViewController(viewerImagePageContainer, animated: true)
                 }
             }
     

iOSClient/Viewer/NCViewerImage/NCViewerImage.storyboard

@@ -12,7 +12,7 @@
         <!--Zoom-->
         <scene sceneID="yQe-Pb-BKZ">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="ne8-hS-cp3" customClass="PhotoPageContainerViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="ne8-hS-cp3" customClass="NCViewerImagePageContainer" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="8k6-KQ-iNa"/>
                         <viewControllerLayoutGuide type="bottom" id="baP-ZX-MR4"/>
@@ -52,10 +52,10 @@
             </objects>
             <point key="canvasLocation" x="3748" y="777.66116941529242"/>
         </scene>
-        <!--Photo Zoom View Controller-->
+        <!--Viewer Image Zoom-->
         <scene sceneID="rpT-vc-Kiv">
             <objects>
-                <viewController storyboardIdentifier="PhotoZoomViewController" automaticallyAdjustsScrollViewInsets="NO" id="gXy-ag-ank" customClass="PhotoZoomViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NCViewerImageZoom" automaticallyAdjustsScrollViewInsets="NO" id="gXy-ag-ank" customClass="NCViewerImageZoom" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="IQm-1K-tBr"/>
                         <viewControllerLayoutGuide type="bottom" id="zwn-Sc-mqc"/>

iOSClient/Viewer/NCViewerImage/NCPhotoPageContainerViewController.swift → iOSClient/Viewer/NCViewerImage/NCViewerImagePageContainer.swift

@@ -2,25 +2,25 @@
 
 import UIKit
 
-protocol PhotoPageContainerViewControllerDelegate: class {
-    func containerViewController(_ containerViewController: PhotoPageContainerViewController, indexDidUpdate currentIndex: Int)
+protocol NCViewerImagePageContainerDelegate: class {
+    func containerViewController(_ containerViewController: NCViewerImagePageContainer, indexDidUpdate currentIndex: Int)
 }
 
-class PhotoPageContainerViewController: UIViewController, UIGestureRecognizerDelegate {
+class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate {
 
     enum ScreenMode {
         case full, normal
     }
     var currentMode: ScreenMode = .normal
     
-    weak var delegate: PhotoPageContainerViewControllerDelegate?
+    weak var delegate: NCViewerImagePageContainerDelegate?
     
     var pageViewController: UIPageViewController {
         return self.children[0] as! UIPageViewController
     }
     
-    var currentViewController: PhotoZoomViewController {
-        return self.pageViewController.viewControllers![0] as! PhotoZoomViewController
+    var currentViewController: NCViewerImageZoom {
+        return self.pageViewController.viewControllers![0] as! NCViewerImageZoom
     }
     
     var photos: [UIImage]!
@@ -44,7 +44,7 @@ class PhotoPageContainerViewController: UIViewController, UIGestureRecognizerDel
         self.singleTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(didSingleTapWith(gestureRecognizer:)))
         self.pageViewController.view.addGestureRecognizer(self.singleTapGestureRecognizer)
         
-        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(PhotoZoomViewController.self)") as! PhotoZoomViewController
+        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(NCViewerImageZoom.self)") as! NCViewerImageZoom
         vc.delegate = self
         vc.index = self.currentIndex
         vc.image = self.photos[self.currentIndex]
@@ -147,7 +147,7 @@ class PhotoPageContainerViewController: UIViewController, UIGestureRecognizerDel
     }
 }
 
-extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPageViewControllerDataSource {
+extension NCViewerImagePageContainer: UIPageViewControllerDelegate, UIPageViewControllerDataSource {
     
     func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
         
@@ -155,7 +155,7 @@ extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPage
             return nil
         }
         
-        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(PhotoZoomViewController.self)") as! PhotoZoomViewController
+        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(NCViewerImageZoom.self)") as! NCViewerImageZoom
         vc.delegate = self
         vc.image = self.photos[currentIndex - 1]
         vc.index = currentIndex - 1
@@ -170,7 +170,7 @@ extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPage
             return nil
         }
         
-        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(PhotoZoomViewController.self)") as! PhotoZoomViewController
+        let vc = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "\(NCViewerImageZoom.self)") as! NCViewerImageZoom
         vc.delegate = self
         self.singleTapGestureRecognizer.require(toFail: vc.doubleTapGestureRecognizer)
         vc.image = self.photos[currentIndex + 1]
@@ -181,7 +181,7 @@ extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPage
     
     func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
         
-        guard let nextVC = pendingViewControllers.first as? PhotoZoomViewController else {
+        guard let nextVC = pendingViewControllers.first as? NCViewerImageZoom else {
             return
         }
         
@@ -192,7 +192,7 @@ extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPage
         
         if (completed && self.nextIndex != nil) {
             previousViewControllers.forEach { vc in
-                let zoomVC = vc as! PhotoZoomViewController
+                let zoomVC = vc as! NCViewerImageZoom
                 zoomVC.scrollView.zoomScale = zoomVC.scrollView.minimumZoomScale
             }
 
@@ -205,9 +205,9 @@ extension PhotoPageContainerViewController: UIPageViewControllerDelegate, UIPage
     
 }
 
-extension PhotoPageContainerViewController: PhotoZoomViewControllerDelegate {
+extension NCViewerImagePageContainer: NCViewerImageZoomDelegate {
     
-    func photoZoomViewController(_ photoZoomViewController: PhotoZoomViewController, scrollViewDidScroll scrollView: UIScrollView) {
+    func viewerImageZoom(_ viewerImageZoom: NCViewerImageZoom, scrollViewDidScroll scrollView: UIScrollView) {
         if scrollView.zoomScale != scrollView.minimumZoomScale && self.currentMode != .full {
             self.changeScreenMode(to: .full)
             self.currentMode = .full
@@ -215,7 +215,7 @@ extension PhotoPageContainerViewController: PhotoZoomViewControllerDelegate {
     }
 }
 
-extension PhotoPageContainerViewController: ZoomAnimatorDelegate {
+extension NCViewerImagePageContainer: ZoomAnimatorDelegate {
     
     func transitionWillStartWith(zoomAnimator: ZoomAnimator) {
     }

iOSClient/Viewer/NCViewerImage/NCPhotoZoomViewController.swift → iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -1,11 +1,11 @@
 
 import UIKit
 
-protocol PhotoZoomViewControllerDelegate: class {
-    func photoZoomViewController(_ photoZoomViewController: PhotoZoomViewController, scrollViewDidScroll scrollView: UIScrollView)
+protocol NCViewerImageZoomDelegate: class {
+    func viewerImageZoom(_ viewerImageZoom: NCViewerImageZoom, scrollViewDidScroll scrollView: UIScrollView)
 }
 
-class PhotoZoomViewController: UIViewController {
+class NCViewerImageZoom: UIViewController {
     
     @IBOutlet weak var imageViewBottomConstraint: NSLayoutConstraint!
     @IBOutlet weak var imageViewLeadingConstraint: NSLayoutConstraint!
@@ -14,7 +14,7 @@ class PhotoZoomViewController: UIViewController {
     @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var imageView: UIImageView!
     
-    weak var delegate: PhotoZoomViewControllerDelegate?
+    weak var delegate: NCViewerImageZoomDelegate?
     
     var image: UIImage!
     var index: Int = 0
@@ -122,7 +122,7 @@ class PhotoZoomViewController: UIViewController {
     }
 }
 
-extension PhotoZoomViewController: UIScrollViewDelegate {
+extension NCViewerImageZoom: UIScrollViewDelegate {
     func viewForZooming(in scrollView: UIScrollView) -> UIView? {
         return imageView
     }
@@ -132,6 +132,6 @@ extension PhotoZoomViewController: UIScrollViewDelegate {
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        self.delegate?.photoZoomViewController(self, scrollViewDidScroll: scrollView)
+        self.delegate?.viewerImageZoom(self, scrollViewDidScroll: scrollView)
     }
 }