marinofaggiana 5 years ago
parent
commit
f42341ebfb

+ 1 - 1
iOSClient/Main/NCDetailViewController.swift

@@ -594,7 +594,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
             
             if let viewerImageVideo = UIStoryboard(name: "NCViewerImageVideo", bundle: nil).instantiateInitialViewController() as? NCViewerImageVideo {
                 viewerImageVideo.metadata = metadata
-                present(viewerImageVideo, animated: true) { }
+                present(viewerImageVideo, animated: false) { }
             }
         }
     }

+ 5 - 5
iOSClient/Viewer/NCViewerImage/NCViewerImageVideo.storyboard

@@ -17,11 +17,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U2u-Ng-quR">
-                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
+                                <rect key="frame" x="0.0" y="64" width="414" height="778"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oHy-h6-oBZ">
-                                <rect key="frame" x="8" y="10" width="45" height="26"/>
+                                <rect key="frame" x="8" y="18" width="45" height="26"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QdX-GD-p2D">
                                         <rect key="frame" x="11.5" y="2" width="22" height="22"/>
@@ -45,11 +45,11 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="U2u-Ng-quR" firstAttribute="top" secondItem="I8r-2q-gEp" secondAttribute="top" id="JMx-LP-euj"/>
-                            <constraint firstItem="I8r-2q-gEp" firstAttribute="bottom" secondItem="U2u-Ng-quR" secondAttribute="bottom" id="OB5-oL-uWd"/>
+                            <constraint firstItem="U2u-Ng-quR" firstAttribute="top" secondItem="I8r-2q-gEp" secondAttribute="top" constant="20" id="JMx-LP-euj"/>
+                            <constraint firstItem="I8r-2q-gEp" firstAttribute="bottom" secondItem="U2u-Ng-quR" secondAttribute="bottom" constant="20" id="OB5-oL-uWd"/>
                             <constraint firstItem="oHy-h6-oBZ" firstAttribute="leading" secondItem="I8r-2q-gEp" secondAttribute="leading" constant="8" id="V0z-bW-qho"/>
                             <constraint firstAttribute="trailing" secondItem="U2u-Ng-quR" secondAttribute="trailing" id="fK9-2n-mIB"/>
-                            <constraint firstAttribute="top" secondItem="oHy-h6-oBZ" secondAttribute="top" constant="-10" id="lE8-hz-8Tq"/>
+                            <constraint firstAttribute="top" secondItem="oHy-h6-oBZ" secondAttribute="top" constant="-18" id="lE8-hz-8Tq"/>
                             <constraint firstItem="U2u-Ng-quR" firstAttribute="leading" secondItem="ZUd-xF-jbc" secondAttribute="leading" id="zBR-Jl-ZtK"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="I8r-2q-gEp"/>

+ 3 - 2
iOSClient/Viewer/NCViewerImage/NCViewerImageVideo.swift

@@ -42,13 +42,14 @@ class NCViewerImageVideo: UIViewController {
         
         view.backgroundColor = .black
         closeView.layer.cornerRadius = 5
-        closeButton.setImage(CCGraphics.changeThemingColorImage(UIImage(named: "exit"), width: 50, height: 50, color: .lightGray), for: .normal)
+        closeButton.setImage(CCGraphics.changeThemingColorImage(UIImage(named: "exit"), width: 50, height: 50, color: .white), for: .normal)
         
         let frame = CGRect(x: 0, y: 0, width: self.backgroundView.frame.width, height: self.backgroundView.frame.height)
         NCViewerMedia.sharedInstance.viewMedia(metadata, view: backgroundView, frame: frame)
     }
     
     @IBAction func touchUpInsidecloseButton(_ sender: Any) {
+        
         if appDelegate.player != nil && appDelegate.player.rate != 0 {
             appDelegate.player.pause()
         }
@@ -58,6 +59,6 @@ class NCViewerImageVideo: UIViewController {
             NCViewerMedia.sharedInstance.removeObserver()
         }
 
-        dismiss(animated: true) { }
+        dismiss(animated: false) { }
     }
 }