Fixes, improvements and Demo project

.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+xcuserdata
+Demo/Pods

Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

Demo/Demo/AppDelegate.swift

@@ -0,0 +1,28 @@
+//
+// AppDelegate.swift
+// Demo
+//
+// Created by Ernesto Rivera on 7/2/20.
+// Copyright © 2020 Applikey Solutions. All rights reserved.
+//
+
+import UIKit
+import PandoraPlayer
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate
+{
+ var window: UIWindow?
+
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool
+ {
+ let player = PandoraPlayer.configure(withPaths: ["RAINDOWN_15", "pop"])
+ self.window = UIWindow()
+ self.window?.rootViewController = player
+ self.window?.makeKeyAndVisible()
+
+ return true
+ }
+
+}
+

Demo/Demo/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+ <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="EHf-IW-A2E">
+ <objects>
+ <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+ <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="53" y="375"/>
+ </scene>
+ </scenes>
+</document>

Demo/Demo/Info.plist

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UIStatusBarTintParameters</key>
+ <dict>
+ <key>UINavigationBar</key>
+ <dict>
+ <key>Style</key>
+ <string>UIBarStyleDefault</string>
+ <key>Translucent</key>
+ <false/>
+ </dict>
+ </dict>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+</dict>
+</plist>

Demo/Podfile

@@ -0,0 +1,9 @@
+
+platform :ios, '9.0'
+use_frameworks!
+
+target 'Demo' do
+
+ pod 'PandoraPlayer', :path => '..'
+
+end

Demo/Podfile.lock

@@ -0,0 +1,28 @@
+PODS:
+ - AudioKit (4.10.1):
+ - AudioKit/Core (= 4.10.1)
+ - AudioKit/UI (= 4.10.1)
+ - AudioKit/Core (4.10.1)
+ - AudioKit/UI (4.10.1):
+ - AudioKit/Core
+ - PandoraPlayer (1.3):
+ - AudioKit (~> 4.5)
+
+DEPENDENCIES:
+ - PandoraPlayer (from `..`)
+
+SPEC REPOS:
+ trunk:
+ - AudioKit
+
+EXTERNAL SOURCES:
+ PandoraPlayer:
+ :path: ".."
+
+SPEC CHECKSUMS:
+ AudioKit: b8e508a0af3dc7d53caf0ca1002b187a662f949e
+ PandoraPlayer: 83e5993169f43f67c9d35960055675df81575703
+
+PODFILE CHECKSUM: bbcfa087c0e05b35ea9f1d2184ff4ecfcaf641d1
+
+COCOAPODS: 1.9.3

PandoraPlayer.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
  s.name = "PandoraPlayer"
- s.version = "1.2"
+ s.version = "1.3"
  s.summary = "Music Player for iOS"
  s.description = "A simple iOS music player library written in Swift"
 
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
 
  s.author = { "Applikey Solutions" => "[email protected]" }
  s.platform = :ios, "9.0"
+ s.static_framework = true
 
  s.source = { :git => "https://github.com/AppliKeySolutions/PandoraPlayer.git", :tag => "#{s.version}" }
 
@@ -18,6 +19,6 @@ Pod::Spec.new do |s|
 
  s.resources = "Player/**/*.{storyboard,xib,xcassets}"
 
- s.dependency "AudioKit", "4.0.3"
+ s.dependency "AudioKit", "~> 4.5"
 
 end

Player.xcodeproj/project.pbxproj

@@ -106,7 +106,6 @@
  children = (
  F519AE031F2B26870067FE47 /* Classes */,
  F519AE291F2B26870067FE47 /* Resources */,
- F519AE2D1F2B26870067FE47 /* Supporting Files */,
  );
  path = Player;
  sourceTree = "<group>";
@@ -255,13 +254,6 @@
  path = Resources;
  sourceTree = "<group>";
  };
- F519AE2D1F2B26870067FE47 /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- );
- path = "Supporting Files";
- sourceTree = "<group>";
- };
  F519B7921F2B371D0067FE47 /* Storyboards */ = {
  isa = PBXGroup;
  children = (
@@ -324,6 +316,7 @@
  developmentRegion = English;
  hasScannedForEncodings = 0;
  knownRegions = (
+ English,
  en,
  Base,
  );
@@ -540,7 +533,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.2;
  TARGETED_DEVICE_FAMILY = 1;
  };
  name = Debug;
@@ -561,7 +554,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.applikeySolutions.Player;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.2;
  TARGETED_DEVICE_FAMILY = 1;
  };
  name = Release;

Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

Player.xcodeproj/xcuserdata/mac-1.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>Player.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+</dict>
+</plist>

Player/Classes/Controllers/PandoraPlayer.swift

