Commit f06c8fec authored by Cameron Mozie's avatar Cameron Mozie Committed by Carola Nitz

VLCNetworkCell: Fix - file/folder name ovlapping download button

When viewing local network files there was an issue where if the folder/file name was extremely long, the text would cover the download button making it difficult to see. This fixes that issue by updating the constraints in VLCNetworkList.xib and adding the [super prepareForReuse]; call in the cell class.
Signed-off-by: 's avatarCarola Nitz <nitz.carola@googlemail.com>
parent 78816188
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="landscape">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13147.4"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......@@ -31,89 +33,81 @@
</mask>
</variation>
</imageView>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="File Title" lineBreakMode="wordWrap" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="6">
<rect key="frame" x="67" y="18" width="55" height="17"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="calibratedRGB"/>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="File Title" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="6">
<rect key="frame" x="67" y="18" width="221" height="17"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<label hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Downloading..." textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="28" customClass="VLCStatusLabel">
<rect key="frame" x="112" y="25" width="96" height="18"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="calibratedRGB"/>
<label hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Downloading..." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="28" customClass="VLCStatusLabel">
<rect key="frame" x="99" y="25" width="122" height="18"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="Zr1-tM-Pyf"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Subtitle — Subtitle" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="67" y="37" width="106" height="15"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.71999999999999997" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="25">
<rect key="frame" x="283" y="18" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="b2E-BO-ESa"/>
<constraint firstAttribute="height" constant="32" id="jpk-NV-gaJ"/>
</constraints>
<rect key="frame" x="288" y="18" width="32" height="32"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="download.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<variation key="default">
<mask key="constraints">
<exclude reference="b2E-BO-ESa"/>
<exclude reference="jpk-NV-gaJ"/>
</mask>
</variation>
<connections>
<action selector="triggerDownload:" destination="3" eventType="touchUpInside" id="26"/>
</connections>
</button>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Folder Title" lineBreakMode="wordWrap" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="23">
<rect key="frame" x="67" y="25" width="73" height="17"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="calibratedRGB"/>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Subtitle — Subtitle" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="67" y="51.5" width="106" height="10.5"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.72000002861022949" green="0.72000002861022949" blue="0.72000002861022949" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Folder Title" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="none" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="23">
<rect key="frame" x="67" y="17" width="221" height="33.5"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="221" id="nUO-RN-7eM"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
</subviews>
<constraints>
<constraint firstItem="6" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="9" id="0DO-SK-odg"/>
<constraint firstItem="23" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="top" constant="17" id="0NX-Pa-f4L"/>
<constraint firstItem="28" firstAttribute="centerX" secondItem="qo4-sr-qnV" secondAttribute="centerX" id="1or-QE-1fQ"/>
<constraint firstAttribute="bottomMargin" secondItem="4" secondAttribute="bottom" constant="0.5" id="IRG-mI-IkY"/>
<constraint firstItem="4" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="topMargin" constant="1" id="IYU-30-AGT"/>
<constraint firstItem="25" firstAttribute="leading" secondItem="23" secondAttribute="trailing" id="5hg-up-g0F"/>
<constraint firstAttribute="bottom" secondItem="7" secondAttribute="bottom" constant="5.5" id="AJa-em-9aW"/>
<constraint firstAttribute="trailing" secondItem="23" secondAttribute="trailing" constant="32" id="B9g-13-iDv"/>
<constraint firstItem="25" firstAttribute="leading" secondItem="6" secondAttribute="trailing" id="BeZ-EG-k0x"/>
<constraint firstItem="4" firstAttribute="leading" secondItem="qo4-sr-qnV" secondAttribute="leading" constant="8" id="ET1-eu-4Er"/>
<constraint firstAttribute="trailing" secondItem="6" secondAttribute="trailing" constant="32" id="GPC-2Y-YdQ"/>
<constraint firstItem="4" firstAttribute="centerY" secondItem="qo4-sr-qnV" secondAttribute="centerY" id="JxB-lj-rIe"/>
<constraint firstAttribute="bottomMargin" secondItem="7" secondAttribute="bottom" constant="7.5" id="Qo6-Gd-U30"/>
<constraint firstItem="23" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="9" id="UI8-4U-dR0"/>
<constraint firstItem="25" firstAttribute="centerY" secondItem="qo4-sr-qnV" secondAttribute="centerY" id="ZOR-bw-X93"/>
<constraint firstAttribute="bottomMargin" secondItem="25" secondAttribute="bottom" constant="9.5" id="Zj0-99-Jyc"/>
<constraint firstItem="6" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="topMargin" constant="10" id="csN-tj-rK0"/>
<constraint firstItem="7" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="9" id="dJZ-l3-7bi"/>
<constraint firstItem="25" firstAttribute="leading" secondItem="qo4-sr-qnV" secondAttribute="leading" priority="750" constant="288" id="Kix-4h-RnT"/>
<constraint firstItem="6" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="top" constant="18" id="M68-qr-nsZ"/>
<constraint firstAttribute="trailing" secondItem="7" secondAttribute="trailing" constant="147" id="PVM-cw-r43"/>
<constraint firstItem="7" firstAttribute="top" secondItem="23" secondAttribute="bottom" constant="1" id="XKs-kM-vei"/>
<constraint firstItem="25" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="top" constant="18" id="bUy-w6-nTA"/>
<constraint firstAttribute="bottom" secondItem="25" secondAttribute="bottom" constant="17.670000000000002" id="blw-rH-gE7"/>
<constraint firstItem="6" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="9" id="bmd-Da-cpw"/>
<constraint firstItem="25" firstAttribute="leading" secondItem="28" secondAttribute="trailing" constant="67" id="jCp-YJ-hUy"/>
<constraint firstItem="28" firstAttribute="centerY" secondItem="qo4-sr-qnV" secondAttribute="centerY" id="jOz-Wg-wfW"/>
<constraint firstItem="23" firstAttribute="centerY" secondItem="qo4-sr-qnV" secondAttribute="centerY" id="nw8-Li-eEV"/>
<constraint firstAttribute="trailingMargin" secondItem="25" secondAttribute="trailing" constant="-3" id="rSC-hz-6v1"/>
<constraint firstItem="25" firstAttribute="top" secondItem="qo4-sr-qnV" secondAttribute="topMargin" constant="10" id="y0I-qt-yj9"/>
<constraint firstItem="4" firstAttribute="leading" secondItem="qo4-sr-qnV" secondAttribute="leadingMargin" id="zXF-XV-IEW"/>
<constraint firstItem="23" firstAttribute="leading" secondItem="qo4-sr-qnV" secondAttribute="leading" constant="67" id="oSR-4g-P9K"/>
<constraint firstAttribute="trailing" secondItem="25" secondAttribute="trailing" id="tHU-j7-Zom"/>
<constraint firstItem="7" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="9" id="wdv-n7-eMf"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="IRG-mI-IkY"/>
<exclude reference="IYU-30-AGT"/>
<exclude reference="y0I-qt-yj9"/>
</mask>
</variation>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="downloadButton" destination="25" id="27"/>
<outlet property="folderTitleLabel" destination="23" id="24"/>
......
......@@ -96,6 +96,7 @@
}
- (void)prepareForReuse {
[super prepareForReuse];
[self.thumbnailView cancelLoading];
self.isDownloadable = NO;
self.subtitle = nil;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment