Sources/LocalNetworkConnectivity/RemoteNetworkDataSource.swift

@@ -32,7 +32,7 @@ protocol RemoteNetworkDataSourceDelegate {
 class RemoteNetworkDataSource: NSObject, UITableViewDataSource, UITableViewDelegate {
     let cloudVC = VLCCloudServicesTableViewController(nibName: "VLCCloudServicesTableViewController", bundle: Bundle.main)
     let streamingVC = VLCOpenNetworkStreamViewController(nibName: "VLCOpenNetworkStreamViewController", bundle: Bundle.main)
-    let downloadVC = VLCDownloadViewController(nibName: "VLCDownloadViewController", bundle: Bundle.main)
+    let downloadVC = VLCDownloadViewController.sharedInstance()
 
     @objc weak var delegate: RemoteNetworkDataSourceDelegate?
 
@@ -66,9 +66,9 @@ class RemoteNetworkDataSource: NSObject, UITableViewDataSource, UITableViewDeleg
             }
         case .download:
             if let networkCell = tableView.dequeueReusableCell(withIdentifier: VLCRemoteNetworkCell.cellIdentifier) {
-                networkCell.textLabel?.text = downloadVC.title
-                networkCell.detailTextLabel?.text = downloadVC.detailText
-                networkCell.imageView?.image = downloadVC.cellImage
+                networkCell.textLabel?.text = downloadVC?.title
+                networkCell.detailTextLabel?.text = downloadVC?.detailText
+                networkCell.imageView?.image = downloadVC?.cellImage
                 networkCell.accessibilityIdentifier = VLCAccessibilityIdentifier.downloads
                 return networkCell
             }

Sources/VLCDownloadViewController.m

@@ -112,10 +112,10 @@ typedef NS_ENUM(NSUInteger, VLCDownloadScheme) {
     self.downloadButton.backgroundColor = PresentationTheme.current.colors.orangeUI;
     self.whatToDownloadHelpLabel.textColor = PresentationTheme.current.colors.lightTextColor;
     self.progressContainer.backgroundColor = PresentationTheme.current.colors.cellBackgroundB;
-    self.currentDownloadLabel.textColor =  PresentationTheme.current.colors.cellBackgroundB;
-    self.progressPercent.textColor =  PresentationTheme.current.colors.cellBackgroundB;
-    self.speedRate.textColor =  PresentationTheme.current.colors.cellBackgroundB;
-    self.timeDL.textColor = PresentationTheme.current.colors.cellTextColor;
+    self.currentDownloadLabel.textColor =  PresentationTheme.current.colors.cellTextColor;
+    self.progressPercent.textColor =  PresentationTheme.current.colors.cellDetailTextColor;
+    self.speedRate.textColor =  PresentationTheme.current.colors.cellDetailTextColor;
+    self.timeDL.textColor = PresentationTheme.current.colors.cellDetailTextColor;
     [self.downloadsTable reloadData];
     [self setNeedsStatusBarAppearanceUpdate];
 }
@@ -169,7 +169,7 @@ typedef NS_ENUM(NSUInteger, VLCDownloadScheme) {
 
 - (void)_updateUI
 {
-    _currentDownloadType != VLCDownloadSchemeNone ? [self downloadStartedWithIdentifier:nil] : [self downloadEndedWithIdentifier:nil];
+    _currentDownloadType != VLCDownloadSchemeNone ? [self downloadStartedWithIdentifier:_currentDownloadIdentifier] : [self downloadEndedWithIdentifier:_currentDownloadIdentifier];
     [self.downloadsTable reloadData];
 }
 
@@ -420,8 +420,6 @@ typedef NS_ENUM(NSUInteger, VLCDownloadScheme) {
     UITableViewCell *cell = (UITableViewCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier];
-        cell.textLabel.textColor = PresentationTheme.current.colors.cellTextColor;
-        cell.detailTextLabel.textColor = PresentationTheme.current.colors.cellDetailTextColor;
     }
 
     NSInteger row = indexPath.row;
@@ -431,6 +429,8 @@ typedef NS_ENUM(NSUInteger, VLCDownloadScheme) {
         cell.textLabel.text = [[_currentDownloadFilename[row] lastPathComponent] stringByRemovingPercentEncoding];
 
     cell.detailTextLabel.text = [_currentDownloads[row] absoluteString];
+    cell.textLabel.textColor = PresentationTheme.current.colors.cellTextColor;
+    cell.detailTextLabel.textColor = PresentationTheme.current.colors.cellDetailTextColor;
 
     return cell;
 }
@@ -464,7 +464,8 @@ typedef NS_ENUM(NSUInteger, VLCDownloadScheme) {
         fileName = @"";
     [_currentDownloadFilename addObject:fileName];
     [self.downloadsTable reloadData];
-    [self _triggerNextDownload];
+    if (_currentDownloadType == VLCDownloadSchemeNone)
+        [self _triggerNextDownload];
 }
 
 #pragma mark - text view delegate

Sources/VLCHTTPFileDownloader.m

@@ -131,7 +131,7 @@
 
     downloadTask.sessionTask = sessionTask;
     [self _addDownloadTask:downloadTask identifier:identifier];
-
+    _downloadInProgress = YES;
     return identifier;
 }
 
@@ -241,7 +241,7 @@ willPerformHTTPRedirection:(NSHTTPURLResponse *)response
     }
 
     [self _removeDownloadWithIdentifier:identifier];
-
+    _downloadInProgress = NO;
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.delegate downloadEndedWithIdentifier:identifier];
     });

vlc-ios/Images.xcassets/MediaController/song-placeholder-white.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "song-placeholder-white.png",
+      "filename" : "song-placeholder-light.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "song-placeholder-white@2x.png",
+      "filename" : "song-placeholder-light@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "song-placeholder-white@3x.png",
+      "filename" : "song-placeholder-light@3x.png",
       "scale" : "3x"
     }
   ],