@@ -127,7 +127,7 @@ open class PandoraPlayer: UIViewController {
  */
  public static func configure(withPaths paths: [String]) -> PandoraPlayer {
  let playerVC = pandoraPlayerInstance()
- let songItems = paths.flatMap({ return Song(path: $0) })
+ let songItems = paths.compactMap({ return Song(path: $0) })
  playerVC.library = songItems
  playerVC.readyForPlay()
  return playerVC
@@ -153,7 +153,7 @@ open class PandoraPlayer: UIViewController {
  */
  public static func configure(withAVItems items: [AVPlayerItem]) -> PandoraPlayer {
  let playerVC = pandoraPlayerInstance()
- let songItems = items.flatMap({ return Song(withAVPlayerItem: $0) })
+ let songItems = items.compactMap({ return Song(withAVPlayerItem: $0) })
  playerVC.library = songItems
  playerVC.readyForPlay()
  return playerVC
@@ -201,7 +201,6 @@ open class PandoraPlayer: UIViewController {
  playerVC.library = outputItems
 
  group.notify(queue: DispatchQueue.main) {
- assert(outputItems.count > 0)
  playerVC.library = outputItems
  playerVC.readyForPlay()
  }
@@ -232,6 +231,7 @@ open class PandoraPlayer: UIViewController {
  configureNavigationBar()
  configurePlayer()
  configurePlayerSongListView()
+ configureBackgroundImage()
  }
 
  private func configurePlayerSongListView() {
@@ -243,7 +243,7 @@ open class PandoraPlayer: UIViewController {
  navigationController?.navigationBar.shadowImage = UIImage()
  navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
 
- navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white]
+ navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
  navigationController?.navigationBar.tintColor = UIColor.white
  title = nowPlaying
  }
@@ -335,6 +335,9 @@ open class PandoraPlayer: UIViewController {
  }
 
  private func configurePlayer() {
+ if !self.isViewLoaded {
+ _ = self.view // Make sure to load views first
+ }
  configurePlayerControls()
  configurePlayerTimeSlider()
  player = EZAudioPlayer()
@@ -506,7 +509,7 @@ extension PandoraPlayer: PlayerSongListDelegate {
  guard library[index].colors == nil else { continue }
  guard tasks[index] == nil else { continue }
  var item: DispatchWorkItem!
- item = DispatchWorkItem(block: {
+ item = DispatchWorkItem(block: {[unowned self] in 
  guard !item.isCancelled else { return }
  guard let image = self.library[index].metadata?.artwork else { return }
  guard !item.isCancelled else { return }
@@ -555,6 +558,10 @@ extension PandoraPlayer: PlayerControlsDelegate {
 
 extension PandoraPlayer: PlayerSliderProtocol {
  func onValueChanged(progress: Float, timePast: TimeInterval) {
+ guard player.audioFile != nil else {
+ sliderView.progress = 0
+ return
+ }
  beeingSeek = true
  let frame = Int64(Float(player.audioFile.totalFrames) * progress)
  self.player.seek(toFrame: frame)

Player/Classes/Extensions/CommonExtensions.swift

@@ -46,8 +46,8 @@ extension UILabel {
  if layer.animation(forKey: animation) == nil {
  let transition = CATransition()
  transition.duration = duration
- transition.type = kCATransitionFade
- transition.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+ transition.type = CATransitionType.fade
+ transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
  layer.add(transition, forKey: animation)
  }
  self.text = text
@@ -60,8 +60,8 @@ extension CATransition {
  static func fading(_ duration: TimeInterval) -> CATransition {
  let transition = CATransition()
  transition.duration = duration
- transition.type = kCATransitionFade
- transition.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+ transition.type = CATransitionType.fade
+ transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
  return transition
  }
 }

Player/Classes/Vendors/UIImageColors.swift

@@ -54,9 +54,9 @@ extension UIColor {
  let fg = compareColor.cgColor.components
  let threshold: CGFloat = 0.25
 
- if fabs(bg[0] - fg[0]) > threshold || fabs(bg[1] - fg[1]) > threshold || fabs(bg[2] - fg[2]) > threshold {
- if fabs(bg[0] - bg[1]) < 0.03 && fabs(bg[0] - bg[2]) < 0.03 {
- if fabs(fg[0] - fg[1]) < 0.03 && fabs(fg[0] - fg[2]) < 0.03 {
+ if abs(bg[0] - fg[0]) > threshold || abs(bg[1] - fg[1]) > threshold || abs(bg[2] - fg[2]) > threshold {
+ if abs(bg[0] - bg[1]) < 0.03 && abs(bg[0] - bg[2]) < 0.03 {
+ if abs(fg[0] - fg[1]) < 0.03 && abs(fg[0] - fg[2]) < 0.03 {
  return false
  }
  }