diff --git a/NEWS b/NEWS index 587eb8236549a74228ec32298b3a2fbf513b1731..b79dfce1b8b2f2190a35f6d96499e1c99a859ba5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +2.7.0: +------ +* Dropped support for iOS 6.1. VLC requires iOS 7.0 now + 2.6.0: ------ * Added support for Apple Watch - control VLC from your watch! diff --git a/PAPasscode/PAPasscodeViewController.m b/PAPasscode/PAPasscodeViewController.m index 6898cb863edcaffac26776544de9649d79a0c62d..9aa75126e44f060b358217d2eb3c00fb382df095 100644 --- a/PAPasscode/PAPasscodeViewController.m +++ b/PAPasscode/PAPasscodeViewController.m @@ -93,15 +93,9 @@ UINavigationBar *navigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, view.bounds.size.width, NAVBAR_HEIGHT)]; navigationBar.autoresizingMask = UIViewAutoresizingFlexibleWidth; navigationBar.items = @[self.navigationItem]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - navigationBar.barTintColor = [UIColor VLCOrangeTintColor]; - navigationBar.tintColor = [UIColor whiteColor]; - navigationBar.titleTextAttributes = @{ UITextAttributeTextColor : [UIColor whiteColor] }; - } else { - [navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault]; - navigationBar.translucent = NO; - navigationBar.opaque = YES; - } + navigationBar.barTintColor = [UIColor VLCOrangeTintColor]; + navigationBar.tintColor = [UIColor whiteColor]; + navigationBar.titleTextAttributes = @{ UITextAttributeTextColor : [UIColor whiteColor] }; [view addSubview:navigationBar]; contentView = [[UIView alloc] initWithFrame:CGRectMake(0, NAVBAR_HEIGHT, view.bounds.size.width, view.bounds.size.height-NAVBAR_HEIGHT)]; diff --git a/Podfile.lock b/Podfile.lock index 75eb8e84123f021f3f375c2811de36a49e2c218a..2663af3f8f1f9b8e358ad8c6f5258b180e151f26 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -38,4 +38,4 @@ SPEC CHECKSUMS: SSKeychain: 88767e903ee8d274ed380e364d96b7a101235286 upnpx: 40e4cc7bf8f71f086264cc82cfefc8e47a3f0241 -COCOAPODS: 0.37.1 +COCOAPODS: 0.37.2 diff --git a/Resources/VLCCloudStorageTableViewController.xib b/Resources/VLCCloudStorageTableViewController.xib index cd320230533dbe0b2a67784ebf324076933f0525..dc6d7b14c1158af6522cbbfc95a668dad7ce7c0d 100644 --- a/Resources/VLCCloudStorageTableViewController.xib +++ b/Resources/VLCCloudStorageTableViewController.xib @@ -1,15 +1,14 @@ - + - + - @@ -59,16 +58,6 @@ - diff --git a/Resources/VLCDownloadViewController.xib b/Resources/VLCDownloadViewController.xib index 3167f3fe40884ea974e3149071f279b9e06dea96..9cbbd75029fe862629bf503dd69cb07f5e4973c2 100644 --- a/Resources/VLCDownloadViewController.xib +++ b/Resources/VLCDownloadViewController.xib @@ -1,9 +1,8 @@ - + - - + @@ -11,14 +10,14 @@ - + - + - + @@ -29,46 +28,43 @@ - + - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCFutureNetworkLoginViewController.xib b/Resources/VLCFutureNetworkLoginViewController.xib deleted file mode 100644 index d14dea3137d875a54dc32901ddb13781ddafe705..0000000000000000000000000000000000000000 --- a/Resources/VLCFutureNetworkLoginViewController.xib +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCFutureOpenNetworkStreamViewController.xib b/Resources/VLCFutureOpenNetworkStreamViewController.xib deleted file mode 100644 index fad3c1f19e220ba951c023c6c14a3afb09be79cd..0000000000000000000000000000000000000000 --- a/Resources/VLCFutureOpenNetworkStreamViewController.xib +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCFuturePlaylistCollectionViewCell.xib b/Resources/VLCFuturePlaylistCollectionViewCell.xib deleted file mode 100644 index 0275e9281ff35c174cb68f2b8db67988bd95fcec..0000000000000000000000000000000000000000 --- a/Resources/VLCFuturePlaylistCollectionViewCell.xib +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCFuturePlaylistTableViewCell.xib b/Resources/VLCFuturePlaylistTableViewCell.xib deleted file mode 100644 index 1e74075329bb4cce2d0ca3d3fd524ec3c974ad6a..0000000000000000000000000000000000000000 --- a/Resources/VLCFuturePlaylistTableViewCell.xib +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCFuturePlexConnectServerViewController.xib b/Resources/VLCFuturePlexConnectServerViewController.xib deleted file mode 100644 index af1c7fcbf0b0ed4716ecaffe81c648d4ad26bf73..0000000000000000000000000000000000000000 --- a/Resources/VLCFuturePlexConnectServerViewController.xib +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/VLCNetworkLoginViewController.xib b/Resources/VLCNetworkLoginViewController.xib index 7af357daf0022ef5ac469a018ab8e63e0072be82..28828e248ddac04e20fa339b719b932074f50019 100644 --- a/Resources/VLCNetworkLoginViewController.xib +++ b/Resources/VLCNetworkLoginViewController.xib @@ -1,125 +1,48 @@ - + - + - + - + - - + - - + - - + + - - - - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + @@ -127,13 +50,56 @@ + + + + + + + + + + + + + + + + + + + - + - - - - + + + + + diff --git a/Resources/VLCOpenNetworkStreamViewController.xib b/Resources/VLCOpenNetworkStreamViewController.xib index df47c5c2a9f121d3c38a0f065308f6dd2a74948e..5004b47401bef926bde095ba15226aaf520c698d 100644 --- a/Resources/VLCOpenNetworkStreamViewController.xib +++ b/Resources/VLCOpenNetworkStreamViewController.xib @@ -1,20 +1,20 @@ - + - + - + - - + + - + - + @@ -25,53 +25,49 @@ - + - - - - - - - + + + + + + + + + - - + - + - + - - - + + - - + + - + - - - - + + @@ -118,8 +112,9 @@ - - - - + + + + + diff --git a/Resources/VLCPlaylistCollectionViewCell.xib b/Resources/VLCPlaylistCollectionViewCell.xib index 1a02a598dc6def1b79834ff005fa6146968de93c..fcdc7ad4f4b2caeaf997bbc5508dc3850b16d986 100644 --- a/Resources/VLCPlaylistCollectionViewCell.xib +++ b/Resources/VLCPlaylistCollectionViewCell.xib @@ -1,82 +1,91 @@ - + - + - + - + - + - + - + - + - - - - - + + + + + - + - - + - + + + + + + diff --git a/Resources/VLCPlaylistTableViewCell.xib b/Resources/VLCPlaylistTableViewCell.xib index 77af99549c3eeda7e3a833614f3eca3381992ed2..5c18d4bc8a0f352f4fd17ee02ebba1dbdfb00f13 100644 --- a/Resources/VLCPlaylistTableViewCell.xib +++ b/Resources/VLCPlaylistTableViewCell.xib @@ -1,65 +1,71 @@ - + - + - + - - + + - - + + - - + + - - - - + + + @@ -67,9 +73,8 @@ Title 2 - - + diff --git a/Resources/VLCPlexConnectServerViewController.xib b/Resources/VLCPlexConnectServerViewController.xib index 97bd3f4bd0feb37a165b4dbe6df80bc0c4c2f3ba..861ebbd6e55dade65104822fa8e655b7a7d2ab8a 100644 --- a/Resources/VLCPlexConnectServerViewController.xib +++ b/Resources/VLCPlexConnectServerViewController.xib @@ -1,117 +1,117 @@ - + - + - - - - - - - - + + + + + + + + + + + - + - - - + + + - - - + + + + + + - + - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - + + - - - - diff --git a/Resources/VLCPlexMediaInformationViewController.xib b/Resources/VLCPlexMediaInformationViewController.xib deleted file mode 100644 index f107bbdc634b6df0074b2952024d318b0272f492..0000000000000000000000000000000000000000 --- a/Resources/VLCPlexMediaInformationViewController.xib +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/UIBarButtonItem+Theme.m b/Sources/UIBarButtonItem+Theme.m index bd8adf1463b08000133bc475fb125549a9af5270..1bfb3f96610ae01608b000e1dae9386f29e4135b 100644 --- a/Sources/UIBarButtonItem+Theme.m +++ b/Sources/UIBarButtonItem+Theme.m @@ -19,16 +19,7 @@ style:UIBarButtonItemStyleBordered target:target action:selector]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - backButton.tintColor = [UIColor whiteColor]; - else { - [backButton setBackgroundImage:[[UIImage imageNamed:@"backButton"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 12, 0, 6)] - forState:UIControlStateNormal - barMetrics:UIBarMetricsDefault]; - [backButton setBackgroundImage:[[UIImage imageNamed:@"backButtonHighlight"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 12, 0, 6)] - forState:UIControlStateHighlighted - barMetrics:UIBarMetricsDefault]; - } + backButton.tintColor = [UIColor whiteColor]; [backButton setTitleTextAttributes:@{UITextAttributeTextShadowColor : [UIColor colorWithWhite:0. alpha:.37], UITextAttributeTextColor : [UIColor whiteColor]} forState:UIControlStateNormal]; [backButton setTitlePositionAdjustment:UIOffsetMake(3, 0) forBarMetrics:UIBarMetricsDefault]; return backButton; @@ -51,12 +42,7 @@ icon = [UIImage imageNamed:@"menuCone"]; UIBarButtonItem *menuButton = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStyleBordered target:target action:selector]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - menuButton.tintColor = [UIColor whiteColor]; - else { - [menuButton setBackgroundImage:[UIImage imageNamed:@"button"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [menuButton setBackgroundImage:[UIImage imageNamed:@"buttonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault]; - } + menuButton.tintColor = [UIColor whiteColor]; menuButton.accessibilityLabel = NSLocalizedString(@"OPEN_VLC_MENU", nil); menuButton.isAccessibilityElement = YES; @@ -66,12 +52,7 @@ + (UIBarButtonItem *)themedDarkToolbarButtonWithTitle:(NSString*)title target:(id)target andSelector:(SEL)selector { UIBarButtonItem *button = [[UIBarButtonItem alloc] initWithTitle:title style:UIBarButtonItemStyleBordered target:target action:selector]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - button.tintColor = [UIColor whiteColor]; - else { - [button setBackgroundImage:[[UIImage imageNamed:@"darkButton"] resizableImageWithCapInsets:UIEdgeInsetsMake(5, 5, 5, 5)] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [button setBackgroundImage:[[UIImage imageNamed:@"darkButtonHighlight"] resizableImageWithCapInsets:UIEdgeInsetsMake(5, 5, 5, 5)] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - } + button.tintColor = [UIColor whiteColor]; return button; } diff --git a/Sources/VLC for iOS-Prefix.pch b/Sources/VLC for iOS-Prefix.pch index d89aecd8c9a17eef3f03208e821033aafc516930..d2905259ceeacbb5c4207d91465415c44b5eb028 100644 --- a/Sources/VLC for iOS-Prefix.pch +++ b/Sources/VLC for iOS-Prefix.pch @@ -31,8 +31,6 @@ #define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending) -#define SYSTEM_RUNS_IOS7_OR_LATER SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0") - #define SYSTEM_RUNS_IOS8_OR_LATER SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0") #define SYSTEM_RUNS_IOS82_OR_LATER SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.2") diff --git a/Sources/VLCAboutViewController.m b/Sources/VLCAboutViewController.m index a19ce9d9b78312422e3318538562b1b74624e39d..c3b3ee9ffa0c3975738615b3ef26e1582e55ff22 100644 --- a/Sources/VLCAboutViewController.m +++ b/Sources/VLCAboutViewController.m @@ -47,12 +47,7 @@ self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"title"]]; UIBarButtonItem *contributeButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_CONTRIBUTE", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(openContributePage:)]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - contributeButton.tintColor = [UIColor whiteColor]; - else { - [contributeButton setBackgroundImage:[UIImage imageNamed:@"button"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [contributeButton setBackgroundImage:[UIImage imageNamed:@"buttonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault]; - } + contributeButton.tintColor = [UIColor whiteColor]; self.navigationItem.rightBarButtonItem = contributeButton; self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)]; diff --git a/Sources/VLCAppDelegate.m b/Sources/VLCAppDelegate.m index e73f4df113050daf108ca8d55506bef410b0b9ed..6f11ac4e36329be4476b0a521dcaffcd228e53a5 100644 --- a/Sources/VLCAppDelegate.m +++ b/Sources/VLCAppDelegate.m @@ -102,16 +102,14 @@ NSString *const VLCDropboxSessionWasAuthorized = @"VLCDropboxSessionWasAuthorize [hockeyManager startManager]; [hockeyManager.authenticator authenticateInstallation]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - // Change the keyboard for UISearchBar - [[UITextField appearance] setKeyboardAppearance:UIKeyboardAppearanceDark]; - // For the cursor - [[UITextField appearance] setTintColor:[UIColor VLCOrangeTintColor]]; - // Don't override the 'Cancel' button color in the search bar with the previous UITextField call. Use the default blue color - [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0]} forState:UIControlStateNormal]; - // For the edit selection indicators - [[UITableView appearance] setTintColor:[UIColor VLCOrangeTintColor]]; - } + // Change the keyboard for UISearchBar + [[UITextField appearance] setKeyboardAppearance:UIKeyboardAppearanceDark]; + // For the cursor + [[UITextField appearance] setTintColor:[UIColor VLCOrangeTintColor]]; + // Don't override the 'Cancel' button color in the search bar with the previous UITextField call. Use the default blue color + [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0]} forState:UIControlStateNormal]; + // For the edit selection indicators + [[UITableView appearance] setTintColor:[UIColor VLCOrangeTintColor]]; [[UISwitch appearance] setOnTintColor:[UIColor VLCOrangeTintColor]]; @@ -349,12 +347,8 @@ continueUserActivity:(NSUserActivity *)userActivity - (VLCDownloadViewController *)downloadViewController { - if (_downloadViewController == nil) { - if (SYSTEM_RUNS_IOS7_OR_LATER) - _downloadViewController = [[VLCDownloadViewController alloc] initWithNibName:@"VLCFutureDownloadViewController" bundle:nil]; - else - _downloadViewController = [[VLCDownloadViewController alloc] initWithNibName:@"VLCDownloadViewController" bundle:nil]; - } + if (_downloadViewController == nil) + _downloadViewController = [[VLCDownloadViewController alloc] initWithNibName:@"VLCDownloadViewController" bundle:nil]; return _downloadViewController; } diff --git a/Sources/VLCCloudStorageTableViewController.h b/Sources/VLCCloudStorageTableViewController.h index 00ee5548a5ef5c97d6e60b1d23a793309c47ad5d..5975100f18f4f0dd810d9dc5d46026c6c96fc35a 100644 --- a/Sources/VLCCloudStorageTableViewController.h +++ b/Sources/VLCCloudStorageTableViewController.h @@ -20,7 +20,6 @@ @property (nonatomic, strong) IBOutlet UITableView *tableView; @property (nonatomic, strong) IBOutlet UIView *loginToCloudStorageView; @property (nonatomic, strong) IBOutlet UIButton *loginButton; -@property (nonatomic, strong) IBOutlet UIButton *flatLoginButton; @property (nonatomic, strong) IBOutlet UIImageView *cloudStorageLogo; @property (nonatomic, strong) UIBarButtonItem *numberOfFilesBarButtonItem; diff --git a/Sources/VLCCloudStorageTableViewController.m b/Sources/VLCCloudStorageTableViewController.m index 0589a6d2a4128f3dc79ec386a3491f558a419cc9..11979b5d1c6291b386d0fccf2112ca51234015be 100644 --- a/Sources/VLCCloudStorageTableViewController.m +++ b/Sources/VLCCloudStorageTableViewController.m @@ -41,13 +41,7 @@ _logoutButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BUTTON_LOGOUT", "") style:UIBarButtonItemStyleBordered target:self action:@selector(logout)]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - self.flatLoginButton.hidden = YES; - [self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal]; - } else { - self.loginButton.hidden = YES; - [self.flatLoginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal]; - } + [self.loginButton setTitle:NSLocalizedString(@"DROPBOX_LOGIN", nil) forState:UIControlStateNormal]; [self.navigationController.toolbar setBackgroundImage:[UIImage imageNamed:@"sudHeaderBg"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; diff --git a/Sources/VLCDownloadViewController.m b/Sources/VLCDownloadViewController.m index bf2b3ae73bbf5f00e677113b8dd9af5fe90ee106..7016f39a308d31480ac37beabcea5b582e30fd07 100644 --- a/Sources/VLCDownloadViewController.m +++ b/Sources/VLCDownloadViewController.m @@ -56,10 +56,8 @@ { [super viewDidLoad]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - NSAttributedString *coloredAttributedPlaceholder = [[NSAttributedString alloc] initWithString:@"http://myserver.com/file.mkv" attributes:@{NSForegroundColorAttributeName: [UIColor VLCLightTextColor]}]; - self.urlField.attributedPlaceholder = coloredAttributedPlaceholder; - } + NSAttributedString *coloredAttributedPlaceholder = [[NSAttributedString alloc] initWithString:@"http://myserver.com/file.mkv" attributes:@{NSForegroundColorAttributeName: [UIColor VLCLightTextColor]}]; + self.urlField.attributedPlaceholder = coloredAttributedPlaceholder; [self.downloadButton setTitle:NSLocalizedString(@"BUTTON_DOWNLOAD", nil) forState:UIControlStateNormal]; self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)]; @@ -70,8 +68,7 @@ self.progressContainer.hidden = YES; self.downloadsTable.hidden = YES; - if (SYSTEM_RUNS_IOS7_OR_LATER) - self.edgesForExtendedLayout = UIRectEdgeNone; + self.edgesForExtendedLayout = UIRectEdgeNone; } - (void)viewWillAppear:(BOOL)animated diff --git a/Sources/VLCFrostedGlasView.m b/Sources/VLCFrostedGlasView.m index 50a707ef22c7332ce2126a487d5c92d55654275f..139226a3db12b3833d79865b3ca5787f1e9252d0 100644 --- a/Sources/VLCFrostedGlasView.m +++ b/Sources/VLCFrostedGlasView.m @@ -43,27 +43,17 @@ - (void)setupView { [self setClipsToBounds:YES]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - if (![self toolbar]) { - [self setToolbar:[[UIToolbar alloc] initWithFrame:[self bounds]]]; - [self.layer insertSublayer:[self.toolbar layer] atIndex:0]; - [self.toolbar setBarStyle:UIBarStyleBlack]; - } - } else { - if(![self imageview]) { - [self setImageview:[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"playbackControllerBg"]]]; - [self insertSubview:self.imageview atIndex:0]; - } + + if (![self toolbar]) { + [self setToolbar:[[UIToolbar alloc] initWithFrame:[self bounds]]]; + [self.layer insertSublayer:[self.toolbar layer] atIndex:0]; + [self.toolbar setBarStyle:UIBarStyleBlack]; } } - (void)layoutSubviews { [super layoutSubviews]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - [self.toolbar setFrame:[self bounds]]; - } else { - [self.imageview setFrame:[self bounds]]; - } + [self.toolbar setFrame:[self bounds]]; } @end \ No newline at end of file diff --git a/Sources/VLCLocalNetworkListCell.m b/Sources/VLCLocalNetworkListCell.m index 25fd5d72451d2a3530cf039c8b7e1dd201383c0d..b04845ef166b76976eea606b737fd15089710c0b 100644 --- a/Sources/VLCLocalNetworkListCell.m +++ b/Sources/VLCLocalNetworkListCell.m @@ -33,13 +33,10 @@ self.subtitleLabel.text = @""; self.thumbnailView.contentMode = UIViewContentModeScaleAspectFit; self.downloadButton.hidden = YES; - - if (SYSTEM_RUNS_IOS7_OR_LATER) { - self.titleLabel.highlightedTextColor = [UIColor blackColor]; - self.folderTitleLabel.highlightedTextColor = [UIColor blackColor]; - self.subtitleLabel.highlightedTextColor = [UIColor blackColor]; - self.statusLabel.highlightedTextColor = [UIColor blackColor]; - } + self.titleLabel.highlightedTextColor = [UIColor blackColor]; + self.folderTitleLabel.highlightedTextColor = [UIColor blackColor]; + self.subtitleLabel.highlightedTextColor = [UIColor blackColor]; + self.statusLabel.highlightedTextColor = [UIColor blackColor]; } - (void)setTitleLabelCentered:(BOOL)titleLabelCentered diff --git a/Sources/VLCLocalPlexFolderListViewController.m b/Sources/VLCLocalPlexFolderListViewController.m index fbe796b958e696c3c610d66a3adc215e6860a0ae..5d6b8d309dfb64eb6ded20d733a8fb99ccfa683e 100644 --- a/Sources/VLCLocalPlexFolderListViewController.m +++ b/Sources/VLCLocalPlexFolderListViewController.m @@ -91,8 +91,7 @@ _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)]; UINavigationBar *navBar = self.navigationController.navigationBar; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _searchBar.barTintColor = navBar.barTintColor; + _searchBar.barTintColor = navBar.barTintColor; _searchBar.tintColor = navBar.tintColor; _searchBar.translucent = navBar.translucent; _searchBar.opaque = navBar.opaque; @@ -100,8 +99,7 @@ _searchDisplayController.delegate = self; _searchDisplayController.searchResultsDataSource = self; _searchDisplayController.searchResultsDelegate = self; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _searchDisplayController.searchBar.searchBarStyle = UIBarStyleBlack; + _searchDisplayController.searchBar.searchBarStyle = UIBarStyleBlack; _searchDisplayController.searchResultsTableView.separatorStyle = UITableViewCellSeparatorStyleNone; _searchDisplayController.searchResultsTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite; _searchBar.delegate = self; @@ -218,10 +216,8 @@ UISwipeGestureRecognizer *swipeRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeRightGestureAction:)]; [swipeRight setDirection:(UISwipeGestureRecognizerDirectionRight)]; [cell addGestureRecognizer:swipeRight]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longTouchGestureAction:)]; - [cell addGestureRecognizer:longPressGestureRecognizer]; - } + UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longTouchGestureAction:)]; + [cell addGestureRecognizer:longPressGestureRecognizer]; NSInteger size = [cellObject[@"size"] integerValue]; NSString *mediaSize = [NSByteCountFormatter stringFromByteCount:size countStyle:NSByteCountFormatterCountStyleFile]; NSString *durationInSeconds = cellObject[@"duration"]; @@ -488,46 +484,10 @@ if (recognizer.state == UIGestureRecognizerStateBegan) { NSIndexPath *swipedIndexPath = [self.tableView indexPathForRowAtPoint:[recognizer locationInView:self.tableView]]; UITableViewCell *swipedCell = [self.tableView cellForRowAtIndexPath:swipedIndexPath]; - VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[[self tableView] cellForRowAtIndexPath:swipedIndexPath]; - NSDictionary *cellObject = _globalObjectList[[self.tableView indexPathForCell:swipedCell].row]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - VLCPlexMediaInformationViewController *targetViewController = [[VLCPlexMediaInformationViewController alloc] initPlexMediaInformation:cellObject serverAddress:_PlexServerAddress portNumber:_PlexServerPort atPath:_PlexServerPath authentification:_PlexAuthentification]; - [[self navigationController] pushViewController:targetViewController animated:YES]; - } else { - NSString *title = cellObject[@"title"]; - NSInteger size = [cellObject[@"size"] integerValue]; - NSString *mediaSize = [NSByteCountFormatter stringFromByteCount:size countStyle:NSByteCountFormatterCountStyleFile]; - NSString *durationInSeconds = cellObject[@"duration"]; - NSString *audioCodec = cellObject[@"audioCodec"]; - if (!audioCodec) - audioCodec = @"no track"; - - NSString *videoCodec = cellObject[@"videoCodec"]; - if (!videoCodec) - videoCodec = @"no track"; - - NSString *message = [NSString stringWithFormat:@"%@ (%@)\naudio(%@) video(%@)", mediaSize, durationInSeconds, audioCodec, videoCodec]; - NSString *summary = [NSString stringWithFormat:@"%@", cellObject[@"summary"]]; - - VLCAlertView *alertView = [[VLCAlertView alloc] initWithTitle:title message:message cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", nil) otherButtonTitles:@[NSLocalizedString(@"PLAY_BUTTON", nil), NSLocalizedString(@"BUTTON_DOWNLOAD", nil)]]; - if (![summary isEqualToString:@""]) { - UITextView *textView = [[UITextView alloc] initWithFrame:alertView.bounds]; - textView.text = summary; - textView.editable = NO; - [alertView setValue:textView forKey:@"accessoryView"]; - } - alertView.completion = ^(BOOL cancelled, NSInteger buttonIndex) { - if (!cancelled) { - if (buttonIndex == 2) - [self triggerDownloadForCell:cell]; - else - [self _playMediaItem:cellObject]; - } - }; - [alertView show]; - } + VLCPlexMediaInformationViewController *targetViewController = [[VLCPlexMediaInformationViewController alloc] initPlexMediaInformation:cellObject serverAddress:_PlexServerAddress portNumber:_PlexServerPort atPath:_PlexServerPath authentification:_PlexAuthentification]; + [[self navigationController] pushViewController:targetViewController animated:YES]; } } diff --git a/Sources/VLCLocalServerFolderListViewController.m b/Sources/VLCLocalServerFolderListViewController.m index d9f3dfc527591e97a8951be0256e11dad0f188ba..742c092f69d73d77d479c91da114c6b15698b37e 100644 --- a/Sources/VLCLocalServerFolderListViewController.m +++ b/Sources/VLCLocalServerFolderListViewController.m @@ -146,8 +146,7 @@ _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)]; UINavigationBar *navBar = self.navigationController.navigationBar; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _searchBar.barTintColor = navBar.barTintColor; + _searchBar.barTintColor = navBar.barTintColor; _searchBar.tintColor = navBar.tintColor; _searchBar.translucent = navBar.translucent; _searchBar.opaque = navBar.opaque; @@ -157,8 +156,7 @@ _searchDisplayController.searchResultsDelegate = self; _searchDisplayController.searchResultsTableView.separatorStyle = UITableViewCellSeparatorStyleNone; _searchDisplayController.searchResultsTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _searchDisplayController.searchBar.searchBarStyle = UIBarStyleBlack; + _searchDisplayController.searchBar.searchBarStyle = UIBarStyleBlack; _searchBar.delegate = self; _searchBar.hidden = YES; diff --git a/Sources/VLCLocalServerListViewController.m b/Sources/VLCLocalServerListViewController.m index 97bd95726a13e6e89d38251981112442f4f66cf4..15427502c4de6ce0aaf71fe11baf49e1799e6d1d 100644 --- a/Sources/VLCLocalServerListViewController.m +++ b/Sources/VLCLocalServerListViewController.m @@ -136,9 +136,6 @@ name:VLCSharedLibraryParserDeterminedNetserviceAsVLCInstance object:nil]; -/* if (SYSTEM_RUNS_IOS7_OR_LATER) - _sectionHeaderTexts = @[@"Universal Plug'n'Play (UPNP)", @"Plex Media Server (via Bonjour)", @"File Transfer Protocol (FTP)", NSLocalizedString(@"SHARED_VLC_IOS_LIBRARY", nil), @"libDSM", NSLocalizedString(@"SAP_STREAMS", nil)]; - else*/ _sectionHeaderTexts = @[@"Universal Plug'n'Play (UPnP)", @"Plex Media Server (via Bonjour)", @"File Transfer Protocol (FTP)", NSLocalizedString(@"SHARED_VLC_IOS_LIBRARY", nil), @"libDSM"]; _backToMenuButton = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)]; @@ -174,10 +171,7 @@ [_refreshControl addTarget:self action:@selector(handleRefresh) forControlEvents:UIControlEventValueChanged]; [self.tableView addSubview:_refreshControl]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _loginViewController = [[VLCNetworkLoginViewController alloc] initWithNibName:@"VLCFutureNetworkLoginViewController" bundle:nil]; - else - _loginViewController = [[VLCNetworkLoginViewController alloc] initWithNibName:@"VLCNetworkLoginViewController" bundle:nil]; + _loginViewController = [[VLCNetworkLoginViewController alloc] initWithNibName:@"VLCNetworkLoginViewController" bundle:nil]; _loginViewController.delegate = self; @@ -394,10 +388,7 @@ NSInteger totalRow = [tableView numberOfRowsInSection:section]; if (row == (totalRow - 1)) { VLCPlexConnectServerViewController *_connectPlexServer; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _connectPlexServer = [[VLCPlexConnectServerViewController alloc] initWithNibName:@"VLCFuturePlexConnectServerViewController" bundle:nil]; - else - _connectPlexServer = [[VLCPlexConnectServerViewController alloc] initWithNibName:@"VLCPlexConnectServerViewController" bundle:nil]; + _connectPlexServer = [[VLCPlexConnectServerViewController alloc] initWithNibName:@"VLCPlexConnectServerViewController" bundle:nil]; UINavigationController *navCon = [[VLCNavigationController alloc] initWithRootViewController:_connectPlexServer]; navCon.navigationBarHidden = NO; @@ -501,16 +492,7 @@ UIView *headerView = nil; if (headerText != [NSNull null]) { headerView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 21.0f)]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - CAGradientLayer *gradient = [CAGradientLayer layer]; - gradient.frame = headerView.bounds; - gradient.colors = @[ - (id)[UIColor colorWithRed:(66.0f/255.0f) green:(66.0f/255.0f) blue:(66.0f/255.0f) alpha:1.0f].CGColor, - (id)[UIColor colorWithRed:(56.0f/255.0f) green:(56.0f/255.0f) blue:(56.0f/255.0f) alpha:1.0f].CGColor, - ]; - [headerView.layer insertSublayer:gradient atIndex:0]; - } else - headerView.backgroundColor = [UIColor VLCDarkBackgroundColor]; + headerView.backgroundColor = [UIColor VLCDarkBackgroundColor]; UILabel *textLabel = [[UILabel alloc] initWithFrame:CGRectInset(headerView.bounds, 12.0f, 0.f)]; textLabel.text = (NSString *) headerText; diff --git a/Sources/VLCMenuTableViewController.m b/Sources/VLCMenuTableViewController.m index 0d215428551fd616af66074bfe0d14012d3ba60e..7e2a61bb7d0d6a7ce1fc0b643d28ce7a5f4b5270 100644 --- a/Sources/VLCMenuTableViewController.m +++ b/Sources/VLCMenuTableViewController.m @@ -87,17 +87,10 @@ self.view.autoresizingMask = UIViewAutoresizingFlexibleHeight; [self.view addSubview:_tableView]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - UIView *brandingBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 64.0f)]; - brandingBackgroundView.backgroundColor = [UIColor colorWithRed:0.1608 green:0.1608 blue:0.1608 alpha:1.0000]; - [self.view addSubview:brandingBackgroundView]; - } else { - UIImageView *brandingBackgroundImageView; - brandingBackgroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 20.0f, kGHRevealSidebarWidth, 44.0f)]; - brandingBackgroundImageView.contentMode = UIViewContentModeScaleToFill; - brandingBackgroundImageView.image = [UIImage imageNamed:@"headerSidebar"]; - [self.view addSubview:brandingBackgroundImageView]; - } + UIView *brandingBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 64.0f)]; + brandingBackgroundView.backgroundColor = [UIColor colorWithRed:0.1608 green:0.1608 blue:0.1608 alpha:1.0000]; + [self.view addSubview:brandingBackgroundView]; + UIImageView *brandingImageView; brandingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f + 40.0f)]; brandingImageView.contentMode = UIViewContentModeCenter; @@ -245,16 +238,7 @@ UIView *headerView = nil; if (headerText != [NSNull null]) { headerView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 21.0f)]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - CAGradientLayer *gradient = [CAGradientLayer layer]; - gradient.frame = headerView.bounds; - gradient.colors = @[ - (id)[UIColor colorWithRed:(66.0f/255.0f) green:(66.0f/255.0f) blue:(66.0f/255.0f) alpha:1.0f].CGColor, - (id)[UIColor colorWithRed:(56.0f/255.0f) green:(56.0f/255.0f) blue:(56.0f/255.0f) alpha:1.0f].CGColor, - ]; - [headerView.layer insertSublayer:gradient atIndex:0]; - } else - headerView.backgroundColor = [UIColor VLCDarkBackgroundColor]; + headerView.backgroundColor = [UIColor VLCDarkBackgroundColor]; UILabel *textLabel = [[UILabel alloc] initWithFrame:CGRectInset(headerView.bounds, 12.0f, 5.0f)]; textLabel.text = (NSString *) headerText; @@ -314,10 +298,7 @@ if (itemIndex == 0) viewController = [[VLCLocalServerListViewController alloc] init]; 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]; + viewController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:@"VLCOpenNetworkStreamViewController" bundle:nil]; } else if (itemIndex == 2) viewController = appDelegate.downloadViewController; else if (itemIndex == 3) diff --git a/Sources/VLCMovieViewController.m b/Sources/VLCMovieViewController.m index b6bf94b4e545ee8c12570bb73c186bf77166a8c4..e8d7498ef38884ee5c1c5b383fe4dbae2b8bc0c4 100644 --- a/Sources/VLCMovieViewController.m +++ b/Sources/VLCMovieViewController.m @@ -206,8 +206,6 @@ typedef NS_ENUM(NSInteger, VLCPanType) { _sleepTimerButton.accessibilityLabel = NSLocalizedString(@"BUTTON_SLEEP_TIMER", nil); _sleepTimerButton.isAccessibilityElement = YES; [_sleepTimerButton setTitle:NSLocalizedString(@"BUTTON_SLEEP_TIMER", nil) forState:UIControlStateNormal]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) - _sleepTimerButton.hidden = YES; _multiSelectionView = [[VLCMultiSelectionMenuView alloc] init]; _multiSelectionView.delegate = self; @@ -290,23 +288,17 @@ typedef NS_ENUM(NSInteger, VLCPanType) { _swipeRecognizerDown.delegate = self; _tapRecognizer.delegate = self; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - self.backButton.tintColor = [UIColor colorWithRed:(190.0f/255.0f) green:(190.0f/255.0f) blue:(190.0f/255.0f) alpha:1.]; - self.toolbar.tintColor = [UIColor whiteColor]; - self.toolbar.barStyle = UIBarStyleBlack; - - rect = self.resetVideoFilterButton.frame; - rect.origin.y = rect.origin.y + 5.; - self.resetVideoFilterButton.frame = rect; - rect = self.toolbar.frame; - rect.size.height = rect.size.height + rect.origin.y; - rect.origin.y = 0; - self.toolbar.frame = rect; - } else { - [self.toolbar setBackgroundImage:[UIImage imageNamed:@"seekbarBg"] forBarMetrics:UIBarMetricsDefault]; - [self.backButton setBackgroundImage:[UIImage imageNamed:@"playbackDoneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [self.backButton setBackgroundImage:[UIImage imageNamed:@"playbackDoneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault]; - } + self.backButton.tintColor = [UIColor colorWithRed:(190.0f/255.0f) green:(190.0f/255.0f) blue:(190.0f/255.0f) alpha:1.]; + self.toolbar.tintColor = [UIColor whiteColor]; + self.toolbar.barStyle = UIBarStyleBlack; + + rect = self.resetVideoFilterButton.frame; + rect.origin.y = rect.origin.y + 5.; + self.resetVideoFilterButton.frame = rect; + rect = self.toolbar.frame; + rect.size.height = rect.size.height + rect.origin.y; + rect.origin.y = 0; + self.toolbar.frame = rect; /* FIXME: there is a saner iOS 6+ API for this! */ /* this looks a bit weird, but we need to support iOS 5 and should show the same appearance */ @@ -318,12 +310,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) { break; } } - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - [volumeSlider setMinimumTrackImage:[[UIImage imageNamed:@"sliderminiValue"]resizableImageWithCapInsets:UIEdgeInsetsMake(0, 4, 0, 0)] forState:UIControlStateNormal]; - [volumeSlider setMaximumTrackImage:[[UIImage imageNamed:@"slidermaxValue"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 4)] forState:UIControlStateNormal]; - [volumeSlider setThumbImage:[UIImage imageNamed:@"volumeballslider"] forState:UIControlStateNormal]; - } else - [volumeView setVolumeThumbImage:[UIImage imageNamed:@"modernSliderKnob"] forState:UIControlStateNormal]; + [volumeView setVolumeThumbImage:[UIImage imageNamed:@"modernSliderKnob"] forState:UIControlStateNormal]; [volumeSlider addTarget:self action:@selector(volumeSliderAction:) forControlEvents:UIControlEventValueChanged]; @@ -385,47 +372,45 @@ typedef NS_ENUM(NSInteger, VLCPanType) { _equalizerView.hidden = YES; [self.view addSubview:_equalizerView]; - /* add sleep timer UI, requires iOS 7 or later */ - if (SYSTEM_RUNS_IOS7_OR_LATER) { - _sleepTimerContainer = [[VLCFrostedGlasView alloc] initWithFrame:CGRectMake(0., 0., 300., 162.)]; - _sleepTimerContainer.center = self.view.center; - _sleepTimerContainer.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin; + /* add sleep timer UI */ + _sleepTimerContainer = [[VLCFrostedGlasView alloc] initWithFrame:CGRectMake(0., 0., 300., 162.)]; + _sleepTimerContainer.center = self.view.center; + _sleepTimerContainer.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin; - _sleepTimeDatePicker = [[UIDatePicker alloc] init]; - if ([[UIDevice currentDevice] speedCategory] >= 3) { - _sleepTimeDatePicker.opaque = NO; - _sleepTimeDatePicker.backgroundColor = [UIColor clearColor]; - } else - _sleepTimeDatePicker.backgroundColor = [UIColor blackColor]; - _sleepTimeDatePicker.tintColor = [UIColor VLCLightTextColor]; - _sleepTimeDatePicker.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin; - [_sleepTimerContainer addSubview:_sleepTimeDatePicker]; - - /* adapt the date picker style to suit our needs */ - [_sleepTimeDatePicker setValue:[UIColor whiteColor] forKeyPath:@"textColor"]; - SEL selector = NSSelectorFromString(@"setHighlightsToday:"); - NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[UIDatePicker instanceMethodSignatureForSelector:selector]]; - BOOL no = NO; - [invocation setSelector:selector]; - [invocation setArgument:&no atIndex:2]; - [invocation invokeWithTarget:_sleepTimeDatePicker]; - - if (_sleepTimerContainer.subviews.count > 0) { - NSArray *subviewsOfSubview = [_sleepTimeDatePicker.subviews[0] subviews]; - NSUInteger subviewCount = subviewsOfSubview.count; - for (NSUInteger x = 0; x < subviewCount; x++) { - if ([subviewsOfSubview[x] isKindOfClass:[UILabel class]]) - [subviewsOfSubview[x] setTextColor:[UIColor VLCLightTextColor]]; - } + _sleepTimeDatePicker = [[UIDatePicker alloc] init]; + if ([[UIDevice currentDevice] speedCategory] >= 3) { + _sleepTimeDatePicker.opaque = NO; + _sleepTimeDatePicker.backgroundColor = [UIColor clearColor]; + } else + _sleepTimeDatePicker.backgroundColor = [UIColor blackColor]; + _sleepTimeDatePicker.tintColor = [UIColor VLCLightTextColor]; + _sleepTimeDatePicker.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin; + [_sleepTimerContainer addSubview:_sleepTimeDatePicker]; + + /* adapt the date picker style to suit our needs */ + [_sleepTimeDatePicker setValue:[UIColor whiteColor] forKeyPath:@"textColor"]; + SEL selector = NSSelectorFromString(@"setHighlightsToday:"); + NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[UIDatePicker instanceMethodSignatureForSelector:selector]]; + BOOL no = NO; + [invocation setSelector:selector]; + [invocation setArgument:&no atIndex:2]; + [invocation invokeWithTarget:_sleepTimeDatePicker]; + + if (_sleepTimerContainer.subviews.count > 0) { + NSArray *subviewsOfSubview = [_sleepTimeDatePicker.subviews[0] subviews]; + NSUInteger subviewCount = subviewsOfSubview.count; + for (NSUInteger x = 0; x < subviewCount; x++) { + if ([subviewsOfSubview[x] isKindOfClass:[UILabel class]]) + [subviewsOfSubview[x] setTextColor:[UIColor VLCLightTextColor]]; } - _sleepTimeDatePicker.datePickerMode = UIDatePickerModeCountDownTimer; - _sleepTimeDatePicker.minuteInterval = 5; - _sleepTimeDatePicker.minimumDate = [NSDate date]; - _sleepTimeDatePicker.countDownDuration = 1200.; - [_sleepTimeDatePicker addTarget:self action:@selector(sleepTimerAction:) forControlEvents:UIControlEventValueChanged]; - - [self.view addSubview:_sleepTimerContainer]; } + _sleepTimeDatePicker.datePickerMode = UIDatePickerModeCountDownTimer; + _sleepTimeDatePicker.minuteInterval = 5; + _sleepTimeDatePicker.minimumDate = [NSDate date]; + _sleepTimeDatePicker.countDownDuration = 1200.; + [_sleepTimeDatePicker addTarget:self action:@selector(sleepTimerAction:) forControlEvents:UIControlEventValueChanged]; + + [self.view addSubview:_sleepTimerContainer]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(playbackDidStop:) name:VLCPlaybackControllerPlaybackDidStop object:nil]; } @@ -445,11 +430,6 @@ typedef NS_ENUM(NSInteger, VLCPanType) { [self.navigationController setNavigationBarHidden:YES animated:YES]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleBlackTranslucent; - } - VLCPlaybackController *vpc = self.playbackController; vpc.delegate = self; [vpc recoverPlaybackState]; @@ -522,8 +502,6 @@ typedef NS_ENUM(NSInteger, VLCPanType) { _idleTimer = nil; } [self.navigationController setNavigationBarHidden:NO animated:YES]; - if (!SYSTEM_RUNS_IOS7_OR_LATER) - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleBlackOpaque; [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade]; [super viewWillDisappear:animated]; diff --git a/Sources/VLCNavigationController.m b/Sources/VLCNavigationController.m index 078d54325e0a162285a2e1d236eda1d5e71bfe2a..9db0fc18581f54dc7b0caa10f1ca0000e2bab9c9 100644 --- a/Sources/VLCNavigationController.m +++ b/Sources/VLCNavigationController.m @@ -27,16 +27,9 @@ return; UINavigationBar *navigationBar = self.navigationBar; - if (!SYSTEM_RUNS_IOS7_OR_LATER) { - [navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forBarMetrics:UIBarMetricsDefault]; - navigationBar.barStyle = UIBarStyleBlack; - navigationBar.translucent = NO; - navigationBar.opaque = YES; - } else { - navigationBar.barTintColor = [UIColor VLCOrangeTintColor]; - navigationBar.tintColor = [UIColor whiteColor]; - navigationBar.titleTextAttributes = @{ UITextAttributeTextColor : [UIColor whiteColor] }; - } + navigationBar.barTintColor = [UIColor VLCOrangeTintColor]; + navigationBar.tintColor = [UIColor whiteColor]; + navigationBar.titleTextAttributes = @{ UITextAttributeTextColor : [UIColor whiteColor] }; _setup = YES; } diff --git a/Sources/VLCNetworkLoginViewController.m b/Sources/VLCNetworkLoginViewController.m index 8cbc9984c85dca9198bebf87bc7015e0659314dd..526b45fbb17c19c80d529ae4887819648a86bbfe 100644 --- a/Sources/VLCNetworkLoginViewController.m +++ b/Sources/VLCNetworkLoginViewController.m @@ -63,13 +63,11 @@ self.passwordField.returnKeyType = UIReturnKeyDone; self.passwordField.clearButtonMode = UITextFieldViewModeWhileEditing; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - UIColor *color = [UIColor VLCLightTextColor]; - self.serverAddressField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"ftp://yourserver.local" attributes:@{NSForegroundColorAttributeName: color}]; - self.usernameField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"USER_LABEL", nil) attributes:@{NSForegroundColorAttributeName: color}]; - self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"PASSWORD_LABEL", nil) attributes:@{NSForegroundColorAttributeName: color}]; - self.edgesForExtendedLayout = UIRectEdgeNone; - } + UIColor *color = [UIColor VLCLightTextColor]; + self.serverAddressField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"ftp://yourserver.local" attributes:@{NSForegroundColorAttributeName: color}]; + self.usernameField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"USER_LABEL", nil) attributes:@{NSForegroundColorAttributeName: color}]; + self.passwordField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"PASSWORD_LABEL", nil) attributes:@{NSForegroundColorAttributeName: color}]; + self.edgesForExtendedLayout = UIRectEdgeNone; } - (void)viewWillAppear:(BOOL)animated @@ -108,8 +106,7 @@ - (IBAction)dismissWithAnimation:(id)sender { - if (SYSTEM_RUNS_IOS7_OR_LATER) - self.navigationController.navigationBar.translucent = YES; + self.navigationController.navigationBar.translucent = YES; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) [self.navigationController popViewControllerAnimated:YES]; @@ -119,8 +116,7 @@ - (IBAction)dismiss:(id)sender { - if (SYSTEM_RUNS_IOS7_OR_LATER) - self.navigationController.navigationBar.translucent = YES; + self.navigationController.navigationBar.translucent = YES; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) [self.navigationController popViewControllerAnimated:NO]; diff --git a/Sources/VLCOpenNetworkStreamViewController.m b/Sources/VLCOpenNetworkStreamViewController.m index 087a5b35cb549264eb88a71f1b567c23901f3ead..1ea74b0b2cdc8fa9f55f9742cbeb89dfcb01add3 100644 --- a/Sources/VLCOpenNetworkStreamViewController.m +++ b/Sources/VLCOpenNetworkStreamViewController.m @@ -61,10 +61,8 @@ selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:[UIApplication sharedApplication]]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - [self.openButton setTitle:NSLocalizedString(@"OPEN_NETWORK", nil) forState:UIControlStateNormal]; - else - [self.openButton setTitle:NSLocalizedString(@"BUTTON_OPEN", nil) forState:UIControlStateNormal]; + + [self.openButton setTitle:NSLocalizedString(@"OPEN_NETWORK", nil) forState:UIControlStateNormal]; [self.privateModeLabel setText:NSLocalizedString(@"PRIVATE_PLAYBACK_TOGGLE", nil)]; [self.ScanSubModeLabel setText:NSLocalizedString(@"SCAN_SUBTITLE_TOGGLE", nil)]; [self.ScanSubModeLabel setAdjustsFontSizeToFitWidth:YES]; @@ -75,11 +73,9 @@ self.urlField.delegate = self; self.urlField.keyboardType = UIKeyboardTypeURL; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - NSAttributedString *coloredAttributedPlaceholder = [[NSAttributedString alloc] initWithString:@"http://myserver.com/file.mkv" attributes:@{NSForegroundColorAttributeName: [UIColor VLCLightTextColor]}]; - self.urlField.attributedPlaceholder = coloredAttributedPlaceholder; - self.edgesForExtendedLayout = UIRectEdgeNone; - } + NSAttributedString *coloredAttributedPlaceholder = [[NSAttributedString alloc] initWithString:@"http://myserver.com/file.mkv" attributes:@{NSForegroundColorAttributeName: [UIColor VLCLightTextColor]}]; + self.urlField.attributedPlaceholder = coloredAttributedPlaceholder; + self.edgesForExtendedLayout = UIRectEdgeNone; // This will be called every time this VC is opened by the side menu controller [self updatePasteboardTextInURLField]; diff --git a/Sources/VLCPlaylistCollectionViewCell.m b/Sources/VLCPlaylistCollectionViewCell.m index e7a50da3009869f3475e8597cbb7f7d94ff224da..674a00fac25b371a680e37e3777afe7a2dbb6151 100644 --- a/Sources/VLCPlaylistCollectionViewCell.m +++ b/Sources/VLCPlaylistCollectionViewCell.m @@ -35,13 +35,8 @@ - (void)awakeFromNib { - if (SYSTEM_RUNS_IOS7_OR_LATER) { - _checkboxEmptyImage = [UIImage imageNamed:@"checkboxEmpty"]; - _checkboxImage = [UIImage imageNamed:@"checkbox"]; - } else { - _checkboxEmptyImage = [UIImage imageNamed:@"checkbox-legacy-empty"]; - _checkboxImage = [UIImage imageNamed:@"checkbox-legacy"]; - } + _checkboxEmptyImage = [UIImage imageNamed:@"checkboxEmpty"]; + _checkboxImage = [UIImage imageNamed:@"checkbox"]; self.metaDataLabel.hidden = YES; } @@ -324,23 +319,16 @@ - (void)_showPositionOfItem:(MLFile *)mediaLibraryFile { CGFloat position = mediaLibraryFile.lastPosition.floatValue; - - if (SYSTEM_RUNS_IOS7_OR_LATER) { - CGFloat duration = mediaLibraryFile.duration.floatValue; - if (position > .05f && position < .95f && (duration * position - duration) < -60000) { - [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", nil), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; - self.mediaIsUnreadView.hidden = NO; - } else if (mediaLibraryFile.unread.intValue) { - [(UILabel *)self.mediaIsUnreadView setText:[NSLocalizedString(@"NEW", nil) capitalizedStringWithLocale:[NSLocale currentLocale]]]; - self.mediaIsUnreadView.hidden = NO; - } else - self.mediaIsUnreadView.hidden = YES; - } else { - self.progressView.progress = position; - self.progressView.hidden = ((position < .1f) || (position > .95f)) ? YES : NO; - [self.progressView setNeedsDisplay]; - self.mediaIsUnreadView.hidden = !mediaLibraryFile.unread.intValue; - } + CGFloat duration = mediaLibraryFile.duration.floatValue; + + if (position > .05f && position < .95f && (duration * position - duration) < -60000) { + [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", nil), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; + self.mediaIsUnreadView.hidden = NO; + } else if (mediaLibraryFile.unread.intValue) { + [(UILabel *)self.mediaIsUnreadView setText:[NSLocalizedString(@"NEW", nil) capitalizedStringWithLocale:[NSLocale currentLocale]]]; + self.mediaIsUnreadView.hidden = NO; + } else + self.mediaIsUnreadView.hidden = YES; } - (void)showMetadata:(BOOL)showMeta diff --git a/Sources/VLCPlaylistTableViewCell.m b/Sources/VLCPlaylistTableViewCell.m index 92db022fb61778d7600b39cf92e648c126b7c40d..682b0b064fb2eaf564b1219e959bab3150103724 100644 --- a/Sources/VLCPlaylistTableViewCell.m +++ b/Sources/VLCPlaylistTableViewCell.m @@ -35,10 +35,7 @@ + (VLCPlaylistTableViewCell *)cellWithReuseIdentifier:(NSString *)ident { NSArray *nibContentArray; - if (SYSTEM_RUNS_IOS7_OR_LATER) - nibContentArray = [[NSBundle mainBundle] loadNibNamed:@"VLCFuturePlaylistTableViewCell" owner:nil options:nil]; - else - nibContentArray = [[NSBundle mainBundle] loadNibNamed:@"VLCPlaylistTableViewCell" owner:nil options:nil]; + nibContentArray = [[NSBundle mainBundle] loadNibNamed:@"VLCPlaylistTableViewCell" owner:nil options:nil]; NSAssert([nibContentArray count] == 1, @"meh"); NSAssert([[nibContentArray lastObject] isKindOfClass:[VLCPlaylistTableViewCell class]], @"meh meh"); VLCPlaylistTableViewCell *cell = (VLCPlaylistTableViewCell *)[nibContentArray lastObject]; @@ -161,15 +158,13 @@ [super setEditing:editing animated:animated]; [self _updatedDisplayedInformationForKeyPath:@"editing"]; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - if (editing) { - if (_longPress) - [self removeGestureRecognizer:_longPress]; - } else { - if (!_longPress) - _longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longTouchGestureAction:)]; - [self addGestureRecognizer:_longPress]; - } + if (editing) { + if (_longPress) + [self removeGestureRecognizer:_longPress]; + } else { + if (!_longPress) + _longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longTouchGestureAction:)]; + [self addGestureRecognizer:_longPress]; } } @@ -206,10 +201,7 @@ + (CGFloat)heightOfCell { - if (SYSTEM_RUNS_IOS7_OR_LATER) - return 90.; - - return 80.; + return 90.; } #pragma mark - presentation @@ -314,23 +306,16 @@ - (void)_showPositionOfItem:(MLFile *)mediaLibraryFile { CGFloat position = mediaLibraryFile.lastPosition.floatValue; - - if (SYSTEM_RUNS_IOS7_OR_LATER) { - CGFloat duration = mediaLibraryFile.duration.floatValue; - if (position > .05f && position < .95f && (duration * position - duration) < -60000) { - [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", nil), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; - self.mediaIsUnreadView.hidden = NO; - } else if (mediaLibraryFile.unread.intValue) { - [(UILabel *)self.mediaIsUnreadView setText:[NSLocalizedString(@"NEW", nil) capitalizedStringWithLocale:[NSLocale currentLocale]]]; - self.mediaIsUnreadView.hidden = NO; - } else - self.mediaIsUnreadView.hidden = YES; - } else { - self.progressIndicator.progress = position; - self.progressIndicator.hidden = ((position < .1f) || (position > .95f)) ? YES : NO; - [self.progressIndicator setNeedsDisplay]; - self.mediaIsUnreadView.hidden = !mediaLibraryFile.unread.intValue; - } + CGFloat duration = mediaLibraryFile.duration.floatValue; + + if (position > .05f && position < .95f && (duration * position - duration) < -60000) { + [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", nil), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; + self.mediaIsUnreadView.hidden = NO; + } else if (mediaLibraryFile.unread.intValue) { + [(UILabel *)self.mediaIsUnreadView setText:[NSLocalizedString(@"NEW", nil) capitalizedStringWithLocale:[NSLocale currentLocale]]]; + self.mediaIsUnreadView.hidden = NO; + } else + self.mediaIsUnreadView.hidden = YES; } - (void)longTouchGestureAction:(UIGestureRecognizer *)recognizer diff --git a/Sources/VLCPlaylistViewController.m b/Sources/VLCPlaylistViewController.m index fae3d0aa90723332defd5dc0fd81db597eb45fc6..d9d2bdfc9e455771b383c22e9399257b85227bf6 100644 --- a/Sources/VLCPlaylistViewController.m +++ b/Sources/VLCPlaylistViewController.m @@ -126,10 +126,7 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; _collectionView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth; _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_collectionViewHandleLongPressGesture:)]; [_collectionView addGestureRecognizer:_longPressGestureRecognizer]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - [_collectionView registerNib:[UINib nibWithNibName:@"VLCFuturePlaylistCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"PlaylistCell"]; - else - [_collectionView registerNib:[UINib nibWithNibName:@"VLCPlaylistCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"PlaylistCell"]; + [_collectionView registerNib:[UINib nibWithNibName:@"VLCPlaylistCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"PlaylistCell"]; } [contentView addSubview:_collectionView]; [_collectionView reloadData]; @@ -157,15 +154,7 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; self.navigationItem.leftBarButtonItem = _menuButton; self.editButtonItem.title = NSLocalizedString(@"BUTTON_EDIT", nil); - - if (SYSTEM_RUNS_IOS7_OR_LATER) - self.editButtonItem.tintColor = [UIColor whiteColor]; - else { - [self.editButtonItem setBackgroundImage:[UIImage imageNamed:@"button"] - forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [self.editButtonItem setBackgroundImage:[UIImage imageNamed:@"buttonHighlight"] - forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault]; - } + self.editButtonItem.tintColor = [UIColor whiteColor]; _emptyLibraryView.emptyLibraryLabel.text = NSLocalizedString(@"EMPTY_LIBRARY", nil); _emptyLibraryView.emptyLibraryLongDescriptionLabel.text = NSLocalizedString(@"EMPTY_LIBRARY_LONG", nil); @@ -193,20 +182,14 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; [self setToolbarItems:@[_actionBarButtonItem, fixedSpace, createFolderItem, [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], [UIBarButtonItem themedDarkToolbarButtonWithTitle:NSLocalizedString(@"BUTTON_RENAME", nil) target:self andSelector:@selector(renameSelection)], [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteSelection)]]]; self.navigationController.toolbar.barStyle = UIBarStyleBlack; - - if (SYSTEM_RUNS_IOS7_OR_LATER) { - self.navigationController.toolbar.tintColor = [UIColor whiteColor]; - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; - } else - [self.navigationController.toolbar setBackgroundImage:[UIImage imageNamed:@"bottomBlackBar"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; + self.navigationController.toolbar.tintColor = [UIColor whiteColor]; + [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)]; UINavigationBar *navBar = self.navigationController.navigationBar; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - _searchBar.barTintColor = navBar.barTintColor; - // cancel button tint color of UISearchBar with white color - [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor], NSForegroundColorAttributeName, nil] forState:UIControlStateNormal]; - } + _searchBar.barTintColor = navBar.barTintColor; + // cancel button tint color of UISearchBar with white color + [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor], NSForegroundColorAttributeName, nil] forState:UIControlStateNormal]; _searchBar.tintColor = navBar.tintColor; _searchBar.translucent = navBar.translucent; _searchBar.opaque = navBar.opaque; @@ -757,35 +740,25 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (SYSTEM_RUNS_IOS7_OR_LATER) { - if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) - return CGSizeMake(341., 190.); - else - return CGSizeMake(384., 216.); - } - - return CGSizeMake(298.0, 220.0); + if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) + return CGSizeMake(341., 190.); + else + return CGSizeMake(384., 216.); } - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section { - if (SYSTEM_RUNS_IOS7_OR_LATER) - return UIEdgeInsetsZero; - return UIEdgeInsetsMake(0.0, 34.0, 0.0, 34.0); + return UIEdgeInsetsZero; } - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - if (SYSTEM_RUNS_IOS7_OR_LATER) - return 0.; - return 10.0; + return 0.; } - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - if (SYSTEM_RUNS_IOS7_OR_LATER) - return 0.; - return 10.0; + return 0.; } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath @@ -1114,17 +1087,7 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; [super setEditing:editing animated:animated]; UIBarButtonItem *editButton = self.editButtonItem; - NSString *editImage = editing? @"doneButton": @"button"; - NSString *editImageHighlight = editing? @"doneButtonHighlight": @"buttonHighlight"; - if (SYSTEM_RUNS_IOS7_OR_LATER) - editButton.tintColor = [UIColor whiteColor]; - else { - [editButton setBackgroundImage:[UIImage imageNamed:editImage] forState:UIControlStateNormal - barMetrics:UIBarMetricsDefault]; - [editButton setBackgroundImage:[UIImage imageNamed:editImageHighlight] - forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault]; - [editButton setTitleTextAttributes: editing ? @{UITextAttributeTextShadowColor : [UIColor whiteColor], UITextAttributeTextColor : [UIColor blackColor]} : @{UITextAttributeTextShadowColor : [UIColor VLCDarkTextShadowColor], UITextAttributeTextColor : [UIColor whiteColor]} forState:UIControlStateNormal]; - } + editButton.tintColor = [UIColor whiteColor]; if (!_usingTableViewToShowData) { NSArray *visibleCells = self.collectionView.visibleCells; @@ -1370,12 +1333,7 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; if ([fileURLobjects count]) { // Provide some basic user feedback as UIActivityController lags in presentation sometimes (blocking the main thread). - // iOS 6 has trouble re-enabling all the icons, so only disable the sharing one. Usage of the toolbar will be disabled by UIApplication in this case anyhow. - if (SYSTEM_RUNS_IOS7_OR_LATER) { - [self.navigationController.toolbar.items makeObjectsPerformSelector:@selector(setEnabled:) withObject:@(NO)]; - } else { - _actionBarButtonItem.enabled = YES; - } + [self.navigationController.toolbar.items makeObjectsPerformSelector:@selector(setEnabled:) withObject:@(NO)]; // Just in case, since we are facing a possible delay from code we do not control (UIActivityViewController), disable any possible changes to selection (or exit from this screen) [[UIApplication sharedApplication] beginIgnoringInteractionEvents]; @@ -1387,14 +1345,10 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; _openInActivity.presentingBarButtonItem = barButtonItem; dispatch_block_t enableInteractionBlock = ^{ - if (SYSTEM_RUNS_IOS7_OR_LATER) { - // Strangely makeObjectsPerformSelector:withObject has trouble here (when called from presentViewController:animated:completion:) - // [self.navigationController.toolbar.items makeObjectsPerformSelector:@selector(setEnabled:) withObject:@(YES)]; - for (UIBarButtonItem *item in self.navigationController.toolbar.items) { - item.enabled = YES; - } - } else { - _actionBarButtonItem.enabled = YES; + // Strangely makeObjectsPerformSelector:withObject has trouble here (when called from presentViewController:animated:completion:) + // [self.navigationController.toolbar.items makeObjectsPerformSelector:@selector(setEnabled:) withObject:@(YES)]; + for (UIBarButtonItem *item in self.navigationController.toolbar.items) { + item.enabled = YES; } if ([[UIApplication sharedApplication] isIgnoringInteractionEvents]) { diff --git a/Sources/VLCPlexConnectServerViewController.m b/Sources/VLCPlexConnectServerViewController.m index 3f9b1461e226c56e50df797e7e70ebb91200fa9a..db5caa1f97e0d3dc376da2cb89e8b85322e429dd 100644 --- a/Sources/VLCPlexConnectServerViewController.m +++ b/Sources/VLCPlexConnectServerViewController.m @@ -57,13 +57,11 @@ self.serverPlexBookmark.showsVerticalScrollIndicator = YES; self.serverPlexBookmark.indicatorStyle = UIScrollViewIndicatorStyleWhite; - if (SYSTEM_RUNS_IOS7_OR_LATER) { - UIColor *color = [UIColor VLCLightTextColor]; - self.serverAddressField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"192.168.0.0" attributes:@{NSForegroundColorAttributeName: color}]; - self.portField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:kPlexMediaServerPortDefault attributes:@{NSForegroundColorAttributeName: color}]; + UIColor *color = [UIColor VLCLightTextColor]; + self.serverAddressField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"192.168.0.0" attributes:@{NSForegroundColorAttributeName: color}]; + self.portField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:kPlexMediaServerPortDefault attributes:@{NSForegroundColorAttributeName: color}]; - self.edgesForExtendedLayout = UIRectEdgeNone; - } + self.edgesForExtendedLayout = UIRectEdgeNone; _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; _activityIndicator.center = self.view.center; diff --git a/Sources/VLCSharedLibraryListViewController.m b/Sources/VLCSharedLibraryListViewController.m index 1ac4cfe40f555862d48d78843e1195371e247621..9a2da3ab574adf248378e2e850e3b19138c3eb6c 100755 --- a/Sources/VLCSharedLibraryListViewController.m +++ b/Sources/VLCSharedLibraryListViewController.m @@ -87,8 +87,7 @@ _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)]; UINavigationBar *navBar = self.navigationController.navigationBar; - if (SYSTEM_RUNS_IOS7_OR_LATER) - _searchBar.barTintColor = navBar.barTintColor; + _searchBar.barTintColor = navBar.barTintColor; _searchBar.tintColor = navBar.tintColor; _searchBar.translucent = navBar.translucent; _searchBar.opaque = navBar.opaque; @@ -96,7 +95,6 @@ _searchDisplayController.delegate = self; _searchDisplayController.searchResultsDataSource = self; _searchDisplayController.searchResultsDelegate = self; - if (SYSTEM_RUNS_IOS7_OR_LATER) _searchDisplayController.searchBar.searchBarStyle = UIBarStyleBlack; _searchDisplayController.searchResultsTableView.separatorStyle = UITableViewCellSeparatorStyleNone; _searchDisplayController.searchResultsTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite; diff --git a/Sources/VLCSlider.m b/Sources/VLCSlider.m index 9d4171252c48f7aa147caa6597ebf458b6ea330e..200ef3a1dbc1f30e12b71d3788ead27648ecbb3e 100644 --- a/Sources/VLCSlider.m +++ b/Sources/VLCSlider.m @@ -18,29 +18,7 @@ { self.accessibilityLabel = NSLocalizedString(@"PLAYBACK_POSITION", nil); self.isAccessibilityElement = YES; - - if (SYSTEM_RUNS_IOS7_OR_LATER) - [self setThumbImage:[UIImage imageNamed:@"modernSliderKnob"] forState:UIControlStateNormal]; - else { - self.minimumValueImage = [UIImage imageNamed:@"sliderminiValue"]; - self.maximumValueImage = [UIImage imageNamed:@"slidermaxValue"]; - [self setMinimumTrackImage:[UIImage imageNamed:@"sliderminimumTrack"] forState:UIControlStateNormal]; - [self setMaximumTrackImage:[UIImage imageNamed:@"slidermaximumTrack"] forState:UIControlStateNormal]; - [self setThumbImage:[UIImage imageNamed:@"ballSlider"] forState:UIControlStateNormal]; - [self setThumbImage:[UIImage imageNamed:@"knobSlider"] forState:UIControlStateHighlighted]; - } -} - -- (CGRect)trackRectForBounds:(CGRect)bounds -{ - CGRect returnValue = [super trackRectForBounds:bounds]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - return returnValue; - - returnValue.origin.x = 5.; - returnValue.origin.y = 7.; - returnValue.size.width = bounds.size.width - 10.; - return returnValue; + [self setThumbImage:[UIImage imageNamed:@"sliderKnob"] forState:UIControlStateNormal]; } @end @@ -52,34 +30,13 @@ { self = [super initWithFrame:frame]; if (self) - [self setThumbImage:[UIImage imageNamed:@"modernSliderKnob"] forState:UIControlStateNormal]; + [self setThumbImage:[UIImage imageNamed:@"sliderKnob"] forState:UIControlStateNormal]; return self; } - (void)awakeFromNib { - if (SYSTEM_RUNS_IOS7_OR_LATER) - [self setThumbImage:[UIImage imageNamed:@"modernSliderKnob"] forState:UIControlStateNormal]; - else { - self.minimumValueImage = [UIImage imageNamed:@"sliderminiValue"]; - self.maximumValueImage = [UIImage imageNamed:@"slidermaxValue"]; - [self setMinimumTrackImage:[UIImage imageNamed:@"sliderminimumTrack"] forState:UIControlStateNormal]; - [self setMaximumTrackImage:[UIImage imageNamed:@"slidermaximumTrack"] forState:UIControlStateNormal]; - [self setThumbImage:[UIImage imageNamed:@"ballSlider"] forState:UIControlStateNormal]; - } -} - -- (CGRect)trackRectForBounds:(CGRect)bounds -{ - CGRect returnValue = [super trackRectForBounds:bounds]; - if (SYSTEM_RUNS_IOS7_OR_LATER) - return returnValue; - - returnValue.origin.x = 5.; - if (!SYSTEM_RUNS_IOS7_OR_LATER) - returnValue.origin.y = 7.; - returnValue.size.width = bounds.size.width - 10.; - return returnValue; + [self setThumbImage:[UIImage imageNamed:@"sliderKnob"] forState:UIControlStateNormal]; } @end diff --git a/Sources/VLCThumbnailsCache.m b/Sources/VLCThumbnailsCache.m index 587b5871fa4d66824b8b35ce90ca475236da2485..7348f3a4846a3b66fc1f21573d2cabfcad1e4a2a 100644 --- a/Sources/VLCThumbnailsCache.m +++ b/Sources/VLCThumbnailsCache.m @@ -218,10 +218,8 @@ NSUInteger fileNumber = count > 3 ? 3 : count; NSArray *files = [mediaLabel.files allObjects]; - BOOL blur = NO; - if (SYSTEM_RUNS_IOS7_OR_LATER) - blur = YES; - displayedImage = [self clusterThumbFromFiles:files andNumber:fileNumber blur:blur]; + + displayedImage = [self clusterThumbFromFiles:files andNumber:fileNumber blur:YES]; if (displayedImage) { [_thumbnailCache setObject:displayedImage forKey:objID]; [_thumbnailCacheMetadata setObject:@(count) forKey:objID]; @@ -267,17 +265,10 @@ else imageSize = CGSizeMake(341., 192.); } else if (_currentDeviceIdiom == UIUserInterfaceIdiomPhone) { - if (SYSTEM_RUNS_IOS7_OR_LATER) { - if ([UIScreen mainScreen].scale==2.0) - imageSize = CGSizeMake(480., 270.); - else - imageSize = CGSizeMake(720., 405.); - } else { - if ([UIScreen mainScreen].scale==2.0) - imageSize = CGSizeMake(258., 145.); - else - imageSize = CGSizeMake(129., 73.); - } + if ([UIScreen mainScreen].scale==2.0) + imageSize = CGSizeMake(480., 270.); + else + imageSize = CGSizeMake(720., 405.); } else { if (SYSTEM_RUNS_IOS82_OR_LATER) { if (WKInterfaceDevice.currentDevice != nil) { diff --git a/Sources/VLCTimeNavigationTitleView.m b/Sources/VLCTimeNavigationTitleView.m index 2c3a99f9d38cf21944e545e70ed6eb87df6a78bd..6890c7c26ce084d6bf9fbfc7bbe1dbc6d38f1c7f 100644 --- a/Sources/VLCTimeNavigationTitleView.m +++ b/Sources/VLCTimeNavigationTitleView.m @@ -25,13 +25,7 @@ self.aspectRatioButton.accessibilityLabel = NSLocalizedString(@"VIDEO_ASPECT_RATIO_BUTTON", nil); self.aspectRatioButton.isAccessibilityElement = YES; - - if (SYSTEM_RUNS_IOS7_OR_LATER) { - [self.aspectRatioButton setImage:[UIImage imageNamed:@"ratioIcon"] forState:UIControlStateNormal]; - } else { - [self.aspectRatioButton setBackgroundImage:[UIImage imageNamed:@"ratioButton"] forState:UIControlStateNormal]; - [self.aspectRatioButton setBackgroundImage:[UIImage imageNamed:@"ratioButtonHighlight"] forState:UIControlStateHighlighted]; - } + [self.aspectRatioButton setImage:[UIImage imageNamed:@"ratioIcon"] forState:UIControlStateNormal]; [self setNeedsLayout]; } diff --git a/VLC for iOS.xcodeproj/project.pbxproj b/VLC for iOS.xcodeproj/project.pbxproj index dac5ca7b5b5e8e97c8a4c4d975d25671ceded088..aae523f8e8daa155fc9ba61af30b53af3e1a3923 100644 --- a/VLC for iOS.xcodeproj/project.pbxproj +++ b/VLC for iOS.xcodeproj/project.pbxproj @@ -8,14 +8,12 @@ /* Begin PBXBuildFile section */ 262C71591A98FA9200F7ED34 /* VLCPlexMediaInformationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 262C71581A98FA9200F7ED34 /* VLCPlexMediaInformationViewController.m */; }; - 262C715B1A98FDE300F7ED34 /* VLCPlexMediaInformationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 262C715A1A98FDE300F7ED34 /* VLCPlexMediaInformationViewController.xib */; }; 2640FAE61B01477A00E359D6 /* VLCPlexWebAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 2640FAE51B01477A00E359D6 /* VLCPlexWebAPI.m */; }; 265D511C1922746C00E38383 /* VLCLocalPlexFolderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 265D51191922746C00E38383 /* VLCLocalPlexFolderListViewController.m */; }; 265D511D1922746C00E38383 /* VLCPlexParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 265D511B1922746C00E38383 /* VLCPlexParser.m */; }; 26D4AF8D1A78379000D5EC65 /* VLCSharedLibraryListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 26D4AF8A1A78379000D5EC65 /* VLCSharedLibraryListViewController.m */; }; 26D4AF8E1A78379000D5EC65 /* VLCSharedLibraryParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 26D4AF8C1A78379000D5EC65 /* VLCSharedLibraryParser.m */; }; 26E3A6FE1AAB76A100B32450 /* VLCPlexConnectServerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 26E3A6FD1AAB76A100B32450 /* VLCPlexConnectServerViewController.m */; }; - 26E3A7011AAB76D300B32450 /* VLCFuturePlexConnectServerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 26E3A6FF1AAB76D300B32450 /* VLCFuturePlexConnectServerViewController.xib */; }; 26E3A7021AAB76D300B32450 /* VLCPlexConnectServerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 26E3A7001AAB76D300B32450 /* VLCPlexConnectServerViewController.xib */; }; 26F1BFD01A770408001DF30C /* libMediaVLC.xml in Resources */ = {isa = PBXBuildFile; fileRef = 26F1BFCF1A770408001DF30C /* libMediaVLC.xml */; }; 29125E5617492219003F03E5 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 29125E5417492219003F03E5 /* index.html */; }; @@ -142,8 +140,8 @@ 7D7B17F01AD8052B003BF3D7 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D7B17EC1AD8052A003BF3D7 /* libc++.dylib */; }; 7D7B17F11AD8052B003BF3D7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D7B17ED1AD8052B003BF3D7 /* libz.dylib */; }; 7D871F521AD7257100348D27 /* UIImage+Scaling.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D871F501AD7257100348D27 /* UIImage+Scaling.m */; }; - 7D89786F185DED88009BAB5D /* VLCFutureDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89786E185DED88009BAB5D /* VLCFutureDownloadViewController.xib */; }; - 7D89787D185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */; }; + 7D89786F185DED88009BAB5D /* VLCDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */; }; + 7D89787D185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D89787C185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib */; }; 7D897895185E14A7009BAB5D /* libGTLTouchStaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D897894185E14A7009BAB5D /* libGTLTouchStaticLib.a */; }; 7D9289751877459B009108FD /* VLCFirstStepsThirdPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9289731877459B009108FD /* VLCFirstStepsThirdPageViewController.m */; }; 7D9289761877459B009108FD /* VLCFirstStepsThirdPageViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D9289741877459B009108FD /* VLCFirstStepsThirdPageViewController~iphone.xib */; }; @@ -166,20 +164,15 @@ 7DBBF182183AB3B80009A339 /* VLCAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DBBF181183AB3B80009A339 /* VLCAppDelegate.m */; }; 7DBBF19A183AB4300009A339 /* VLCCloudStorageTableViewCell~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF185183AB4300009A339 /* VLCCloudStorageTableViewCell~ipad.xib */; }; 7DBBF19B183AB4300009A339 /* VLCCloudStorageTableViewCell~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF186183AB4300009A339 /* VLCCloudStorageTableViewCell~iphone.xib */; }; - 7DBBF19C183AB4300009A339 /* VLCDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF187183AB4300009A339 /* VLCDownloadViewController.xib */; }; 7DBBF19D183AB4300009A339 /* VLCCloudStorageTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF188183AB4300009A339 /* VLCCloudStorageTableViewController.xib */; }; 7DBBF19E183AB4300009A339 /* VLCEmptyLibraryView~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF189183AB4300009A339 /* VLCEmptyLibraryView~ipad.xib */; }; 7DBBF19F183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18A183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib */; }; - 7DBBF1A0183AB4300009A339 /* VLCFuturePlaylistCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18B183AB4300009A339 /* VLCFuturePlaylistCollectionViewCell.xib */; }; - 7DBBF1A1183AB4300009A339 /* VLCFuturePlaylistTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18C183AB4300009A339 /* VLCFuturePlaylistTableViewCell.xib */; }; + 7DBBF1A0183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18B183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */; }; + 7DBBF1A1183AB4300009A339 /* VLCPlaylistTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18C183AB4300009A339 /* VLCPlaylistTableViewCell.xib */; }; 7DBBF1A3183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */; }; 7DBBF1A4183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */; }; 7DBBF1A5183AB4300009A339 /* VLCMovieViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF190183AB4300009A339 /* VLCMovieViewController~ipad.xib */; }; 7DBBF1A6183AB4300009A339 /* VLCMovieViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF191183AB4300009A339 /* VLCMovieViewController~iphone.xib */; }; - 7DBBF1A7183AB4300009A339 /* VLCNetworkLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF192183AB4300009A339 /* VLCNetworkLoginViewController.xib */; }; - 7DBBF1A8183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF193183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib */; }; - 7DBBF1A9183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF194183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */; }; - 7DBBF1AB183AB4300009A339 /* VLCPlaylistTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF196183AB4300009A339 /* VLCPlaylistTableViewCell.xib */; }; 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 */; }; @@ -208,7 +201,7 @@ 8F91EC7F195E1DAB00F5BCBA /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F91EC7E195E1DAB00F5BCBA /* AssetsLibrary.framework */; }; 9B088308183D7BEC004B5C2A /* VLCCloudStorageTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B088307183D7BEC004B5C2A /* VLCCloudStorageTableViewController.m */; }; 9B5BEF2917FBAEA50016F9CB /* GTLDrive_Sources.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B5BEF2717FBAEA50016F9CB /* GTLDrive_Sources.m */; }; - 9B9231C4185A703700F89498 /* VLCFutureNetworkLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B9231C3185A703700F89498 /* VLCFutureNetworkLoginViewController.xib */; }; + 9B9231C4185A703700F89498 /* VLCNetworkLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B9231C3185A703700F89498 /* VLCNetworkLoginViewController.xib */; }; 9BADAF45185FBD9D00108BD8 /* VLCFrostedGlasView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BADAF44185FBD9D00108BD8 /* VLCFrostedGlasView.m */; }; 9BE4D1CE183D76950006346C /* VLCCloudStorageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B0183A990F009EE944 /* VLCCloudStorageTableViewCell.m */; }; A7924696170F0BA90036AAF2 /* libMediaLibraryKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7924695170F0BA90036AAF2 /* libMediaLibraryKit.a */; }; @@ -292,7 +285,6 @@ /* Begin PBXFileReference section */ 262C71571A98FA9200F7ED34 /* VLCPlexMediaInformationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlexMediaInformationViewController.h; path = Sources/VLCPlexMediaInformationViewController.h; sourceTree = SOURCE_ROOT; }; 262C71581A98FA9200F7ED34 /* VLCPlexMediaInformationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlexMediaInformationViewController.m; path = Sources/VLCPlexMediaInformationViewController.m; sourceTree = SOURCE_ROOT; }; - 262C715A1A98FDE300F7ED34 /* VLCPlexMediaInformationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlexMediaInformationViewController.xib; path = Resources/VLCPlexMediaInformationViewController.xib; sourceTree = SOURCE_ROOT; }; 2640FAE41B01477A00E359D6 /* VLCPlexWebAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlexWebAPI.h; path = Sources/VLCPlexWebAPI.h; sourceTree = SOURCE_ROOT; }; 2640FAE51B01477A00E359D6 /* VLCPlexWebAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlexWebAPI.m; path = Sources/VLCPlexWebAPI.m; sourceTree = SOURCE_ROOT; }; 265D51181922746C00E38383 /* VLCLocalPlexFolderListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLocalPlexFolderListViewController.h; path = Sources/VLCLocalPlexFolderListViewController.h; sourceTree = SOURCE_ROOT; }; @@ -305,7 +297,6 @@ 26D4AF8C1A78379000D5EC65 /* VLCSharedLibraryParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCSharedLibraryParser.m; path = Sources/VLCSharedLibraryParser.m; sourceTree = SOURCE_ROOT; }; 26E3A6FC1AAB76A100B32450 /* VLCPlexConnectServerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlexConnectServerViewController.h; path = Sources/VLCPlexConnectServerViewController.h; sourceTree = SOURCE_ROOT; }; 26E3A6FD1AAB76A100B32450 /* VLCPlexConnectServerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlexConnectServerViewController.m; path = Sources/VLCPlexConnectServerViewController.m; sourceTree = SOURCE_ROOT; }; - 26E3A6FF1AAB76D300B32450 /* VLCFuturePlexConnectServerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFuturePlexConnectServerViewController.xib; path = Resources/VLCFuturePlexConnectServerViewController.xib; sourceTree = SOURCE_ROOT; }; 26E3A7001AAB76D300B32450 /* VLCPlexConnectServerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlexConnectServerViewController.xib; path = Resources/VLCPlexConnectServerViewController.xib; sourceTree = SOURCE_ROOT; }; 26F1BFCF1A770408001DF30C /* libMediaVLC.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = libMediaVLC.xml; sourceTree = ""; }; 29125E5417492219003F03E5 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; @@ -692,8 +683,8 @@ 7D8139D11865211900D65504 /* ms */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ms; path = "ms.lproj/badgeUnread~iphone.png"; sourceTree = ""; }; 7D871F4F1AD7257100348D27 /* UIImage+Scaling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+Scaling.h"; path = "Sources/UIImage+Scaling.h"; sourceTree = SOURCE_ROOT; }; 7D871F501AD7257100348D27 /* UIImage+Scaling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Scaling.m"; path = "Sources/UIImage+Scaling.m"; sourceTree = SOURCE_ROOT; }; - 7D89786E185DED88009BAB5D /* VLCFutureDownloadViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFutureDownloadViewController.xib; path = Resources/VLCFutureDownloadViewController.xib; sourceTree = SOURCE_ROOT; }; - 7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFutureOpenNetworkStreamViewController.xib; path = Resources/VLCFutureOpenNetworkStreamViewController.xib; sourceTree = SOURCE_ROOT; }; + 7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCDownloadViewController.xib; path = Resources/VLCDownloadViewController.xib; sourceTree = SOURCE_ROOT; }; + 7D89787C185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCOpenNetworkStreamViewController.xib; path = Resources/VLCOpenNetworkStreamViewController.xib; sourceTree = SOURCE_ROOT; }; 7D897894185E14A7009BAB5D /* libGTLTouchStaticLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGTLTouchStaticLib.a; path = External/gtl/libGTLTouchStaticLib.a; sourceTree = ""; }; 7D9289721877459B009108FD /* VLCFirstStepsThirdPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCFirstStepsThirdPageViewController.h; path = Sources/VLCFirstStepsThirdPageViewController.h; sourceTree = SOURCE_ROOT; }; 7D9289731877459B009108FD /* VLCFirstStepsThirdPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCFirstStepsThirdPageViewController.m; path = Sources/VLCFirstStepsThirdPageViewController.m; sourceTree = SOURCE_ROOT; }; @@ -733,20 +724,15 @@ 7DBBF181183AB3B80009A339 /* VLCAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCAppDelegate.m; path = Sources/VLCAppDelegate.m; sourceTree = SOURCE_ROOT; }; 7DBBF185183AB4300009A339 /* VLCCloudStorageTableViewCell~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCCloudStorageTableViewCell~ipad.xib"; path = "Resources/VLCCloudStorageTableViewCell~ipad.xib"; sourceTree = SOURCE_ROOT; }; 7DBBF186183AB4300009A339 /* VLCCloudStorageTableViewCell~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCCloudStorageTableViewCell~iphone.xib"; path = "Resources/VLCCloudStorageTableViewCell~iphone.xib"; sourceTree = SOURCE_ROOT; }; - 7DBBF187183AB4300009A339 /* VLCDownloadViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCDownloadViewController.xib; path = Resources/VLCDownloadViewController.xib; sourceTree = SOURCE_ROOT; }; 7DBBF188183AB4300009A339 /* VLCCloudStorageTableViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCCloudStorageTableViewController.xib; path = Resources/VLCCloudStorageTableViewController.xib; sourceTree = SOURCE_ROOT; }; 7DBBF189183AB4300009A339 /* VLCEmptyLibraryView~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCEmptyLibraryView~ipad.xib"; path = "Resources/VLCEmptyLibraryView~ipad.xib"; sourceTree = SOURCE_ROOT; }; 7DBBF18A183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCEmptyLibraryView~iphone.xib"; path = "Resources/VLCEmptyLibraryView~iphone.xib"; sourceTree = SOURCE_ROOT; }; - 7DBBF18B183AB4300009A339 /* VLCFuturePlaylistCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFuturePlaylistCollectionViewCell.xib; path = Resources/VLCFuturePlaylistCollectionViewCell.xib; sourceTree = SOURCE_ROOT; }; - 7DBBF18C183AB4300009A339 /* VLCFuturePlaylistTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFuturePlaylistTableViewCell.xib; path = Resources/VLCFuturePlaylistTableViewCell.xib; sourceTree = SOURCE_ROOT; }; + 7DBBF18B183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistCollectionViewCell.xib; path = Resources/VLCPlaylistCollectionViewCell.xib; sourceTree = SOURCE_ROOT; }; + 7DBBF18C183AB4300009A339 /* VLCPlaylistTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistTableViewCell.xib; path = Resources/VLCPlaylistTableViewCell.xib; sourceTree = SOURCE_ROOT; }; 7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCLocalNetworkListCell~ipad.xib"; path = "Resources/VLCLocalNetworkListCell~ipad.xib"; sourceTree = SOURCE_ROOT; }; 7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCLocalNetworkListCell~iphone.xib"; path = "Resources/VLCLocalNetworkListCell~iphone.xib"; sourceTree = SOURCE_ROOT; }; 7DBBF190183AB4300009A339 /* VLCMovieViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMovieViewController~ipad.xib"; path = "Resources/VLCMovieViewController~ipad.xib"; sourceTree = SOURCE_ROOT; }; 7DBBF191183AB4300009A339 /* VLCMovieViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMovieViewController~iphone.xib"; path = "Resources/VLCMovieViewController~iphone.xib"; sourceTree = SOURCE_ROOT; }; - 7DBBF192183AB4300009A339 /* VLCNetworkLoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCNetworkLoginViewController.xib; path = Resources/VLCNetworkLoginViewController.xib; sourceTree = SOURCE_ROOT; }; - 7DBBF193183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCOpenNetworkStreamViewController.xib; path = Resources/VLCOpenNetworkStreamViewController.xib; sourceTree = SOURCE_ROOT; }; - 7DBBF194183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistCollectionViewCell.xib; path = Resources/VLCPlaylistCollectionViewCell.xib; sourceTree = SOURCE_ROOT; }; - 7DBBF196183AB4300009A339 /* VLCPlaylistTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistTableViewCell.xib; path = Resources/VLCPlaylistTableViewCell.xib; sourceTree = SOURCE_ROOT; }; 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; }; @@ -817,7 +803,7 @@ 9B088307183D7BEC004B5C2A /* VLCCloudStorageTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCCloudStorageTableViewController.m; path = Sources/VLCCloudStorageTableViewController.m; sourceTree = SOURCE_ROOT; }; 9B5BEF2717FBAEA50016F9CB /* GTLDrive_Sources.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTLDrive_Sources.m; path = ImportedSources/GDrive/Services/Drive/Generated/GTLDrive_Sources.m; sourceTree = SOURCE_ROOT; }; 9B5BEF2817FBAEA50016F9CB /* GTLDrive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTLDrive.h; path = ImportedSources/GDrive/Services/Drive/Generated/GTLDrive.h; sourceTree = SOURCE_ROOT; }; - 9B9231C3185A703700F89498 /* VLCFutureNetworkLoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCFutureNetworkLoginViewController.xib; path = Resources/VLCFutureNetworkLoginViewController.xib; sourceTree = SOURCE_ROOT; }; + 9B9231C3185A703700F89498 /* VLCNetworkLoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCNetworkLoginViewController.xib; path = Resources/VLCNetworkLoginViewController.xib; sourceTree = SOURCE_ROOT; }; 9BADAF43185FBD9D00108BD8 /* VLCFrostedGlasView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCFrostedGlasView.h; path = Sources/VLCFrostedGlasView.h; sourceTree = SOURCE_ROOT; }; 9BADAF44185FBD9D00108BD8 /* VLCFrostedGlasView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCFrostedGlasView.m; path = Sources/VLCFrostedGlasView.m; sourceTree = SOURCE_ROOT; }; A7035BBD174519600057DFA7 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = ""; }; @@ -1391,10 +1377,8 @@ children = ( 7DBBF189183AB4300009A339 /* VLCEmptyLibraryView~ipad.xib */, 7DBBF18A183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib */, - 7DBBF18B183AB4300009A339 /* VLCFuturePlaylistCollectionViewCell.xib */, - 7DBBF18C183AB4300009A339 /* VLCFuturePlaylistTableViewCell.xib */, - 7DBBF194183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */, - 7DBBF196183AB4300009A339 /* VLCPlaylistTableViewCell.xib */, + 7DBBF18B183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */, + 7DBBF18C183AB4300009A339 /* VLCPlaylistTableViewCell.xib */, ); name = Library; sourceTree = ""; @@ -1402,16 +1386,11 @@ 7D6BEF1F19E027DA00DF3972 /* Download & Network */ = { isa = PBXGroup; children = ( - 7DBBF187183AB4300009A339 /* VLCDownloadViewController.xib */, - 7D89786E185DED88009BAB5D /* VLCFutureDownloadViewController.xib */, + 7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */, 7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */, 7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */, - 7DBBF192183AB4300009A339 /* VLCNetworkLoginViewController.xib */, - 9B9231C3185A703700F89498 /* VLCFutureNetworkLoginViewController.xib */, - 7DBBF193183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib */, - 7D89787C185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib */, - 262C715A1A98FDE300F7ED34 /* VLCPlexMediaInformationViewController.xib */, - 26E3A6FF1AAB76D300B32450 /* VLCFuturePlexConnectServerViewController.xib */, + 9B9231C3185A703700F89498 /* VLCNetworkLoginViewController.xib */, + 7D89787C185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib */, 26E3A7001AAB76D300B32450 /* VLCPlexConnectServerViewController.xib */, ); name = "Download & Network"; @@ -1957,11 +1936,9 @@ 7AC862A81765E9510011611A /* jquery.iframe-transport.js in Resources */, 7AC862A91765E9510011611A /* jquery.ui.widget.js in Resources */, A79246C8170F11DF0036AAF2 /* Localizable.strings in Resources */, - 9B9231C4185A703700F89498 /* VLCFutureNetworkLoginViewController.xib in Resources */, + 9B9231C4185A703700F89498 /* VLCNetworkLoginViewController.xib in Resources */, 7D1516431868D7E0004B18F3 /* VLCFirstStepsFirstPageViewController~iphone.xib in Resources */, 7DF04F4E1961F2B8004A5429 /* web-download.png in Resources */, - 7DBBF1A8183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib in Resources */, - 7DBBF1A9183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib in Resources */, 7DA8B0FB173318E80029698C /* SourceCodePro-Regular.ttf in Resources */, 41B93C081A53853B00102E8B /* VLCCloudServiceCell.xib in Resources */, 29125E5617492219003F03E5 /* index.html in Resources */, @@ -1970,7 +1947,6 @@ 7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */, 7DBBF1A4183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib in Resources */, 7DF04F501961F2B8004A5429 /* web-open.png in Resources */, - 7DBBF1A7183AB4300009A339 /* VLCNetworkLoginViewController.xib in Resources */, 7D9870661A3E03D5009CF27D /* papasscode_failed_bg.png in Resources */, 7D9870681A3E03D5009CF27D /* papasscode_marker.png in Resources */, 7D32B384185E293D006CA474 /* Raleway.woff in Resources */, @@ -1980,7 +1956,6 @@ 7DE1862C175BA9A9006C0173 /* badgeUnread@2x~iphone.png in Resources */, 7DE1862F175BA9AC006C0173 /* badgeUnread~ipad.png in Resources */, 7DBBF19B183AB4300009A339 /* VLCCloudStorageTableViewCell~iphone.xib in Resources */, - 262C715B1A98FDE300F7ED34 /* VLCPlexMediaInformationViewController.xib in Resources */, 7DE18632175BA9AF006C0173 /* badgeUnread~iphone.png in Resources */, 26E3A7021AAB76D300B32450 /* VLCPlexConnectServerViewController.xib in Resources */, 7DBBF19F183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib in Resources */, @@ -1990,26 +1965,23 @@ 41273A3D1A955C4100A2EF77 /* VLCMigrationViewController.xib in Resources */, 7DBBF19D183AB4300009A339 /* VLCCloudStorageTableViewController.xib in Resources */, 7D9289761877459B009108FD /* VLCFirstStepsThirdPageViewController~iphone.xib in Resources */, - 7DBBF1AB183AB4300009A339 /* VLCPlaylistTableViewCell.xib in Resources */, 7DBBF19E183AB4300009A339 /* VLCEmptyLibraryView~ipad.xib in Resources */, 7D63C19518774E0100BD5256 /* VLCFirstStepsThirdPageViewController~ipad.xib in Resources */, 7D9870651A3E03D5009CF27D /* papasscode_background@2x.png in Resources */, - 7DBBF1A1183AB4300009A339 /* VLCFuturePlaylistTableViewCell.xib in Resources */, + 7DBBF1A1183AB4300009A339 /* VLCPlaylistTableViewCell.xib in Resources */, 7DBBF1AC183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib in Resources */, - 7DBBF19C183AB4300009A339 /* VLCDownloadViewController.xib in Resources */, 7D63C19718774F1000BD5256 /* VLCFirstStepsFourthPageViewController~ipad.xib in Resources */, 7DBC85631A50B8860098D388 /* LiveAuthDialog_iPad.xib in Resources */, 7DBBF1A3183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib in Resources */, 7DBBF1A5183AB4300009A339 /* VLCMovieViewController~ipad.xib in Resources */, 26F1BFD01A770408001DF30C /* libMediaVLC.xml in Resources */, 7DBBF1A6183AB4300009A339 /* VLCMovieViewController~iphone.xib in Resources */, - 7D89787D185DF794009BAB5D /* VLCFutureOpenNetworkStreamViewController.xib in Resources */, + 7D89787D185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib in Resources */, 7D27EC2C19DF310300EF0370 /* VLCFirstStepsSecondPageViewController~iphone.xib in Resources */, 7AC8629D1765DC560011611A /* style.css in Resources */, 7DD2A3A9179C04A7003EB537 /* OpenSans-Regular.ttf in Resources */, 7D27EC2B19DF310300EF0370 /* VLCFirstStepsSecondPageViewController~ipad.xib in Resources */, - 26E3A7011AAB76D300B32450 /* VLCFuturePlexConnectServerViewController.xib in Resources */, - 7DBBF1A0183AB4300009A339 /* VLCFuturePlaylistCollectionViewCell.xib in Resources */, + 7DBBF1A0183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib in Resources */, 7D711ADA18227A490094E4F0 /* GTMOAuth2ViewTouch.xib in Resources */, 417CDA241A48D1F300D9ACE7 /* VLCCloudServicesTableViewController.xib in Resources */, 7D9870671A3E03D5009CF27D /* papasscode_failed_bg@2x.png in Resources */, @@ -2020,7 +1992,7 @@ 7D0117F1187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib in Resources */, 7D63C1991877504B00BD5256 /* VLCFirstStepsSixthPageViewController~ipad.xib in Resources */, 7DF04F4D1961F2B8004A5429 /* web-download-fixed.png in Resources */, - 7D89786F185DED88009BAB5D /* VLCFutureDownloadViewController.xib in Resources */, + 7D89786F185DED88009BAB5D /* VLCDownloadViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2847,7 +2819,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Sources/VLC for iOS-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/External/MediaLibraryKit\"", @@ -2903,7 +2875,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Sources/VLC for iOS-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/External/MediaLibraryKit\"", @@ -2986,7 +2958,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Sources/VLC for iOS-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/External/MediaLibraryKit\"", diff --git a/compileVLCforiOS.sh b/compileVLCforiOS.sh index 9cb7b6bce283f000186bf2c1e51a2c9091bd1034..2411c68797049052d904a1ed679135dedfe05867 100755 --- a/compileVLCforiOS.sh +++ b/compileVLCforiOS.sh @@ -6,13 +6,13 @@ set -e PLATFORM=iphoneos SDK=`xcrun --sdk iphoneos --show-sdk-version` -SDK_MIN=6.1 +SDK_MIN=7.0 VERBOSE=no CONFIGURATION="Release" NONETWORK=no SKIPLIBVLCCOMPILATION=no -TESTEDVLCKITHASH=0c8eec04 +TESTEDVLCKITHASH=ae8c1142 TESTEDMEDIALIBRARYKITHASH=d7e992d4 usage() @@ -178,6 +178,7 @@ fi if ! [ -e GDrive ]; then svn checkout http://google-api-objectivec-client.googlecode.com/svn/trunk/Source GDrive cd GDrive && patch -p0 < ../../patches/gdrive/upgrade-default-target.patch && cd .. +cd GDrive/HTTPFetcher && patch -p0 < ../../../patches/gdrive/httpfetcher-compilation-fix.diff && cd ../.. else cd GDrive && svn up && cd .. fi diff --git a/patches/gdrive/httpfetcher-compilation-fix.diff b/patches/gdrive/httpfetcher-compilation-fix.diff new file mode 100644 index 0000000000000000000000000000000000000000..e1ab86cdb6eecdc5922ab06a84699cbe731738da --- /dev/null +++ b/patches/gdrive/httpfetcher-compilation-fix.diff @@ -0,0 +1,13 @@ +Index: GTMGatherInputStream.m +=================================================================== +--- GTMGatherInputStream.m (revision 143) ++++ GTMGatherInputStream.m (working copy) +@@ -18,7 +18,7 @@ + @implementation GTMGatherInputStream + + + (NSInputStream *)streamWithArray:(NSArray *)dataArray { +- return [[[self alloc] initWithArray:dataArray] autorelease]; ++ return [[[GTMGatherInputStream alloc] initWithArray:dataArray] autorelease]; + } + + - (id)initWithArray:(NSArray *)dataArray { diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json index 43cfd4f0fceff867734eb6db6cbcafc9945f5ad4..ed823689e81efb6c634dad6aacc73022a389693a 100644 --- a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -77,21 +77,18 @@ "orientation" : "portrait", "idiom" : "iphone", "extent" : "full-screen", - "filename" : "Default~iphone.png", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "iphone", "extent" : "full-screen", - "filename" : "Default@2x~iphone.png", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", "extent" : "full-screen", - "filename" : "Default-568h@2x~iphone.png", "subtype" : "retina4", "scale" : "2x" }, @@ -99,7 +96,6 @@ "orientation" : "portrait", "idiom" : "ipad", "extent" : "to-status-bar", - "filename" : "Default~ipad.png", "scale" : "1x" }, { @@ -112,7 +108,6 @@ "orientation" : "landscape", "idiom" : "ipad", "extent" : "to-status-bar", - "filename" : "Default-Landscape~ipad.png", "scale" : "1x" }, { @@ -125,7 +120,6 @@ "orientation" : "portrait", "idiom" : "ipad", "extent" : "to-status-bar", - "filename" : "Default-Portrait@2x~ipad.png", "scale" : "2x" }, { @@ -138,7 +132,6 @@ "orientation" : "landscape", "idiom" : "ipad", "extent" : "to-status-bar", - "filename" : "Default-Landscape@2x~ipad.png", "scale" : "2x" }, { diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png deleted file mode 100644 index 027e0a2e8797522d2b70752af93d4c2e5a3b0424..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x~iphone.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png deleted file mode 100644 index a8ac76ff8de160fe15815870382a963c728fdbf6..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png deleted file mode 100644 index f77a201564a21db8bde7c32bcfcb1d1a1ebd0143..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png deleted file mode 100644 index 477f16c35f49b5eeb0386a73ee0524b85e7184aa..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x~iphone.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x~iphone.png deleted file mode 100644 index 420f45b5a7e57053cf1880ef1700b5d984252a0c..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x~iphone.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~ipad.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~ipad.png deleted file mode 100644 index 1d9f8b0bd33093001fcd52f58ad383bc1aa19242..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~ipad.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~iphone.png b/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~iphone.png deleted file mode 100644 index 192a2319d2bda05296cc5385ba49b450bdb6ae0c..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/LaunchImage.launchimage/Default~iphone.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/Contents.json deleted file mode 100644 index e456a7ac0bf0b40bff4409cfbc83b19ef8d47c60..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "DeleteButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "DeleteButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton.png b/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton.png deleted file mode 100644 index 28e6f5c064020bb281d578a136d70f52c3cd570f..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton@2x.png b/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton@2x.png deleted file mode 100644 index 8d99e2dd6e3482956d3c208a82c0363af1f27c7b..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/DeleteButton.imageset/DeleteButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/backButton.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/backButton.imageset/Contents.json deleted file mode 100644 index b12e6c530db7975079948fce01194f8fe82f21ab..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/backButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "backButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "backButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton.png b/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton.png deleted file mode 100644 index 2a926f68f3a16949a42a4db10c9f7bb7422a6374..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton@2x.png b/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton@2x.png deleted file mode 100644 index 6b26c24bcf069120630fc622925cbbd08ee170f5..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/backButton.imageset/backButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/Contents.json deleted file mode 100644 index dfda130114480892707e78c8430c260754be70e4..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "backButtonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "backButtonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight.png b/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight.png deleted file mode 100644 index 96f96e446ece4c915d70a9786afe74181289d787..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight@2x.png b/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight@2x.png deleted file mode 100644 index 8b497e48f7df0e7b119ac9db33975eb5075a55b5..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/backButtonHighlight.imageset/backButtonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/button.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/button.imageset/Contents.json deleted file mode 100644 index d9b04a91e1673125908dfdd116549a3d1595fa74..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/button.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "button.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "button@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/button.imageset/button.png b/vlc-ios/Images.xcassets/Library View/button.imageset/button.png deleted file mode 100644 index 0bdc2941c76b7fa80d73f9beab080aec7ce47a89..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/button.imageset/button.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/button.imageset/button@2x.png b/vlc-ios/Images.xcassets/Library View/button.imageset/button@2x.png deleted file mode 100644 index 144f8f10f655da2dcb7aa066f03e59e4503b32e0..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/button.imageset/button@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/Contents.json deleted file mode 100644 index ad36914643ac09df0f1de32a0589c4c9e6c453cd..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "buttonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "buttonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight.png b/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight.png deleted file mode 100644 index 9062047057afff1f8dc0b7a6e2c1ab1cbc96f150..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight@2x.png b/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight@2x.png deleted file mode 100644 index 5911c718176a61bee6cef53499a995108447d455..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/buttonHighlight.imageset/buttonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/Contents.json deleted file mode 100644 index 2a1a4b31561cfc88b0d6b0d29224c7c1d1ce11ea..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "checkbox-legacy-empty.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "checkbox-legacy-empty@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty.png b/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty.png deleted file mode 100644 index 941bf3408d82dca8c9b887c207450beccc70907d..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty@2x.png b/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty@2x.png deleted file mode 100644 index 26d7dcff9d4bde90d713bfeb3c52e6525900353a..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/checkbox-legacy-empty.imageset/checkbox-legacy-empty@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/Contents.json deleted file mode 100644 index 6c7f05b13cf97e57ce611058a685db28374c27f3..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "checkbox-legacy.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "checkbox-legacy@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy.png b/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy.png deleted file mode 100644 index 1d9b12b34abd766b819e9cfbdd0dc9dd2c705a18..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy@2x.png b/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy@2x.png deleted file mode 100644 index bca5c479d2ecc6dfc54f3c0213ea4a66d312f0ca..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/checkbox-legacy.imageset/checkbox-legacy@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/doneButton.imageset/Contents.json deleted file mode 100644 index bed3e69c551bdeb17e9c21aeb571a2467f7780ca..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "doneButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "doneButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton.png b/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton.png deleted file mode 100644 index 4bee0f470652ea9a0ff0d656ed29542b677c32f1..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton@2x.png b/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton@2x.png deleted file mode 100644 index 28ac68dc612a7ea400671ca8e906364e347996b5..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/doneButton.imageset/doneButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/Contents.json deleted file mode 100644 index e3c02a885891a2922c881ae9837b39690b5c1051..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "doneButtonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "doneButtonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight.png b/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight.png deleted file mode 100644 index edaa2b629b0cf0ecd8cfac30faeba8cb5e0198a1..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight@2x.png b/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight@2x.png deleted file mode 100644 index a8da6966c997fc97bf184b4cbdcfb9ccda4a3a18..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/doneButtonHighlight.imageset/doneButtonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/Contents.json deleted file mode 100644 index 319acf419e061ea34bd222c762a19f0b1d6555c8..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "navBarBackground.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "navBarBackground@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground.png b/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground.png deleted file mode 100644 index 9ba39c79bfe0ee7adfeb2b5685478e0703f5c1bc..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground@2x.png b/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground@2x.png deleted file mode 100644 index 770c413f91b6b65565ed90746fe918d3740ce455..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/navBarBackground.imageset/navBarBackground@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/Contents.json deleted file mode 100644 index 79e731e39b9ba379b050286648bfc112c03b5ca3..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "thumbOverlay.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "thumbOverlay@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay.png b/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay.png deleted file mode 100644 index 8ad86badc100cb96ce80c5d233ccf10e93274f69..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay@2x.png b/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay@2x.png deleted file mode 100644 index df3432e069c662bb3ccc68a3fa3a58e58abca126..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/thumbOverlay.imageset/thumbOverlay@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/Contents.json b/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/Contents.json deleted file mode 100644 index a6d60f6c141e51a9ac62c203d1f51c66e777cb52..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "thumbOverlayPhone.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "thumbOverlayPhone@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone.png b/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone.png deleted file mode 100644 index 83196f6a8aa0836094a0ad23d2b2573064e16596..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone@2x.png b/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone@2x.png deleted file mode 100644 index b31cf5b4424c423e623e6a40699f40216de26fbd..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Library View/thumbOverlayPhone.imageset/thumbOverlayPhone@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/Contents.json deleted file mode 100644 index 8eea6a4847cf1698b5236e8f2ff414c5e694d63b..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "ballSlider.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "ballSlider@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider.png b/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider.png deleted file mode 100644 index 752eaed2dc9e1aa147485e3588a996db2c66c855..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider@2x.png b/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider@2x.png deleted file mode 100644 index af668355e3f6cb9c139556e1ae5766f8db27e99d..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ballSlider.imageset/ballSlider@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/Contents.json deleted file mode 100644 index d5cd26f9217dc9e1315a4ad784e36df935b1acd4..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "knobSlider.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "knobSlider@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider.png b/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider.png deleted file mode 100644 index af750a2c24f97f56880d26714143d3406900eedb..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider@2x.png b/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider@2x.png deleted file mode 100644 index 115d2bb9bcb00bc3b690eb455ec7f86972552018..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/knobSlider.imageset/knobSlider@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/Contents.json deleted file mode 100644 index 983914a6b9033399dd6bbc57e440d187882e1082..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "playbackControllerBg.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "playbackControllerBg@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg.png b/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg.png deleted file mode 100644 index a57d054468426113116415035f0c57aa09ccb394..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg@2x.png b/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg@2x.png deleted file mode 100644 index b89a32badd1c634853ddd2d3a8cd34e3059d9340..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackControllerBg.imageset/playbackControllerBg@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/Contents.json deleted file mode 100644 index 52ffdb3f1188d738ac4f7b2be567f0d32359efac..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "playbackDoneButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "playbackDoneButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton.png b/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton.png deleted file mode 100644 index 1399fa19057d01d9bfdc6cee05061d967a998a9f..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton@2x.png b/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton@2x.png deleted file mode 100644 index 1aafdb19c641fa89d22460afca8a6795dd1874e4..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackDoneButton.imageset/playbackDoneButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/Contents.json deleted file mode 100644 index d9d68b29739b36d243e380de3144c31880a84df6..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "playbackDoneButtonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "playbackDoneButtonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight.png b/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight.png deleted file mode 100644 index e462d3425fb77272ffb3a504f3b5d4d181c8536f..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight@2x.png b/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight@2x.png deleted file mode 100644 index c5c156fad5b928abd6e1ae5909e46f98a25977a6..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/playbackDoneButtonHighlight.imageset/playbackDoneButtonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/Contents.json deleted file mode 100644 index c072b9618808b091a6ac11e085d1fda7cdf3cc28..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "ratioButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "ratioButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton.png b/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton.png deleted file mode 100644 index 709a20a776fdc136f64f64eed3b6d6058236dc42..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton@2x.png b/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton@2x.png deleted file mode 100644 index ef4fc1dc6eae6d26f9563bf40fa3f5eee6f29db9..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ratioButton.imageset/ratioButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/Contents.json deleted file mode 100644 index 3aafafc3f786685e9d76950fda5574381de9628c..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "ratioButtonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "ratioButtonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight.png b/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight.png deleted file mode 100644 index 4b8c3431f5bc799e4ff469863784407d82387a2a..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight@2x.png b/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight@2x.png deleted file mode 100644 index 9df264500775176cee18179bc9f424c3d7c4e5e7..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/ratioButtonHighlight.imageset/ratioButtonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/Contents.json deleted file mode 100644 index aabc3af952d25d708041348da42692c0ac664028..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "seekbarBg.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "seekbarBg@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg.png b/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg.png deleted file mode 100644 index 7b40ade0c26ee0b83554c6b4c8427c1f6ff38ea7..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg@2x.png b/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg@2x.png deleted file mode 100644 index b9b936cc1f349a277b5c51494c989b77d7d7d9dc..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/seekbarBg.imageset/seekbarBg@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/Contents.json similarity index 100% rename from vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/Contents.json rename to vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/Contents.json diff --git a/vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob.png b/vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob.png similarity index 100% rename from vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob.png rename to vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob.png diff --git a/vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob@2x.png b/vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob@2x.png similarity index 100% rename from vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob@2x.png rename to vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob@2x.png diff --git a/vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob@3x.png b/vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob@3x.png similarity index 100% rename from vlc-ios/Images.xcassets/Movie View/modernSliderKnob.imageset/modernSliderKnob@3x.png rename to vlc-ios/Images.xcassets/Movie View/sliderKnob.imageset/modernSliderKnob@3x.png diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/Contents.json deleted file mode 100644 index bd4236c7c626d2b79f77bbbeea17cae8c8d58262..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "slidermaxValue.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "slidermaxValue@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue.png b/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue.png deleted file mode 100644 index 3aeed11ef82e6a57248d8273b32922134664034f..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue@2x.png b/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue@2x.png deleted file mode 100644 index 5df0d7513769cbc4e7a729d2fff9ced7b2984e3b..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/slidermaxValue.imageset/slidermaxValue@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/Contents.json deleted file mode 100644 index 61ed46846027853aa1ddd5608aa18a3f15387ae1..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "slidermaximumTrack.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "slidermaximumTrack@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack.png b/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack.png deleted file mode 100644 index ed11010b6d73b0b4b925eb563c0956ced80ae081..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack@2x.png b/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack@2x.png deleted file mode 100644 index 76c5f6ea836fecf5716e5f4cc370b8040665e74e..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/slidermaximumTrack.imageset/slidermaximumTrack@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/Contents.json deleted file mode 100644 index f37b1b9d98d01c5fc3b05cc8d5e3bd999289a2d7..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "sliderminiValue.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "sliderminiValue@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue.png b/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue.png deleted file mode 100644 index 00be2110605b28922bb790c3ed6a207cb3e39036..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue@2x.png b/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue@2x.png deleted file mode 100644 index d221a53e6a9350d1177905cba08ceb4dce5bb098..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/sliderminiValue.imageset/sliderminiValue@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/Contents.json deleted file mode 100644 index 00052844ab6bebf0450e92f4e0fdceb040f573d3..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "sliderminimumTrack.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "sliderminimumTrack@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack.png b/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack.png deleted file mode 100644 index 1c9d0a543fcada6908873e0e89329fd87cfbff89..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack@2x.png b/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack@2x.png deleted file mode 100644 index eda2c52c1f5c637b1638a1625a7dd35ff5aa8763..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/sliderminimumTrack.imageset/sliderminimumTrack@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/Contents.json b/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/Contents.json deleted file mode 100644 index 7998449a9938134df27fc2f9fa71ca80c49a0766..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "volumeballslider.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "volumeballslider@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider.png b/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider.png deleted file mode 100644 index 696b80a74738d20f26ccdd3bc86eb4957d6fe57b..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider@2x.png b/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider@2x.png deleted file mode 100644 index 8e67f73c5f17b5998f1d69298fad6c0fd7d93998..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/Movie View/volumeballslider.imageset/volumeballslider@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/Contents.json b/vlc-ios/Images.xcassets/bottomBlackBar.imageset/Contents.json deleted file mode 100644 index 48ebc7303f49f8d1ae9e9f367cc8d8fe40dc55cc..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "bottomBlackBar.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "bottomBlackBar@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "bottomBlackBar@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar.png b/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar.png deleted file mode 100644 index dc35dcb57ec4b3c531218f3d1d20b35c8bc98be1..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@2x.png b/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@2x.png deleted file mode 100644 index 96928b598e6246843ac075d9b1acab94c8c3f6d3..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@3x.png b/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@3x.png deleted file mode 100644 index b27dd3a122c17d914a1f36676c08152832b9a630..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/bottomBlackBar.imageset/bottomBlackBar@3x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/Contents.json b/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/Contents.json deleted file mode 100644 index 2204889e3a30b798d167a7cffa8d700b4bac01fa..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "darkButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "darkButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton.png b/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton.png deleted file mode 100644 index f80ecdbab7946952d33dd1ed786bda242de49475..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton@2x.png b/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton@2x.png deleted file mode 100644 index 32be0e5d9162d9b11328f4227d71ec2b1f894b1a..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/cloudServices/darkButton.imageset/darkButton@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/Contents.json b/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/Contents.json deleted file mode 100644 index db637bf8573a5821b3bbb1e6a4c8d0da0ca587a8..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "darkButtonHighlight.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "darkButtonHighlight@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight.png b/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight.png deleted file mode 100644 index 99e36fabf2f16acf6735c4376ddc9bcdfba005c6..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight@2x.png b/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight@2x.png deleted file mode 100644 index 098e9c9a416f1d758c658dc7d5cde20983a411cf..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/cloudServices/darkButtonHighlight.imageset/darkButtonHighlight@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/About.imageset/About.png b/vlc-ios/Images.xcassets/menu/About.imageset/About.png deleted file mode 100644 index 304c6d1eab429cc64e7c03ff62a462e7ce1bd6ea..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/About.imageset/About.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/About.imageset/About@2x.png b/vlc-ios/Images.xcassets/menu/About.imageset/About@2x.png deleted file mode 100644 index 3fcd3c37e99f85580e3ceea5acb9f481f3ef8ff5..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/About.imageset/About@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/About.imageset/Contents.json b/vlc-ios/Images.xcassets/menu/About.imageset/Contents.json deleted file mode 100644 index 001126dc8cfe79e2fe9b572ec8e15adfdf673867..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/menu/About.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "About.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "About@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/menu/input.imageset/Contents.json b/vlc-ios/Images.xcassets/menu/input.imageset/Contents.json deleted file mode 100644 index 5a611282c0a9b3a07954962062dc2f8290aa290b..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/menu/input.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "input.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "input@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/menu/input.imageset/input.png b/vlc-ios/Images.xcassets/menu/input.imageset/input.png deleted file mode 100644 index 42b319d03e4e6d8f42fed8753e530c515a0a6cfc..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/input.imageset/input.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/input.imageset/input@2x.png b/vlc-ios/Images.xcassets/menu/input.imageset/input@2x.png deleted file mode 100644 index 83d0284b0ba033d48dd2ac876084265c8ddc1b52..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/input.imageset/input@2x.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/menuButton.imageset/Contents.json b/vlc-ios/Images.xcassets/menu/menuButton.imageset/Contents.json deleted file mode 100644 index 25ef9b9c1c9655cb73a8a4b68c56d426dee3e341..0000000000000000000000000000000000000000 --- a/vlc-ios/Images.xcassets/menu/menuButton.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "menuButton.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "menuButton@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton.png b/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton.png deleted file mode 100644 index 769a4ceb251dadb00e421122c7ea2be142c1130e..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton.png and /dev/null differ diff --git a/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton@2x.png b/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton@2x.png deleted file mode 100644 index c93b50dda1e5279b9bac4e300f3bb211a7be8021..0000000000000000000000000000000000000000 Binary files a/vlc-ios/Images.xcassets/menu/menuButton.imageset/menuButton@2x.png and /dev/null differ