clear code

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -106,6 +106,7 @@ class NCPlayerToolBar: UIView {
     }
 
     deinit {
+        timerAutoHide?.invalidate()
         print("deinit NCPlayerToolBar")
     }
 
@@ -197,18 +198,6 @@ class NCPlayerToolBar: UIView {
         })
     }
 
-    private func reStartTimerAutoHide() {
-
-        if let timerAutoHide = timerAutoHide, timerAutoHide.isValid {
-            startTimerAutoHide()
-        }
-    }
-
-    func stopTimerAutoHide() {
-
-        timerAutoHide?.invalidate()
-    }
-
     func playButtonPause() {
 
         playButton.setImage(NCUtility.shared.loadImage(named: "pause.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
@@ -246,7 +235,7 @@ class NCPlayerToolBar: UIView {
             break
         }
 
-        reStartTimerAutoHide()
+        startTimerAutoHide()
     }
 
     // MARK: - Action
@@ -281,7 +270,7 @@ class NCPlayerToolBar: UIView {
             muteButton.setImage(NCUtility.shared.loadImage(named: "audioOn", color: .white), for: .normal)
         }
 
-        reStartTimerAutoHide()
+        startTimerAutoHide()
     }
 
     @IBAction func tapForward(_ sender: Any) {
@@ -289,7 +278,7 @@ class NCPlayerToolBar: UIView {
         guard let ncplayer = ncplayer else { return }
 
         ncplayer.jumpForward(10)
-        reStartTimerAutoHide()
+        startTimerAutoHide()
     }
 
     @IBAction func tapBack(_ sender: Any) {
@@ -297,6 +286,6 @@ class NCPlayerToolBar: UIView {
         guard let ncplayer = ncplayer else { return }
 
         ncplayer.jumpBackward(10)
-        reStartTimerAutoHide()
+        startTimerAutoHide()
     }
 }

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -135,24 +135,13 @@ class NCViewerMedia: UIViewController {
         viewerMediaPage?.navigationItem.title = metadata.fileNameView
 
         if metadata.classFile == NKCommon.TypeClassFile.image.rawValue, let viewerMediaPage = self.viewerMediaPage {
-            viewerMediaPage.currentScreenMode = viewerMediaPage.saveScreenModeImage
             if viewerMediaPage.modifiedOcId.contains(metadata.ocId) {
                 viewerMediaPage.modifiedOcId.removeAll(where: { $0 == metadata.ocId })
                 reloadImage()
             }
         }
 
-        if viewerMediaPage?.currentScreenMode == .full {
-
-            viewerMediaPage?.navigationController?.setNavigationBarHidden(true, animated: true)
-
-            NCUtility.shared.colorNavigationController(viewerMediaPage?.navigationController, backgroundColor: .black, titleColor: .white, tintColor: nil, withoutShadow: false)
-
-            viewerMediaPage?.view.backgroundColor = .black
-            viewerMediaPage?.textColor = .white
-            viewerMediaPage?.progressView.isHidden = true
-
-        } else {
+        if viewerMediaPage?.screenMode == .normal {
 
             viewerMediaPage?.navigationController?.setNavigationBarHidden(false, animated: true)
 
@@ -161,6 +150,16 @@ class NCViewerMedia: UIViewController {
             viewerMediaPage?.view.backgroundColor = .systemBackground
             viewerMediaPage?.textColor = .label
             viewerMediaPage?.progressView.isHidden = false
+
+        } else {
+
+            viewerMediaPage?.navigationController?.setNavigationBarHidden(true, animated: true)
+
+            NCUtility.shared.colorNavigationController(viewerMediaPage?.navigationController, backgroundColor: .black, titleColor: .white, tintColor: nil, withoutShadow: false)
+
+            viewerMediaPage?.view.backgroundColor = .black
+            viewerMediaPage?.textColor = .white
+            viewerMediaPage?.progressView.isHidden = true
         }
     }
 
@@ -210,15 +209,6 @@ class NCViewerMedia: UIViewController {
                     self.openDetail()
                 }
             }
-
-            /*
-            if let ncplayer = self.ncplayer {
-
-                ncplayer.imageVideoContainer?.frame = self.imageVideoContainer.frame
-                ncplayer.imageVideoContainer?.frame.size = self.imageVideoContainer.frame.size
-                //ncplayer.imageVideoContainer?.resizeContentView()
-            }
-            */
         }, completion: { context in
             self.showTip()
         })

iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift

@@ -34,8 +34,7 @@ class NCViewerMediaPage: UIViewController {
     enum ScreenMode {
         case full, normal
     }
-    var currentScreenMode: ScreenMode = .normal
-    var saveScreenModeImage: ScreenMode = .normal
+    var screenMode: ScreenMode = .normal
 
     var pageViewController: UIPageViewController {
         return self.children[0] as! UIPageViewController
@@ -130,13 +129,12 @@ class NCViewerMediaPage: UIViewController {
         if let ncplayer = currentViewController.ncplayer, ncplayer.isPlay() {
             ncplayer.playerPause()
         }
-        currentViewController.playerToolBar?.stopTimerAutoHide()
         clearCommandCenter()
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
 
-        if currentScreenMode == .normal {
+        if screenMode == .normal {
             return .default
         } else {
             return .lightContent
@@ -144,7 +142,7 @@ class NCViewerMediaPage: UIViewController {
     }
 
     override var prefersHomeIndicatorAutoHidden: Bool {
-        return currentScreenMode == .full
+        return screenMode == .full
     }
 
     override var prefersStatusBarHidden: Bool {
@@ -206,11 +204,7 @@ class NCViewerMediaPage: UIViewController {
             textColor = .white
         }
 
-        currentScreenMode = mode
-
-        if currentViewController.metadata.classFile == NKCommon.TypeClassFile.image.rawValue {
-            saveScreenModeImage = mode
-        }
+        screenMode = mode
 
         setNeedsStatusBarAppearanceUpdate()
         setNeedsUpdateOfHomeIndicatorAutoHidden()
@@ -570,7 +564,7 @@ extension NCViewerMediaPage: UIGestureRecognizerDelegate {
 
     @objc func didSingleTapWith(gestureRecognizer: UITapGestureRecognizer) {
 
-        if currentScreenMode == .full {
+        if screenMode == .full {
             changeScreenMode(mode: .normal, toggleToolbar: true)
         } else {
             changeScreenMode(mode: .full, toggleToolbar: true)