coding

iOSClient/Viewer/NCViewerImage/NCViewerImage.storyboard

@@ -234,6 +234,9 @@
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a0D-B0-eGX">
                                                 <rect key="frame" x="0.0" y="0.0" width="364" height="100"/>
+                                                <connections>
+                                                    <action selector="buttonTouchInside:" destination="sBp-t2-eFh" eventType="touchUpInside" id="5fA-20-TD3"/>
+                                                </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8AB-hx-yqN">
                                                 <rect key="frame" x="318.99999999999994" y="62.666666666666629" width="25" height="25"/>

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -516,11 +516,13 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
     
     @objc func didSingleTapWith(gestureRecognizer: UITapGestureRecognizer) {
              
-//        if currentViewerImageZoom?.detailView.isShow() ?? false {
-//            self.viewerVideo?.viewerVideoToolBar?.showToolBar(metadata: self.currentMetadata)
-//            return
-//        }
-        
+        if let viewerVideoToolBar = NCViewerVideo.shared.viewerVideoToolBar {
+            if viewerVideoToolBar.isHidden {
+                viewerVideoToolBar.showToolBar()
+                return
+            }
+        }
+            
         /*
         if currentMetadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || currentMetadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
             
@@ -543,13 +545,7 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
             currentMode = .full
         }
         */
-        
-//        if currentMetadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || currentMetadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
-//            let wasHidden = viewerVideo?.viewerVideoToolBar?.isHidden
-//            viewerVideo?.viewerVideoToolBar?.showToolBar(metadata: currentMetadata)
-//            if wasHidden ?? false { return }
-//        }
-        
+                
         if currentMode == .full {
             
             navigationController?.setNavigationBarHidden(false, animated: false)
@@ -578,13 +574,6 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
 
 extension NCViewerImage: NCViewerImageZoomDelegate {
     
-    func photoPageViewController(_ viewerImageZoom: NCViewerImageZoom, scrollViewDidScroll scrollView: UIScrollView) {
-//        if scrollView.zoomScale != scrollView.minimumZoomScale && self.currentMode != .full {
-//            self.changeScreenMode(to: .full)
-//            self.currentMode = .full
-//        }
-    }
-    
     func dismissImageZoom() {
         self.navigationController?.popViewController(animated: true)
     }

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -25,7 +25,6 @@ import UIKit
 import NCCommunication
 
 protocol NCViewerImageZoomDelegate {
-    func photoPageViewController(_ viewerImageZoom: NCViewerImageZoom, scrollViewDidScroll scrollView: UIScrollView)
     func didAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
     func dismissImageZoom()
 }
@@ -267,6 +266,7 @@ extension NCViewerImageZoom: UIScrollViewDelegate {
     }
     
     func scrollViewDidZoom(_ scrollView: UIScrollView) {
+        
         if scrollView.zoomScale > 1 {
             if let image = imageView.image {
                 
@@ -289,6 +289,5 @@ extension NCViewerImageZoom: UIScrollViewDelegate {
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        self.delegate?.photoPageViewController(self, scrollViewDidScroll: scrollView)
     }
 }

iOSClient/Viewer/NCViewerVideo/NCViewerVideoToolBar.swift

@@ -46,6 +46,7 @@ class NCViewerVideoToolBar: UIView {
     private var wasInPlay: Bool = false
     private var playbackSliderEvent: sliderEventType = .ended
     private let seekDuration: Float64 = 15
+    private var singleTapGestureRecognizer: UITapGestureRecognizer!
 
     // MARK: - View Life Cycle
 
@@ -80,7 +81,14 @@ class NCViewerVideoToolBar: UIView {
         setToolBarImage()
     }
     
+    //MARK: - Action
+    
+    @IBAction func buttonTouchInside(_ sender: UIButton) {
+        hideToolBar()
+    }
+    
     func setBarPlayer(player: AVPlayer?, metadata: tableMetadata?) {
+        
         self.player = player
         self.metadata = metadata
         
@@ -105,19 +113,29 @@ class NCViewerVideoToolBar: UIView {
         })
         
         setToolBarImage()
-        
-        // show
-        updateOutlet()
-        self.isHidden = false
+        showToolBar()
     }
     
     @objc public func hideToolBar() {
+        
         updateOutlet()
-        self.isHidden = true
+      
+        UIView.animate(withDuration: 0.3, animations: {
+            self.alpha = 0
+        }, completion: { (value: Bool) in
+            self.isHidden = true
+        })
     }
     
     @objc public func showToolBar() {
-        self.isHidden = false
+        
+        updateOutlet()
+        
+        UIView.animate(withDuration: 0.3, animations: {
+            self.alpha = 1
+        }, completion: { (value: Bool) in
+            self.isHidden = false
+        })
     }
     
     public func setToolBarImage() {