Skip to content

VLC-iOS
VLC-iOS
Commit d0091efa authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

Deploy new cloud icons

parent d704743d
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 10 deletions
Resources/VLCCloudServiceCell.xib
View file @ d0091efa
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6221" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6213"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
......@@ -29,8 +29,8 @@
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="749" verticalHuggingPriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="k9V-qn-xQh">
<rect key="frame" x="13" y="13" width="40" height="39.5"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="749" verticalHuggingPriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="k9V-qn-xQh">
<rect key="frame" x="13" y="13" width="40" height="40"/>
<constraints>
<constraint firstAttribute="width" secondItem="k9V-qn-xQh" secondAttribute="height" multiplier="1:1" id="G4X-8T-SgW"/>
<constraint firstAttribute="width" constant="40" id="b0z-Gv-5yY"/>
......@@ -41,9 +41,21 @@
</mask>
</variation>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gJ0-bA-ThN" userLabel="lonesome ServiceName">
<rect key="frame" x="61" y="19" width="251" height="27"/>
<constraints>
<constraint firstAttribute="height" constant="27" id="VkC-Mm-ohS"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="gJ0-bA-ThN" firstAttribute="leading" secondItem="O6V-Qc-Q8x" secondAttribute="leading" id="3Mg-Bn-j8m"/>
<constraint firstItem="gJ0-bA-ThN" firstAttribute="trailing" secondItem="O6V-Qc-Q8x" secondAttribute="trailing" id="6kW-bx-7Rl"/>
<constraint firstAttribute="bottomMargin" secondItem="k9V-qn-xQh" secondAttribute="bottom" constant="5" id="9mT-Ig-oz7"/>
<constraint firstAttribute="centerY" secondItem="gJ0-bA-ThN" secondAttribute="centerY" id="Bjq-5d-DS8"/>
<constraint firstAttribute="trailingMargin" secondItem="O6V-Qc-Q8x" secondAttribute="trailing" id="DGs-Ef-HwX"/>
<constraint firstItem="O6V-Qc-Q8x" firstAttribute="top" secondItem="P7G-Z3-wQa" secondAttribute="topMargin" id="P7b-lX-3qH"/>
<constraint firstItem="k9V-qn-xQh" firstAttribute="leading" secondItem="P7G-Z3-wQa" secondAttribute="leadingMargin" constant="5" id="bjd-BQ-kB6"/>
......@@ -58,6 +70,7 @@
<outlet property="cloudInformation" destination="NEp-19-omb" id="pWE-Kp-d7k"/>
<outlet property="cloudTitle" destination="O6V-Qc-Q8x" id="6Oe-Xb-nFb"/>
<outlet property="icon" destination="k9V-qn-xQh" id="5Bh-XZ-Kkl"/>
<outlet property="lonesomeCloudTitle" destination="gJ0-bA-ThN" id="dBN-TO-v3j"/>
</connections>
<point key="canvasLocation" x="358" y="253"/>
</tableViewCell>
......
Sources/VLCCloudServiceCell.h
View file @ d0091efa
......@@ -17,5 +17,6 @@
@property(nonatomic) IBOutlet UIImageView *icon;
@property(nonatomic) IBOutlet UILabel *cloudTitle;
@property(nonatomic) IBOutlet UILabel *cloudInformation;
@property(nonatomic) IBOutlet UILabel *lonesomeCloudTitle;
@end
Sources/VLCCloudServicesTableViewController.m
View file @ d0091efa
......@@ -106,6 +106,7 @@
cell.icon.image = [UIImage imageNamed:@"Dropbox"];
cell.cloudTitle.text = @"Dropbox";
cell.cloudInformation.text = isAuthorized ? NSLocalizedString(@"LOGGED_IN", "") : NSLocalizedString(@"LOGIN", "");
cell.lonesomeCloudTitle.text = @"";
break;
}
case 1: {
......@@ -114,6 +115,7 @@
cell.icon.image = [UIImage imageNamed:@"Drive"];
cell.cloudTitle.text = @"Google Drive";
cell.cloudInformation.text = isAuthorized ? NSLocalizedString(@"LOGGED_IN", "") : NSLocalizedString(@"LOGIN", "");
cell.lonesomeCloudTitle.text = @"";
break;
}
case 2: {
......@@ -122,6 +124,7 @@
cell.icon.image = [UIImage imageNamed:@"Box"];
cell.cloudTitle.text = @"Box";
cell.cloudInformation.text = isAuthorized ? NSLocalizedString(@"LOGGED_IN", "") : NSLocalizedString(@"LOGIN", "");
cell.lonesomeCloudTitle.text = @"";
break;
}
case 3: {
......@@ -130,17 +133,19 @@
cell.icon.image = [UIImage imageNamed:@"OneDrive"];
cell.cloudTitle.text = @"OneDrive";
cell.cloudInformation.text = isAuthorized ? NSLocalizedString(@"LOGGED_IN", "") : NSLocalizedString(@"LOGIN", "");
cell.lonesomeCloudTitle.text = @"";
break;
}
case 4:
//Cloud Drives
cell.icon.image = [UIImage imageNamed:@"CloudDrives"];
cell.cloudTitle.text = @"Cloud Drives";
cell.cloudInformation.text = @"";
cell.icon.image = [UIImage imageNamed:@"iCloud"];
cell.lonesomeCloudTitle.text = NSLocalizedString(@"CLOUD_SERVICES", nil);
cell.cloudTitle.text = cell.cloudInformation.text = @"";
break;
default:
break;
}
// cell.icon.contentMode = UIViewContentModeScaleAspectFit;
return cell;
}
......
Sources/VLCMenuTableViewController.m
View file @ d0091efa
......@@ -212,9 +212,8 @@
_uploadLocationLabel = [(VLCWiFiUploadTableViewCell*)cell uploadAddressLabel];
_uploadButton = [(VLCWiFiUploadTableViewCell*)cell serverOnButton];
[_uploadButton addTarget:self action:@selector(toggleHTTPServer:) forControlEvents:UIControlEventTouchUpInside];
} else if ([rawTitle isEqualToString:@"CLOUD_SERVICES"]) {
cell.imageView.image = [UIImage imageNamed:@"CloudServices"];
}
} else if ([rawTitle isEqualToString:@"CLOUD_SERVICES"])
cell.imageView.image = [UIImage imageNamed:@"iCloudIcon"];
} else if (section == 2) {
if ([rawTitle isEqualToString:@"Settings"])
cell.imageView.image = [UIImage imageNamed:@"Settings"];
......
VLC for iOS.xcodeproj/project.pbxproj
View file @ d0091efa
......@@ -387,6 +387,15 @@
7DBBF1AC183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF197183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib */; };
7DBC85631A50B8860098D388 /* LiveAuthDialog_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBC85611A50B8860098D388 /* LiveAuthDialog_iPad.xib */; };
7DBC85641A50B8860098D388 /* LiveAuthDialog_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBC85621A50B8860098D388 /* LiveAuthDialog_iPhone.xib */; };
7DBD8D961AB0B47A00860FA7 /* iCloud@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D901AB0B47A00860FA7 /* iCloud@3x.png */; };
7DBD8D971AB0B47A00860FA7 /* iCloud.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D911AB0B47A00860FA7 /* iCloud.png */; };
7DBD8D981AB0B47A00860FA7 /* iCloud@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D921AB0B47A00860FA7 /* iCloud@2x.png */; };
7DBD8D991AB0B47A00860FA7 /* Box@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D931AB0B47A00860FA7 /* Box@3x.png */; };
7DBD8D9A1AB0B47A00860FA7 /* Box@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D941AB0B47A00860FA7 /* Box@2x.png */; };
7DBD8D9B1AB0B47A00860FA7 /* Box.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D951AB0B47A00860FA7 /* Box.png */; };
7DBD8D9F1AB0B66F00860FA7 /* iCloudIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D9C1AB0B66F00860FA7 /* iCloudIcon@3x.png */; };
7DBD8DA01AB0B66F00860FA7 /* iCloudIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D9D1AB0B66F00860FA7 /* iCloudIcon.png */; };
7DBD8DA11AB0B66F00860FA7 /* iCloudIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DBD8D9E1AB0B66F00860FA7 /* iCloudIcon@2x.png */; };
7DC0C0551A4D78A4000EE359 /* DropboxSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DC0C0541A4D78A4000EE359 /* DropboxSDK.framework */; };
7DC19ADF1868C7BB00810BF7 /* VLCFirstStepsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC19ADD1868C7BB00810BF7 /* VLCFirstStepsViewController.m */; };
7DC19AE41868C8EC00810BF7 /* VLCFirstStepsFirstPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC19AE21868C8EC00810BF7 /* VLCFirstStepsFirstPageViewController.m */; };
......@@ -1211,6 +1220,15 @@
7DBBF197183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCWiFiUploadTableViewCell.xib; path = Resources/VLCWiFiUploadTableViewCell.xib; sourceTree = SOURCE_ROOT; };
7DBC85611A50B8860098D388 /* LiveAuthDialog_iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LiveAuthDialog_iPad.xib; path = ImportedSources/OneDrive/src/LiveSDK/Library/Internal/LiveAuthDialog_iPad.xib; sourceTree = SOURCE_ROOT; };
7DBC85621A50B8860098D388 /* LiveAuthDialog_iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LiveAuthDialog_iPhone.xib; path = ImportedSources/OneDrive/src/LiveSDK/Library/Internal/LiveAuthDialog_iPhone.xib; sourceTree = SOURCE_ROOT; };
7DBD8D901AB0B47A00860FA7 /* iCloud@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iCloud@3x.png"; sourceTree = "<group>"; };
7DBD8D911AB0B47A00860FA7 /* iCloud.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iCloud.png; sourceTree = "<group>"; };
7DBD8D921AB0B47A00860FA7 /* iCloud@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iCloud@2x.png"; sourceTree = "<group>"; };
7DBD8D931AB0B47A00860FA7 /* Box@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Box@3x.png"; sourceTree = "<group>"; };
7DBD8D941AB0B47A00860FA7 /* Box@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Box@2x.png"; sourceTree = "<group>"; };
7DBD8D951AB0B47A00860FA7 /* Box.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Box.png; sourceTree = "<group>"; };
7DBD8D9C1AB0B66F00860FA7 /* iCloudIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iCloudIcon@3x.png"; sourceTree = "<group>"; };
7DBD8D9D1AB0B66F00860FA7 /* iCloudIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iCloudIcon.png; sourceTree = "<group>"; };
7DBD8D9E1AB0B66F00860FA7 /* iCloudIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iCloudIcon@2x.png"; sourceTree = "<group>"; };
7DC0C0541A4D78A4000EE359 /* DropboxSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DropboxSDK.framework; path = ImportedSources/Dropbox/DropboxSDK.framework; sourceTree = "<group>"; };
7DC19ADC1868C7BB00810BF7 /* VLCFirstStepsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCFirstStepsViewController.h; path = Sources/VLCFirstStepsViewController.h; sourceTree = SOURCE_ROOT; };
7DC19ADD1868C7BB00810BF7 /* VLCFirstStepsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCFirstStepsViewController.m; path = Sources/VLCFirstStepsViewController.m; sourceTree = SOURCE_ROOT; };
......@@ -2365,6 +2383,9 @@
7DBC3B3C1711DD1E00DCF688 /* Icons */ = {
isa = PBXGroup;
children = (
7DBD8D9C1AB0B66F00860FA7 /* iCloudIcon@3x.png */,
7DBD8D9D1AB0B66F00860FA7 /* iCloudIcon.png */,
7DBD8D9E1AB0B66F00860FA7 /* iCloudIcon@2x.png */,
8F91EC7A195DF9D200F5BCBA /* OpenInActivityIcon.png */,
8F91EC7B195DF9D200F5BCBA /* OpenInActivityIcon@2x.png */,
7D6B08C0174A831900A05173 /* vlc-xmas.png */,
......@@ -2550,6 +2571,12 @@
260B41D91A75006300DA89C9 /* OneDriveWhite.png */,
260B41DA1A75006300DA89C9 /* OneDriveWhite@2x.png */,
260B41DB1A75006300DA89C9 /* OneDriveWhite@3x.png */,
7DBD8D901AB0B47A00860FA7 /* iCloud@3x.png */,
7DBD8D911AB0B47A00860FA7 /* iCloud.png */,
7DBD8D921AB0B47A00860FA7 /* iCloud@2x.png */,
7DBD8D931AB0B47A00860FA7 /* Box@3x.png */,
7DBD8D941AB0B47A00860FA7 /* Box@2x.png */,
7DBD8D951AB0B47A00860FA7 /* Box.png */,
7D713955186B197800D54EDA /* darkButton.png */,
7D713956186B197800D54EDA /* darkButton@2x.png */,
7D713957186B197800D54EDA /* darkButtonHighlight.png */,
......@@ -2889,6 +2916,7 @@
A79246C8170F11DF0036AAF2 /* Localizable.strings in Resources */,
A7CB0DB11716F72600050CF3 /* PlayingExternally@2x~iphone.png in Resources */,
7D9870381A3DED48009CF27D /* audioTrackIcon@3x.png in Resources */,
7DBD8D9A1AB0B47A00860FA7 /* Box@2x.png in Resources */,
7D71395C186B197800D54EDA /* darkButtonHighlight@2x.png in Resources */,
A7CB0DB21716F72600050CF3 /* PlayingExternally~iphone.png in Resources */,
9B9231C4185A703700F89498 /* VLCFutureNetworkLoginViewController.xib in Resources */,
......@@ -2941,6 +2969,7 @@
7D278D6F18E9D6750063E109 /* tvShow@2x~ipad.png in Resources */,
7DFC38CB1A45F0E4002476CB /* tableViewIcon@3x.png in Resources */,
7DBBF1A7183AB4300009A339 /* VLCNetworkLoginViewController.xib in Resources */,
7DBD8D971AB0B47A00860FA7 /* iCloud.png in Resources */,
7D9870661A3E03D5009CF27D /* papasscode_failed_bg.png in Resources */,
7D27EC0C19DF30CB00EF0370 /* connector-cable@2x.png in Resources */,
7D07F726175688D300CDE21C /* doneButton.png in Resources */,
......@@ -2959,6 +2988,7 @@
7D98705A1A3DEE88009CF27D /* TVBroadcastIcon@3x.png in Resources */,
7D12765A1AAD9D9A00F0260C /* lock@3x.png in Resources */,
7D27EC2019DF30CB00EF0370 /* uploadarrow.png in Resources */,
7DBD8D9F1AB0B66F00860FA7 /* iCloudIcon@3x.png in Resources */,
7D32B384185E293D006CA474 /* Raleway.woff in Resources */,
7D9870521A3DEE30009CF27D /* AllFiles@3x.png in Resources */,
49CC60B6195F4F3F00ACB586 /* TVBroadcastIcon~ipad.png in Resources */,
......@@ -3016,6 +3046,7 @@
7D47D70A1760CD8700E86BAD /* playbackDoneButton@2x.png in Resources */,
493B1A21195D0EBE000A491A /* TVBroadcastIcon.png in Resources */,
7DF3B78B19DF01550041A02E /* fsarrow-volume.png in Resources */,
7DBD8D981AB0B47A00860FA7 /* iCloud@2x.png in Resources */,
7D47D70B1760CD8700E86BAD /* playbackDoneButtonHighlight.png in Resources */,
7D897874185DEF79009BAB5D /* repeat.png in Resources */,
7D47D70C1760CD8700E86BAD /* playbackDoneButtonHighlight@2x.png in Resources */,
......@@ -3045,6 +3076,7 @@
7D98703E1A3DEDB9009CF27D /* PlexServerIcon@3x.png in Resources */,
7D47D71D1760CD8700E86BAD /* audioTrackIcon@2x.png in Resources */,
41F475D41899A438001B919F /* folderIcon@2x~ipad.png in Resources */,
7DBD8DA01AB0B66F00860FA7 /* iCloudIcon.png in Resources */,
7D98702A1A3DECD1009CF27D /* ratioIcon@3x.png in Resources */,
7D98704C1A3DEE0B009CF27D /* Local@3x.png in Resources */,
7D47D7201760CD8700E86BAD /* ballSlider.png in Resources */,
......@@ -3100,6 +3132,7 @@
7D98703A1A3DED4F009CF27D /* resetIcon@3x.png in Resources */,
7DBBF1A5183AB4300009A339 /* VLCMovieViewController~ipad.xib in Resources */,
26F1BFD01A770408001DF30C /* libMediaVLC.xml in Resources */,
7DBD8D9B1AB0B47A00860FA7 /* Box.png in Resources */,
7DEB3B7517649F2C0038FC70 /* menuButton.png in Resources */,
7DEB3B7617649F2C0038FC70 /* menuButton@2x.png in Resources */,
7DEB3B791764A4040038FC70 /* input@2x.png in Resources */,
......@@ -3132,6 +3165,7 @@
7D223E1B181EC56E00B36798 /* gradient-cell-ios7-ipad@2x.png in Resources */,
7AC8629D1765DC560011611A /* style.css in Resources */,
7DF3B78319DF01550041A02E /* fsarrow-speed@2x.png in Resources */,
7DBD8D961AB0B47A00860FA7 /* iCloud@3x.png in Resources */,
7DF1166C176CC69A009EC05C /* volumeballslider.png in Resources */,
7D27EC1F19DF30CB00EF0370 /* sidebar@3x.png in Resources */,
7D27EC1B19DF30CB00EF0370 /* sidebar-cutout@2x.png in Resources */,
......@@ -3177,9 +3211,11 @@
7D0699DA17CB1FAE00713BEB /* WifiUp@2x.png in Resources */,
7DF04F4F1961F2B8004A5429 /* web-open-fixed.png in Resources */,
260B41DC1A75006300DA89C9 /* OneDrive.png in Resources */,
7DBD8DA11AB0B66F00860FA7 /* iCloudIcon@2x.png in Resources */,
7DF3B77B19DF01550041A02E /* fsarrow-effects@3x.png in Resources */,
7D713959186B197800D54EDA /* darkButton.png in Resources */,
7D0699DB17CB1FAE00713BEB /* WifiUpOn.png in Resources */,
7DBD8D991AB0B47A00860FA7 /* Box@3x.png in Resources */,
7D0699DC17CB1FAE00713BEB /* WifiUpOn@2x.png in Resources */,
260B41DF1A75006300DA89C9 /* OneDriveWhite.png in Resources */,
7D0699DD17CB1FAE00713BEB /* Dropbox@2x.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