Resolve constraint conflicts

Resources/VLCPlaylistCollectionViewCell.xib

@@ -59,15 +59,15 @@
                         <animations/>
                     </imageView>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Subtitle — Subtitle" textAlignment="natural" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="jdp-lJ-hIF">
-                        <rect key="frame" x="10" y="167.5" width="321" height="14.5"/>
+                        <rect key="frame" x="10" y="167" width="321" height="14.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
                         <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <size key="shadowOffset" width="0.0" height="0.0"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Meta Data" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lP6-D2-Oef">
-                        <rect key="frame" x="10" y="8" width="321" height="125"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Meta Data" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lP6-D2-Oef">
+                        <rect key="frame" x="8" y="8" width="325" height="14.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
@@ -86,9 +86,8 @@
                 <constraint firstAttribute="bottom" secondItem="jdp-lJ-hIF" secondAttribute="bottom" constant="8" id="AVR-YF-5FR"/>
                 <constraint firstItem="ftR-Og-FOs" firstAttribute="top" secondItem="2" secondAttribute="top" constant="8" id="Cf0-yy-7iB"/>
                 <constraint firstAttribute="trailing" secondItem="0uT-W6-UMC" secondAttribute="trailing" id="I1e-9b-1Eu"/>
-                <constraint firstItem="lP6-D2-Oef" firstAttribute="leading" secondItem="2" secondAttribute="leadingMargin" constant="8" id="JHU-cs-lPD"/>
-                <constraint firstItem="lP6-D2-Oef" firstAttribute="top" secondItem="2" secondAttribute="topMargin" constant="8" id="Jlz-mN-M29"/>
                 <constraint firstItem="4XD-oC-pqG" firstAttribute="leading" secondItem="2" secondAttribute="leadingMargin" constant="2" id="Myr-sC-Y6O"/>
+                <constraint firstItem="4XD-oC-pqG" firstAttribute="top" relation="greaterThanOrEqual" secondItem="lP6-D2-Oef" secondAttribute="bottom" constant="5" id="OeB-fW-gBP"/>
                 <constraint firstItem="pl6-iw-2ZI" firstAttribute="top" secondItem="2" secondAttribute="top" constant="6" id="SKc-13-c0F"/>
                 <constraint firstItem="Gzk-gj-0jk" firstAttribute="top" secondItem="2" secondAttribute="top" id="XMJ-wS-Zg4"/>
                 <constraint firstItem="31" firstAttribute="top" secondItem="2" secondAttribute="top" id="YMD-tj-91G"/>
@@ -96,7 +95,6 @@
                 <constraint firstAttribute="trailing" secondItem="ftR-Og-FOs" secondAttribute="trailing" constant="8" id="bcZ-dH-pSC"/>
                 <constraint firstAttribute="bottom" secondItem="Gzk-gj-0jk" secondAttribute="bottom" id="e0A-1e-hof"/>
                 <constraint firstItem="lP6-D2-Oef" firstAttribute="top" secondItem="2" secondAttribute="top" constant="8" id="gcu-no-yiW"/>
-                <constraint firstAttribute="trailingMargin" secondItem="lP6-D2-Oef" secondAttribute="trailing" constant="8" id="jPM-cp-cyg"/>
                 <constraint firstAttribute="trailing" secondItem="lP6-D2-Oef" secondAttribute="trailing" constant="8" id="jlC-Bw-trU"/>
                 <constraint firstAttribute="trailingMargin" secondItem="4XD-oC-pqG" secondAttribute="trailing" constant="2" id="l0F-mv-LDZ"/>
                 <constraint firstItem="pl6-iw-2ZI" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="6" id="lWY-9H-Xrv"/>

Resources/VLCPlaylistTableViewCell.xib

@@ -40,8 +40,8 @@
                         <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <size key="shadowOffset" width="0.0" height="0.0"/>
                     </label>
-                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" text="New" textAlignment="right" lineBreakMode="wordWrap" baselineAdjustment="none" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sYw-l2-Tmv">
-                        <rect key="frame" x="122" y="67" width="190" height="14.5"/>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="New" textAlignment="right" lineBreakMode="wordWrap" baselineAdjustment="none" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sYw-l2-Tmv">
+                        <rect key="frame" x="286.5" y="67" width="25.5" height="14.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -110,7 +110,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="folderIcon.png" width="120" height="112"/>
+        <image name="folderIcon.png" width="221" height="205"/>
         <image name="gradient-cell-ios7" width="2" height="92"/>
     </resources>
 </document>

Resources/VLCWiFiUploadTableViewCell.xib

@@ -15,16 +15,16 @@
                 <rect key="frame" x="0.0" y="0.0" width="260" height="49.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="HTTP Upload" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="28">
-                        <rect key="frame" x="50" y="5" width="203" height="21"/>
+                    <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="HTTP Upload" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="28">
+                        <rect key="frame" x="50" y="5" width="97.5" height="19.5"/>
                         <animations/>
                         <color key="backgroundColor" white="0.17000000000000001" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <color key="textColor" red="0.76862745099999996" green="0.80000000000000004" blue="0.85490196080000003" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Inactive Server" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="30">
-                        <rect key="frame" x="50" y="24" width="203" height="21"/>
+                    <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Inactive Server" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="30">
+                        <rect key="frame" x="50" y="29" width="90.5" height="16"/>
                         <animations/>
                         <color key="backgroundColor" white="0.17000000000000001" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -50,13 +50,12 @@
                 </subviews>
                 <animations/>
                 <constraints>
-                    <constraint firstItem="30" firstAttribute="leading" secondItem="34" secondAttribute="trailing" id="1OE-lH-jpQ"/>
                     <constraint firstAttribute="bottomMargin" secondItem="30" secondAttribute="bottom" constant="-3.5" id="2Fr-vF-HgI"/>
                     <constraint firstItem="34" firstAttribute="top" secondItem="qYq-WE-nye" secondAttribute="topMargin" constant="-8" id="3uj-4T-hgH"/>
-                    <constraint firstItem="28" firstAttribute="leading" secondItem="34" secondAttribute="trailing" id="crQ-XQ-rKu"/>
+                    <constraint firstItem="28" firstAttribute="leading" secondItem="34" secondAttribute="trailing" id="Tbz-RD-inH"/>
+                    <constraint firstItem="30" firstAttribute="leading" secondItem="34" secondAttribute="trailing" id="mxE-0S-cjg"/>
                     <constraint firstItem="34" firstAttribute="leading" secondItem="qYq-WE-nye" secondAttribute="leadingMargin" constant="-8" id="u4g-A3-Smq"/>
                     <constraint firstItem="28" firstAttribute="top" secondItem="qYq-WE-nye" secondAttribute="topMargin" constant="-3" id="xgV-vT-ruF"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="34" secondAttribute="bottom" constant="-8.5" id="z4p-iK-AkJ"/>
                 </constraints>
             </tableViewCellContentView>
             <animations/>