Преглед на файлове

Remote Playback: improve cached media UI hints

Felix Paul Kühne преди 9 години
родител
ревизия
e9573bcfd7

+ 1 - 0
Apple-TV/VLCRemotePlaybackViewController.h

@@ -18,6 +18,7 @@
 @property (readwrite, nonatomic, weak) IBOutlet UIButton *toggleHTTPServerButton;
 
 @property (readwrite, nonatomic, weak) IBOutlet UILabel *cachedMediaLabel;
+@property (readwrite, nonatomic, weak) IBOutlet UILabel *cachedMediaLongLabel;
 @property (readwrite, nonatomic, weak) IBOutlet UICollectionView *cachedMediaCollectionView;
 @property (nonatomic, weak) IBOutlet UIView *deleteHintView;
 

+ 2 - 0
Apple-TV/VLCRemotePlaybackViewController.m

@@ -88,6 +88,8 @@ static NSString *const VLCWiggleAnimationKey = @"VLCWiggleAnimation";
     self.playPausePressRecognizer = playPauseRecognizer;
     [self.view addGestureRecognizer:playPauseRecognizer];
 
+    self.cachedMediaLabel.text = NSLocalizedString(@"CACHED_MEDIA", nil);
+    self.cachedMediaLongLabel.text = NSLocalizedString(@"CACHED_MEDIA_LONG", nil);
 }
 
 - (void)viewDidLayoutSubviews

+ 19 - 5
Apple-TV/VLCRemotePlaybackViewController.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder.AppleTV.XIB" version="3.0" toolsVersion="9060" systemVersion="15C47a" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
     </dependencies>
@@ -8,6 +8,7 @@
             <connections>
                 <outlet property="cachedMediaCollectionView" destination="VjG-Gw-i36" id="ATe-7D-fDz"/>
                 <outlet property="cachedMediaLabel" destination="77q-qM-GSv" id="gs2-sW-Z17"/>
+                <outlet property="cachedMediaLongLabel" destination="JaT-Be-qDp" id="epp-C0-23T"/>
                 <outlet property="deleteHintView" destination="Hxr-bA-eu2" id="04c-3W-B8K"/>
                 <outlet property="httpServerLabel" destination="mOM-K1-6hX" id="PvM-0r-xq1"/>
                 <outlet property="toggleHTTPServerButton" destination="N4Q-4c-bh0" id="5Je-Lj-ba0"/>
@@ -26,7 +27,7 @@
 http://bonjour.local
 http://192.168.1.1</string>
                     <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N4Q-4c-bh0">
@@ -39,7 +40,7 @@ http://192.168.1.1</string>
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cached Media" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="77q-qM-GSv">
-                    <rect key="frame" x="837" y="514" width="246" height="46"/>
+                    <rect key="frame" x="837" y="478" width="246" height="46"/>
                     <animations/>
                     <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
@@ -48,6 +49,9 @@ http://192.168.1.1</string>
                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="VjG-Gw-i36">
                     <rect key="frame" x="0.0" y="630" width="1920" height="450"/>
                     <animations/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="450" id="7pU-tA-Gz5"/>
+                    </constraints>
                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="pP2-ie-8Sr">
                         <size key="itemSize" width="50" height="50"/>
                         <size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -63,11 +67,21 @@ http://192.168.1.1</string>
                     <rect key="frame" x="685" y="930" width="550" height="100"/>
                     <animations/>
                 </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JaT-Be-qDp">
+                    <rect key="frame" x="246" y="532" width="1428" height="71"/>
+                    <animations/>
+                    <string key="text">Media shown here is stored locally on your Apple TV. Note that contents can be removed by the operating system without prior notice anytime when VLC is not running if your device runs out of storage.</string>
+                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
             <animations/>
             <constraints>
+                <constraint firstItem="VjG-Gw-i36" firstAttribute="top" secondItem="JaT-Be-qDp" secondAttribute="bottom" constant="27" id="77B-WA-TDW"/>
+                <constraint firstItem="JaT-Be-qDp" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="246" id="Ake-Ya-Nlg"/>
                 <constraint firstItem="N4Q-4c-bh0" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="193" id="Dsp-yk-pru"/>
-                <constraint firstItem="77q-qM-GSv" firstAttribute="top" secondItem="mOM-K1-6hX" secondAttribute="bottom" constant="86" id="PQh-oO-VDm"/>
+                <constraint firstAttribute="trailing" secondItem="JaT-Be-qDp" secondAttribute="trailing" constant="246" id="LLu-x0-uB6"/>
                 <constraint firstItem="mOM-K1-6hX" firstAttribute="centerX" secondItem="N4Q-4c-bh0" secondAttribute="centerX" id="ScU-iV-uMa"/>
                 <constraint firstItem="mOM-K1-6hX" firstAttribute="top" secondItem="N4Q-4c-bh0" secondAttribute="bottom" constant="36" id="Szw-br-TIc"/>
                 <constraint firstItem="77q-qM-GSv" firstAttribute="centerX" secondItem="VjG-Gw-i36" secondAttribute="centerX" id="Tcb-Jy-an4"/>
@@ -77,7 +91,7 @@ http://192.168.1.1</string>
                 <constraint firstItem="Hxr-bA-eu2" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="iND-1n-gnL"/>
                 <constraint firstItem="VjG-Gw-i36" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="l72-n9-cwb"/>
                 <constraint firstAttribute="trailing" secondItem="VjG-Gw-i36" secondAttribute="trailing" id="lJF-jb-gaz"/>
-                <constraint firstItem="VjG-Gw-i36" firstAttribute="top" secondItem="77q-qM-GSv" secondAttribute="bottom" constant="70" id="nNF-vd-238"/>
+                <constraint firstItem="JaT-Be-qDp" firstAttribute="top" secondItem="77q-qM-GSv" secondAttribute="bottom" constant="8" id="udi-Gc-1sY"/>
                 <constraint firstAttribute="bottom" secondItem="VjG-Gw-i36" secondAttribute="bottom" id="v0P-HU-3wm"/>
             </constraints>
         </view>

+ 2 - 0
Resources/en.lproj/Localizable.strings

@@ -306,6 +306,8 @@
 "ENTER_URL"="Enter URL to play";
 "HTTP_SERVER_ON"="Remote Playback enabled";
 "HTTP_SERVER_OFF"="Enable Remote Playback";
+"CACHED_MEDIA"="Cached Media";
+"CACHED_MEDIA_LONG"="Media shown here is stored locally on your Apple TV. Note that contents can be removed by the operating system without prior notice anytime when VLC is not running in case your device runs out of storage.";
 
 // Local Network Service Names
 "UPNP_LONG"="Universal Plug'n'Play (UPnP)";