dev

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -33,16 +33,20 @@ import FloatingPanel
 class NCPlayerToolBar: UIView {
 
     @IBOutlet weak var playerTopToolBarView: UIStackView!
-    @IBOutlet weak var playerToolBarView: UIView!
-    @IBOutlet weak var playButton: UIButton!
     @IBOutlet weak var subtitleButton: UIButton!
     @IBOutlet weak var audioButton: UIButton!
+
+    @IBOutlet weak var playerToolBarView: UIView!
+    @IBOutlet weak var playButton: UIButton!
+
     @IBOutlet weak var forwardButton: UIButton!
     @IBOutlet weak var backButton: UIButton!
     @IBOutlet weak var playbackSlider: UISlider!
-    @IBOutlet weak var volumeSlider: UISlider!
     @IBOutlet weak var labelLeftTime: UILabel!
     @IBOutlet weak var labelCurrentTime: UILabel!
+
+    @IBOutlet weak var volumeView: UIView!
+    @IBOutlet weak var volumeSlider: UISlider!
     @IBOutlet weak var volumeSliderConstraintWidth: NSLayoutConstraint!
     @IBOutlet weak var volumeSliderConstraintTrailing: NSLayoutConstraint!
 

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.xib

@@ -45,15 +45,25 @@
                     </subviews>
                     <directionalEdgeInsets key="directionalLayoutMargins" top="5" leading="5" bottom="5" trailing="5"/>
                 </stackView>
-                <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="Jec-GX-2dX">
-                    <rect key="frame" x="362" y="440" width="104" height="31"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UlI-V1-Wz3">
+                    <rect key="frame" x="331" y="103" width="83" height="681"/>
+                    <subviews>
+                        <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="Jec-GX-2dX">
+                            <rect key="frame" x="31" y="325.5" width="54" height="31"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="50" id="tyN-ZD-51M"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="layer.transform.rotation.z" value="-1.570795"/>
+                            </userDefinedRuntimeAttributes>
+                        </slider>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="100" id="tyN-ZD-51M"/>
+                        <constraint firstAttribute="trailing" secondItem="Jec-GX-2dX" secondAttribute="trailing" id="pwZ-O5-ybP"/>
+                        <constraint firstItem="Jec-GX-2dX" firstAttribute="centerY" secondItem="UlI-V1-Wz3" secondAttribute="centerY" id="qND-ic-m70"/>
                     </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="layer.transform.rotation.z" value="-1.570795"/>
-                    </userDefinedRuntimeAttributes>
-                </slider>
+                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85m-50-8yp">
                     <rect key="frame" x="10" y="794" width="394" height="58"/>
                     <subviews>
@@ -143,13 +153,15 @@
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
+                <constraint firstItem="85m-50-8yp" firstAttribute="top" secondItem="UlI-V1-Wz3" secondAttribute="bottom" constant="10" id="2mJ-aK-dch"/>
                 <constraint firstItem="85m-50-8yp" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="10" id="5H2-Gg-PEb"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="Jec-GX-2dX" secondAttribute="trailing" constant="-50" id="5Js-8x-UdK"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="85m-50-8yp" secondAttribute="trailing" constant="10" id="BXT-Qo-qFl"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="85m-50-8yp" secondAttribute="bottom" constant="10" id="N7Q-PF-7lb"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="UlI-V1-Wz3" secondAttribute="trailing" id="dmY-RB-YLe"/>
                 <constraint firstItem="XfW-XC-eMf" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="10" id="fq3-6h-kkx"/>
-                <constraint firstItem="Jec-GX-2dX" firstAttribute="centerY" secondItem="vUN-kp-3ea" secondAttribute="centerY" id="sq1-Nj-RAv"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="XfW-XC-eMf" secondAttribute="trailing" constant="10" id="uYG-Ai-CGv"/>
+                <constraint firstItem="UlI-V1-Wz3" firstAttribute="top" secondItem="XfW-XC-eMf" secondAttribute="bottom" constant="10" id="zFs-be-FCU"/>
+                <constraint firstItem="UlI-V1-Wz3" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.2" id="zVc-qr-lZr"/>
             </constraints>
             <connections>
                 <outlet property="audioButton" destination="sMY-qo-4CE" id="R7Q-de-Dsv"/>
@@ -163,8 +175,9 @@
                 <outlet property="playerTopToolBarView" destination="XfW-XC-eMf" id="Qdp-IW-YhT"/>
                 <outlet property="subtitleButton" destination="qqZ-QN-TsW" id="XCP-hb-eZB"/>
                 <outlet property="volumeSlider" destination="Jec-GX-2dX" id="p6t-7N-Cfr"/>
-                <outlet property="volumeSliderConstraintTrailing" destination="5Js-8x-UdK" id="aGL-pZ-LqG"/>
+                <outlet property="volumeSliderConstraintTrailing" destination="pwZ-O5-ybP" id="ry2-tb-qrt"/>
                 <outlet property="volumeSliderConstraintWidth" destination="tyN-ZD-51M" id="Jgs-Kj-QQ7"/>
+                <outlet property="volumeView" destination="UlI-V1-Wz3" id="x2N-4V-o1N"/>
             </connections>
             <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
         </view>