Skip to content

GitLab

Commit 6d337afa authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

Add iOS 7 redesign of the Open Network Stream panel

parent 9ea7e57e
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 6 deletions
Resources/VLCFutureDownloadViewController.xib
View file @ 6d337afa
......@@ -94,7 +94,7 @@
<action selector="cancelDownload:" destination="-1" eventType="touchUpInside" id="90"/>
</connections>
</button>
<activityIndicatorView userInteractionEnabled="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="91">
<activityIndicatorView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="91">
<rect key="frame" x="142" y="26" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.1052877679" green="0.1052846164" blue="0.1052864045" alpha="1" colorSpace="calibratedRGB"/>
......
Resources/VLCFutureOpenNetworkStreamViewController.xib 0 → 100644
View file @ 6d337afa
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5037" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1552" identifier="iOS"/>
<development version="5000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VLCOpenNetworkStreamViewController">
<connections>
<outlet property="historyTableView" destination="10" id="15"/>
<outlet property="openButton" destination="i2a-FY-QGC" id="ry8-BI-sW5"/>
<outlet property="privateModeLabel" destination="9" id="13"/>
<outlet property="privateToggleSwitch" destination="8" id="12"/>
<outlet property="urlField" destination="Ucc-ui-OIc" id="TiQ-KO-ZbK"/>
<outlet property="view" destination="1" id="3"/>
<outlet property="whatToOpenHelpLabel" destination="27" id="29"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="1">
<rect key="frame" x="0.0" y="0.0" width="320" height="383"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="4">
<rect key="frame" x="0.0" y="0.0" width="320" height="131"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter any HTTP, RTSP, RTMP, MMS, FTP or UDP/RTP address to open the stream directly." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="9" id="27">
<rect key="frame" x="7" y="81" width="306" height="50"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.74659199620000005" green="0.74659199620000005" blue="0.74659199620000005" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="http://myserver.com/file.mkv" textAlignment="center" minimumFontSize="17" clearButtonMode="unlessEditing" id="Ucc-ui-OIc">
<rect key="frame" x="0.0" y="5" width="320" height="31"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.28627450980000002" green="0.28627450980000002" blue="0.28627450980000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocorrectionType="no"/>
</textField>
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="i2a-FY-QGC">
<rect key="frame" x="0.0" y="41" width="320" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" title="Télécharger"/>
<connections>
<action selector="openButtonAction:" destination="-1" eventType="touchUpInside" id="ggP-1c-34h"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
<view contentMode="scaleToFill" id="19">
<rect key="frame" x="0.0" y="133" width="320" height="51"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="8">
<rect key="frame" x="20" y="10" width="51" height="31"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="onTintColor" white="0.0" alpha="0.60999999999999999" colorSpace="custom" customColorSpace="calibratedWhite"/>
</switch>
<label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Private Playback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9">
<rect key="frame" x="77" y="15" width="205" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.74659199620000005" green="0.74659199620000005" blue="0.74659199620000005" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="10">
<rect key="frame" x="0.0" y="186" width="320" height="197"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="calibratedRGB"/>
<color key="separatorColor" white="0.0" alpha="0.60999999999999999" colorSpace="custom" customColorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="-1" id="18"/>
<outlet property="delegate" destination="-1" id="17"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
</objects>
</document>
Sources/VLCMenuTableViewController.m
View file @ 6d337afa
......@@ -297,9 +297,12 @@
if (sectionNumber == 1) {
if (itemIndex == 0)
viewController = [[VLCLocalServerListViewController alloc] init];
else if (itemIndex == 1)
viewController = [[VLCOpenNetworkStreamViewController alloc] init];
else if (itemIndex == 2)
else if (itemIndex == 1) {
if (SYSTEM_RUNS_IOS7_OR_LATER)
viewController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:@"VLCFutureOpenNetworkStreamViewController" bundle:nil];
else
viewController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:@"VLCOpenNetworkStreamViewController" bundle:nil];
} else if (itemIndex == 2)
viewController = self.appDelegate.downloadViewController;
else if (itemIndex == 3)
[self toggleHTTPServer:nil];
......
Sources/VLCOpenNetworkStreamViewController.m
View file @ 6d337afa
......@@ -40,7 +40,10 @@
{
[super viewDidLoad];
[self.openButton setTitle:NSLocalizedString(@"BUTTON_OPEN", @"") forState:UIControlStateNormal];
if (SYSTEM_RUNS_IOS7_OR_LATER)
[self.openButton setTitle:NSLocalizedString(@"OPEN_NETWORK", @"") forState:UIControlStateNormal];
else
[self.openButton setTitle:NSLocalizedString(@"BUTTON_OPEN", @"") forState:UIControlStateNormal];
[self.privateModeLabel setText:NSLocalizedString(@"PRIVATE_PLAYBACK_TOGGLE", @"")];
self.title = NSLocalizedString(@"OPEN_NETWORK", @"");
self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
......
VLC for iOS.xcodeproj/project.pbxproj
View file @ 6d337afa
......@@ -222,6 +222,7 @@
7D897877185DEF79009BAB5D /* repeatOne@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D897873185DEF79009BAB5D /* repeatOne@2x.png */; };
7D89787A185DEFB5009BAB5D /* flatDeleteButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D897878185DEFB5009BAB5D /* flatDeleteButton.png */; };
7D89787B185DEFB5009BAB5D /* flatDeleteButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D897879185DEFB5009BAB5D /* flatDeleteButton@2x.png */; };
7D89787D185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */; };
7D94FCDF16DE7D1000F2623B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCDE16DE7D1000F2623B /* UIKit.framework */; };
7D94FCE116DE7D1000F2623B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE016DE7D1000F2623B /* Foundation.framework */; };
7D94FCE316DE7D1000F2623B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE216DE7D1000F2623B /* CoreGraphics.framework */; };
......@@ -695,6 +696,7 @@
7D897873185DEF79009BAB5D /* repeatOne@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "repeatOne@2x.png"; sourceTree = "<group>"; };
7D897878185DEFB5009BAB5D /* flatDeleteButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = flatDeleteButton.png; sourceTree = "<group>"; };
7D897879185DEFB5009BAB5D /* flatDeleteButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "flatDeleteButton@2x.png"; sourceTree = "<group>"; };
7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFutureOpenNetworkStreamViewController.xib; path = Resources/VLCFutureOpenNetworkStreamViewController.xib; sourceTree = SOURCE_ROOT; };
7D94FCDB16DE7D1000F2623B /* VLC for iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VLC for iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7D94FCDE16DE7D1000F2623B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
7D94FCE016DE7D1000F2623B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
......@@ -1531,7 +1533,6 @@
7DADC55C1704FAA8001DAC63 /* XIBs */ = {
isa = PBXGroup;
children = (
9B9231C3185A703700F89498 /* VLCFutureNetworkLoginViewController.xib */,
7DBBF183183AB4300009A339 /* VLCAboutViewController~ipad.xib */,
7DBBF184183AB4300009A339 /* VLCAboutViewController~iphone.xib */,
7DBBF185183AB4300009A339 /* VLCCloudStorageTableViewCell~ipad.xib */,
......@@ -1548,7 +1549,9 @@
7DBBF190183AB4300009A339 /* VLCMovieViewController~ipad.xib */,
7DBBF191183AB4300009A339 /* VLCMovieViewController~iphone.xib */,
7DBBF192183AB4300009A339 /* VLCNetworkLoginViewController.xib */,
9B9231C3185A703700F89498 /* VLCFutureNetworkLoginViewController.xib */,
7DBBF193183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib */,
7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */,
7DBBF194183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */,
7DBBF196183AB4300009A339 /* VLCPlaylistTableViewCell.xib */,
7DBBF197183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib */,
......@@ -2035,6 +2038,7 @@
7DEB3B7A1764A4040038FC70 /* input.png in Resources */,
7DBBF198183AB4300009A339 /* VLCAboutViewController~ipad.xib in Resources */,
7DBBF1A6183AB4300009A339 /* VLCMovieViewController~iphone.xib in Resources */,
7D89787D185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib in Resources */,
7DEB3B851764A4F40038FC70 /* movie@2x.png in Resources */,
7DEB3B861764A4F40038FC70 /* movie@4x.png in Resources */,
7DEB3B871764A4F40038FC70 /* blank@4x.png in Resources */,
......
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