coding

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -154,21 +154,11 @@ class NCViewerMedia: UIViewController {
             navigationController?.setNavigationBarHidden(false, animated: true)
             progressView.isHidden = false
 
-            // show playerToolBar
             currentViewController.playerToolBar.showToolBar(metadata: currentViewController.metadata, detailView: currentViewController.detailView)
             
-            if (!currentViewController.metadata.livePhoto && currentViewController.metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue) {
+            NCUtility.shared.colorNavigationController(navigationController, backgroundColor: NCBrandColor.shared.systemBackground, titleColor: NCBrandColor.shared.label, tintColor: nil)
-                
+            view.backgroundColor = NCBrandColor.shared.systemBackground
-                NCUtility.shared.colorNavigationController(navigationController, backgroundColor: .black, titleColor: .white, tintColor: nil)
+            textColor = NCBrandColor.shared.label
-                view.backgroundColor = .black
-                textColor = .white
-                
-            } else {
-                
-                NCUtility.shared.colorNavigationController(navigationController, backgroundColor: NCBrandColor.shared.systemBackground, titleColor: NCBrandColor.shared.label, tintColor: nil)
-                view.backgroundColor = NCBrandColor.shared.systemBackground
-                textColor = NCBrandColor.shared.label
-            }
             
             currentMode = .normal
             
@@ -180,7 +170,6 @@ class NCViewerMedia: UIViewController {
             currentViewController.playerToolBar.hideToolBar()
 
             NCUtility.shared.colorNavigationController(navigationController, backgroundColor: .black, titleColor: .white, tintColor: nil)
-            
             view.backgroundColor = .black
             textColor = .white
                         

iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

@@ -124,20 +124,11 @@ class NCViewerMediaZoom: UIViewController {
         } else {
             
             viewerMedia?.navigationController?.setNavigationBarHidden(false, animated: true)
-            
-            if (!metadata.livePhoto && metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue) {
-                
-                NCUtility.shared.colorNavigationController(viewerMedia?.navigationController, backgroundColor: .black, titleColor: .white, tintColor: nil)
-                viewerMedia?.view.backgroundColor = .black
-                viewerMedia?.textColor = .white
-                
-            } else {
                 
-                NCUtility.shared.colorNavigationController(viewerMedia?.navigationController, backgroundColor: NCBrandColor.shared.systemBackground, titleColor: NCBrandColor.shared.label, tintColor: nil)
+            NCUtility.shared.colorNavigationController(viewerMedia?.navigationController, backgroundColor: NCBrandColor.shared.systemBackground, titleColor: NCBrandColor.shared.label, tintColor: nil)
-                viewerMedia?.view.backgroundColor = NCBrandColor.shared.systemBackground
+            
-                viewerMedia?.textColor = NCBrandColor.shared.label
+            viewerMedia?.view.backgroundColor = NCBrandColor.shared.systemBackground
-            }
+            viewerMedia?.textColor = NCBrandColor.shared.label
-
             viewerMedia?.progressView.isHidden = false
         }
     }