VLCRendererDiscovererManager: Use template icon for the rendererbutton

SharedSources/PresentationTheme.swift

@@ -96,6 +96,7 @@ extension Notification.Name {
 
     public init(colors: ColorPalette) {
         self.colors = colors
+        super.init()
     }
 
     public let colors: ColorPalette

Sources/VLCMovieViewController.m

@@ -1710,6 +1710,10 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 {
     // Create a renderer button for VLCMovieViewController
     _rendererButton = [_services.rendererDiscovererManager setupRendererButton];
+    // Setting rendererIcons to white since default is orange
+    _rendererButton.tintColor = [UIColor whiteColor];
+    [_rendererButton setImage:[UIImage imageNamed:@"renderer"] forState:UIControlStateNormal];
+    [_rendererButton setImage:[UIImage imageNamed:@"rendererFull"] forState:UIControlStateSelected];
     __weak typeof(self) weakSelf = self;
     [_services.rendererDiscovererManager addSelectionHandler:^(VLCRendererItem * item) {
         __strong typeof(weakSelf) strongSelf = weakSelf;

Sources/VLCRendererDiscovererManager.swift

@@ -135,6 +135,7 @@ class VLCRendererDiscovererManager: NSObject {
     @objc func setupRendererButton() -> UIButton {
         let button = UIButton()
         button.isHidden = getAllRenderers().isEmpty
+        button.tintColor = PresentationTheme.current.colors.orangeUI
         button.setImage(UIImage(named: "renderer"), for: .normal)
         button.setImage(UIImage(named: "rendererFull"), for: .selected)
         button.addTarget(self, action: #selector(displayActionSheet), for: .touchUpInside)
@@ -190,14 +191,17 @@ extension VLCRendererDiscovererManager: VLCRendererDiscovererDelegate {
     }
 
     fileprivate func updateCollectionViewCellApparence(cell: VLCActionSheetCell, highlighted: Bool) {
-        var image = UIImage(named: "rendererGray")
-        var textColor: UIColor = PresentationTheme.current.colors.cellTextColor
+        var image = UIImage(named: "renderer")
+        var textColor = PresentationTheme.current.colors.cellTextColor
+        var tintColor = PresentationTheme.current.colors.cellDetailTextColor
 
         if highlighted {
-            image = UIImage(named: "rendererOrangeFull")
+            image = UIImage(named: "rendererFull")
             textColor = PresentationTheme.current.colors.orangeUI
+            tintColor = PresentationTheme.current.colors.orangeUI
         }
 
+        cell.tintColor = tintColor
         cell.icon.image = image
         cell.name.textColor = textColor
     }

vlc-ios/Images.xcassets/Movie View/Renderer/renderer.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

vlc-ios/Images.xcassets/Movie View/Renderer/rendererBlack.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_normal_black.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_normal_black@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_normal_black@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

vlc-ios/Images.xcassets/Movie View/Renderer/rendererBlackFull.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_full_normal_black.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_full_normal_black@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "renderer_full_normal_black@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

vlc-ios/Images.xcassets/Movie View/Renderer/rendererFull.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

vlc-ios/Images.xcassets/Movie View/Renderer/rendererGray.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "group95.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "group95@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "group95@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}