Przeglądaj źródła

MovieViewController: fix playbackspeedview and tracklabel position

Carola Nitz 6 lat temu
rodzic
commit
7129c75bfc
1 zmienionych plików z 26 dodań i 17 usunięć
  1. 26 17
      Resources/VLCMovieViewController.xib

+ 26 - 17
Resources/VLCMovieViewController.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina5_5" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -66,33 +67,32 @@
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                 </view>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" text="Track Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="282">
-                    <rect key="frame" x="31" y="545" width="351" height="28"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" ambiguous="YES" text="Track Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="282">
+                    <rect key="frame" x="20" y="545" width="696" height="28"/>
                     <fontDescription key="fontDescription" type="system" pointSize="23"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                     <color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" text="Artist Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="279">
-                    <rect key="frame" x="20" y="354" width="374" height="28"/>
+                    <rect key="frame" x="20" y="193" width="696" height="28"/>
                     <fontDescription key="fontDescription" type="system" pointSize="23"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                     <color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </label>
                 <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Status Label" textAlignment="center" lineBreakMode="tailTruncation" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="210" customClass="VLCStatusLabel">
-                    <rect key="frame" x="159.66666666666666" y="357" width="95" height="22"/>
+                    <rect key="frame" x="320.66666666666669" y="196" width="95" height="22"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                     <color key="shadowColor" red="1" green="1" blue="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                 </label>
                 <activityIndicatorView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="vR5-i9-KEJ">
-                    <rect key="frame" x="188.66666666666666" y="349.66666666666669" width="37" height="37"/>
+                    <rect key="frame" x="349.66666666666669" y="188.66666666666666" width="37" height="37"/>
                 </activityIndicatorView>
-                <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="108" userLabel="Playing Externally View" customClass="PlayingExternallyView" customModule="VLC" customModuleProvider="target">
-                    <rect key="frame" x="47" y="239.66666666666663" width="320" height="257"/>
+                <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="108" userLabel="Playing Externally View" customClass="PlayingExternallyView" customModule="VLC_iOS" customModuleProvider="target">
+                    <rect key="frame" x="208" y="78.666666666666686" width="320" height="257"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="320" id="8KN-Zx-c9b"/>
@@ -103,16 +103,16 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="241" userLabel="scrubbing indicator view" customClass="VLCFrostedGlasView">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="46"/>
+                    <rect key="frame" x="0.0" y="0.0" width="736" height="46"/>
                     <subviews>
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="High-Speed Scrubbing" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="244">
-                            <rect key="frame" x="20" y="0.0" width="374" height="23"/>
+                            <rect key="frame" x="20" y="0.0" width="696" height="23"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Slide your finger down to adjust the scrubbing rate." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="246">
-                            <rect key="frame" x="20" y="25" width="374" height="21"/>
+                            <rect key="frame" x="20" y="25" width="696" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -132,7 +132,7 @@
                     </constraints>
                 </view>
                 <view hidden="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="117" userLabel="video filters view" customClass="VLCFrostedGlasView">
-                    <rect key="frame" x="47" y="234" width="320" height="200"/>
+                    <rect key="frame" x="208" y="234" width="320" height="200"/>
                     <subviews>
                         <slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="2" translatesAutoresizingMaskIntoConstraints="NO" id="128" customClass="VLCSlider">
                             <rect key="frame" x="18" y="19" width="284" height="29"/>
@@ -225,9 +225,12 @@
                         <constraint firstAttribute="width" constant="320" id="Plh-Rw-EMF"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="165" customClass="PlaybackSpeedView" customModule="VLC" customModuleProvider="target">
-                    <rect key="frame" x="47" y="363" width="320" height="163"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="165" customClass="PlaybackSpeedView" customModule="VLC_iOS" customModuleProvider="target">
+                    <rect key="frame" x="208" y="363" width="320" height="163"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="320" id="pVb-gO-oVe"/>
+                        <constraint firstAttribute="height" constant="163" id="pmm-w6-GhT"/>
+                    </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="nibName" value="PlaybackSpeedView"/>
                     </userDefinedRuntimeAttributes>
@@ -238,11 +241,17 @@
                 <constraint firstItem="241" firstAttribute="top" secondItem="1" secondAttribute="top" id="17c-gK-WU7"/>
                 <constraint firstAttribute="trailing" secondItem="279" secondAttribute="trailing" constant="20" id="4Qt-0h-qAV"/>
                 <constraint firstItem="210" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="7Vi-af-4cH"/>
+                <constraint firstItem="282" firstAttribute="trailing" secondItem="1" secondAttribute="trailing" constant="-20" id="7Yl-il-4Oh"/>
+                <constraint firstItem="282" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="8ZU-tH-SDA"/>
                 <constraint firstItem="yK6-Ph-SVE" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="9m0-dB-TJV"/>
                 <constraint firstItem="vR5-i9-KEJ" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="Al3-H2-oYT"/>
+                <constraint firstItem="282" firstAttribute="bottom" secondItem="117" secondAttribute="bottom" constant="-20" id="BaW-yV-Mg8"/>
                 <constraint firstItem="279" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="Cf6-1N-E2d"/>
+                <constraint firstItem="282" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="Dnl-Ou-env"/>
                 <constraint firstItem="279" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="Enz-pN-IJQ"/>
+                <constraint firstItem="165" firstAttribute="bottom" secondItem="117" secondAttribute="bottom" id="Gs9-xq-5U6"/>
                 <constraint firstItem="vR5-i9-KEJ" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="JxU-VS-ZDs"/>
+                <constraint firstItem="165" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="LZh-hK-Vbt"/>
                 <constraint firstItem="210" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="MHR-gH-pTD"/>
                 <constraint firstItem="241" firstAttribute="leading" secondItem="1" secondAttribute="leading" id="NlR-AR-oDp"/>
                 <constraint firstItem="yK6-Ph-SVE" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="Vea-d4-8Yb"/>