Merge pull request #86 from mobileplayer/fix/pod-resources

Fix cocoapods resource issues

MobilePlayer.podspec

@@ -1,16 +1,17 @@
 Pod::Spec.new do |s|
-  s.name             = "MobilePlayer"
-  s.version          = "1.0.0"
-  s.summary          = "A powerful and completely customizable media player for iOS."
-  s.homepage         = "https://github.com/mobileplayer/mobileplayer-ios"
-  s.license          = 'CC'
-  s.author           = { "Barış Şencan" => "[email protected]",
-                         "Toygar Dündaralp" => "[email protected]",
-                         "Cem Olcay" => "[email protected]",
-                         "Şahin Boydaş" => "[email protected]" }
-  s.source           = { :git => "https://github.com/mobileplayer/mobileplayer-ios.git", :tag => s.version.to_s }
-  s.platform         = :ios, '8.0'
-  s.requires_arc     = true
-  s.frameworks       = 'UIKit', 'MediaPlayer'
-  s.source_files     = 'MobilePlayer/**/*.swift'
+  s.name = "MobilePlayer"
+  s.version = "1.0.1"
+  s.summary = "A powerful and completely customizable media player for iOS."
+  s.homepage = "https://github.com/mobileplayer/mobileplayer-ios"
+  s.license = 'CC'
+  s.author = { "Barış Şencan" => "[email protected]",
+               "Toygar Dündaralp" => "[email protected]",
+               "Cem Olcay" => "[email protected]",
+               "Şahin Boydaş" => "[email protected]" }
+  s.source = { :git => "https://github.com/mobileplayer/mobileplayer-ios.git", :tag => s.version.to_s }
+  s.platform = :ios, '8.0'
+  s.requires_arc = true
+  s.frameworks = 'UIKit', 'MediaPlayer'
+  s.source_files = 'MobilePlayer/**/*.swift'
+  s.resource_bundle  = { 'MobilePlayer' => 'MobilePlayer/**/*.png' }
 end

MobilePlayer/Config/ButtonConfig.swift

@@ -39,12 +39,11 @@ public class ButtonConfig: ElementConfig {
     if let imageName = dictionary["image"] as? String {
       image = UIImage(named: imageName)
     } else if let identifier = dictionary["identifier"] as? String {
-      let mobilePlayerBundle = NSBundle(forClass: ButtonConfig.self)
       switch identifier {
       case "close":
-        image = UIImage(named: "MLCloseButton", inBundle: mobilePlayerBundle, compatibleWithTraitCollection: nil)
+        image = UIImage(podResourceNamed: "MLCloseButton.png")?.template
       case "action":
-        image = UIImage(named: "MLShareButton", inBundle: mobilePlayerBundle, compatibleWithTraitCollection: nil)
+        image = UIImage(podResourceNamed: "MLShareButton")?.template
       default:
         image = nil
       }

MobilePlayer/Config/ToggleButtonConfig.swift

@@ -45,12 +45,11 @@ public class ToggleButtonConfig: ElementConfig {
     let identifier = dictionary["identifier"] as? String
 
     height = (dictionary["height"] as? CGFloat) ?? 40
-
-    let mobilePlayerBundle = NSBundle(forClass: ToggleButtonConfig.self)
+
     if let imageName = dictionary["image"] as? String {
       image = UIImage(named: imageName)
     } else if identifier == "play" {
-      image = UIImage(named: "MLPlayButton", inBundle: mobilePlayerBundle, compatibleWithTraitCollection: nil)
+      image = UIImage(podResourceNamed: "MLPlayButton")?.template
     } else {
       image = nil
     }
@@ -64,7 +63,7 @@ public class ToggleButtonConfig: ElementConfig {
     if let toggledImageName = dictionary["toggledImage"] as? String {
       toggledImage = UIImage(named: toggledImageName)
     } else if identifier == "play" {
-      toggledImage = UIImage(named: "MLPauseButton", inBundle: mobilePlayerBundle, compatibleWithTraitCollection: nil)
+      toggledImage = UIImage(podResourceNamed: "MLPauseButton")?.template
     } else {
       toggledImage = nil
     }

MobilePlayer/Extensions/UIImage+CocoaPods.swift

@@ -0,0 +1,22 @@
+//
+//  UIImage+CocoaPods.swift
+//  MobilePlayer
+//
+//  Created by Baris Sencan on 16/11/2015.
+//  Copyright © 2015 MovieLaLa. All rights reserved.
+//
+
+import UIKit
+
+extension UIImage {
+
+  convenience init?(podResourceNamed name: String) {
+    let bundleUrl = NSBundle(forClass: MobilePlayerViewController.self).URLForResource("MobilePlayer", withExtension: "bundle")!
+    let bundle = NSBundle(URL: bundleUrl)
+    self.init(named: name, inBundle: bundle, compatibleWithTraitCollection:nil)
+  }
+
+  var template: UIImage {
+    return imageWithRenderingMode(.AlwaysTemplate)
+  }
+}

MobilePlayer/Supporting Files/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

MobilePlayer/Views/VolumeView.swift

@@ -30,11 +30,11 @@ class VolumeView: UIView {
       volumeSlider.showsRouteButton = false
       addSubview(volumeSlider)
       increaseVolumeImage.contentMode = .ScaleAspectFit;
-      increaseVolumeImage.image = UIImage(named: "MLIncreaseVolume")
+      increaseVolumeImage.image = UIImage(podResourceNamed: "MLIncreaseVolume")?.template
       increaseVolumeImage.tintColor = increaseVolumeTintColor
       addSubview(increaseVolumeImage)
       reduceVolumeImage.contentMode = .ScaleAspectFit;
-      reduceVolumeImage.image = UIImage(named: "MLReduceVolume")
+      reduceVolumeImage.image = UIImage(podResourceNamed: "MLReduceVolume")?.template
       reduceVolumeImage.tintColor = reduceVolumeTintColor
       addSubview(reduceVolumeImage)
   }