Merge pull request #461 from spotify/release_v5.0.1

Spotify iOS SDK v5.0.1

Author: jalopezcar

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## Spotify iOS SDK v5.0.1
+
+What's New:
+
+- Replace deprecated keyWindow with proper window scene handling
+- Clean up auth sessions in dealloc
+- Update demo apps to support SceneDelegate
+- Update documentation
+
+## Spotify iOS SDK v5.0.0
+
+What's New:
+
+- Replace SPTAuthorizationMethod (NS_ENUM) with SPTAuthorizationOptions (NS_OPTIONS)
+- Add the new option 'spotifySchemeNotRegistered' to avoid using 'canOpenURL' if you have reached the 50-entry limit in your Info.plist file and cannot add the Spotify scheme.
+
+## Spotify iOS SDK v4.0.1
+
+What's New:
+
+- Fixed an issue with SPTAuthorizationMethodUniversalLinks
+
+## Spotify iOS SDK v4.0.0
+
+What's New:
+
+- Replace SPTAuthorizationOptions (NS_OPTIONS) with SPTAuthorizationMethod (NS_ENUM)
+- Add a new configuration method (SPTAuthorizationMethodUniversalLinks) that doesn't require to add the 'spotify' scheme to your Info.plist
+
 ## Spotify iOS SDK v3.0.0
 
 What's New:
@@ -134,4 +163,4 @@ What's New
 What's New
 
 - Initial iOS SDK release
-- Includes authentication and playback control capabilities
+- Includes authentication and playback control capabilities

DemoProjects/NowPlayingView/NowPlayingView/AppDelegate.swift

@@ -1,8 +1,5 @@
 import UIKit
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder,
-    UIApplicationDelegate
- {
-
-}
+UIApplicationDelegate {}

DemoProjects/NowPlayingView/NowPlayingView/ConnectionStatusIndicatorView.swift

@@ -2,13 +2,13 @@ import UIKit
 
 /// Connection status view
 class ConnectionStatusIndicatorView : UIView {
-    
+
     enum State {
         case disconnected
         case connecting
         case connected
     }
-    
+
     var state: State = .disconnected {
         didSet {
             self.setNeedsDisplay()
@@ -20,36 +20,36 @@ class ConnectionStatusIndicatorView : UIView {
                 displayLink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
             } else {
                 displayLink?.remove(from: RunLoop.main, forMode: RunLoop.Mode.common)
-                displayLink = nil;
+                displayLink = nil
             }
         }
     }
-    
+
     var displayLink: CADisplayLink?
-    
+
     override func didMoveToSuperview() {
         super.didMoveToSuperview()
-        self.clearsContextBeforeDrawing = true;
+        self.clearsContextBeforeDrawing = true
         self.backgroundColor = UIColor.clear
     }
-    
+
     override func draw(_ rect: CGRect) {
         guard let context = UIGraphicsGetCurrentContext() else {
             return
         }
-        
+
         let size = self.bounds.size
         let path = CGPath(roundedRect: self.bounds, cornerWidth: size.width/2, cornerHeight: size.height/2, transform: nil)
         context.addPath(path)
-        
+
         context.setFillColor(fillColor())
         context.fillPath()
     }
-    
+
     private func timebasedValue() -> CGFloat {
         return CGFloat(abs(sin(Date().timeIntervalSinceReferenceDate*4)))
     }
-    
+
     private func fillColor() -> CGColor {
         switch state {
         case .disconnected:

DemoProjects/NowPlayingView/NowPlayingView/ContentCollectionViewController.swift

@@ -1,121 +1,122 @@
-import UIKit
 import SpotifyiOS
+import UIKit
 
 class ContentCollectionViewController : UICollectionViewController, UICollectionViewDelegateFlowLayout {
-    
+
     var containerItem: SPTAppRemoteContentItem? = nil {
         didSet {
             needsReload = true
         }
     }
+
     var contentItems = [SPTAppRemoteContentItem]()
     var needsReload = true
-    
+
     var appRemote: SPTAppRemote? {
-        get {
-            return (UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate)?.appRemote
-        }
+        return (UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate)?.appRemote
     }
-    
+
     func loadContent() {
         guard needsReload == true else {
             return
         }
-        
+
         if let container = containerItem {
-            appRemote?.contentAPI?.fetchChildren(of: container) { (items, error) in
+            appRemote?.contentAPI?.fetchChildren(of: container) { items, _ in
                 if let contentItems = items as? [SPTAppRemoteContentItem] {
                     self.contentItems = contentItems
                 }
                 self.collectionView?.reloadData()
             }
         } else {
-            appRemote?.contentAPI?.fetchRecommendedContentItems(forType: SPTAppRemoteContentTypeDefault, flattenContainers: true) { (items, error) in
+            appRemote?.contentAPI?.fetchRecommendedContentItems(forType: SPTAppRemoteContentTypeDefault, flattenContainers: true) { items, _ in
                 if let contentItems = items as? [SPTAppRemoteContentItem] {
                     self.contentItems = contentItems
                 }
                 self.collectionView?.reloadData()
             }
         }
-        
+
         needsReload = false
     }
-    
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
+
         containerItem = nil
     }
-    
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        
+
         self.navigationItem.title = containerItem?.title ?? "Spotify"
         loadContent()
     }
-    
+
     // MARK: UICollectionViewDataSource
+
     override func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return contentItems.count
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ContentItemCell", for: indexPath) as! ContentItemCell
         let item = contentItems[indexPath.item]
-        
+
         cell.titleLabel?.text = item.title
         cell.subtitleLabel?.text = item.subtitle
-        
+
         cell.imageView.image = nil
-        appRemote?.imageAPI?.fetchImage(forItem: item, with: scaledSizeForCell(cell)) { (image, error) in
+        appRemote?.imageAPI?.fetchImage(forItem: item, with: scaledSizeForCell(cell)) { image, error in
             guard let image = image as? UIImage, error == nil,
                   let cell = collectionView.cellForItem(at: indexPath) as? ContentItemCell else {
                 return
             }
             cell.imageView?.image = image
         }
-        
+
         return cell
     }
-    
+
     private func scaledSizeForCell(_ cell: UICollectionViewCell) -> CGSize {
         let scale = UIScreen.main.scale
         let size = cell.frame.size
         return CGSize(width: size.width * scale, height: size.height * scale)
     }
-    
+
     // MARK: UICollectionViewDelegateFlowLayout
+
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         let width = collectionView.frame.width / 2.0
         return CGSize(width: width, height: width)
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
         return 0.0
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
         return 0.0
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let id = restorationIdentifier,
               let newVc = storyboard?.instantiateViewController(withIdentifier: id) as? ContentCollectionViewController else {
             return
         }
-        
+
         let selectedItem = contentItems[indexPath.item]
-        
+
         if selectedItem.isContainer {
             newVc.containerItem = selectedItem
-            
+
             navigationController?.pushViewController(newVc, animated: true)
         } else {
-            appRemote?.playerAPI?.play(selectedItem, callback: { [weak self = self] result, error in
+            appRemote?.playerAPI?.play(selectedItem, callback: { [weak self = self] _, error in
                 if let errorMessage = (error as NSError?)?.userInfo["error-identifier"] as? String {
                     let alert = UIAlertController(title: NSLocalizedString("Oops!", comment: ""), message: errorMessage, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))

DemoProjects/NowPlayingView/NowPlayingView/ContentItemCell.swift

@@ -4,4 +4,4 @@ class ContentItemCell : UICollectionViewCell {
     @IBOutlet var imageView: UIImageView!
     @IBOutlet var titleLabel: UILabel!
     @IBOutlet var subtitleLabel: UILabel!
-}
+}

DemoProjects/NowPlayingView/NowPlayingView/My-Extensions.swift

@@ -17,7 +17,7 @@ extension Dictionary {
             let valueString = value as! String
             let encodedKey = keyString.encodeStringAsUrlParameter(key as! String)
             let encodedValue = valueString.encodeStringAsUrlParameter(value as! String)
-            let encoded = String(format: "%@=%@", encodedKey, encodedValue);
+            let encoded = String(format: "%@=%@", encodedKey, encodedValue)
             pairs.append(encoded)
         }
 

DemoProjects/NowPlayingView/NowPlayingView/PlaybackButtonGraphics.swift

@@ -2,35 +2,39 @@ import UIKit
 
 class PlaybackButtonGraphics {
     class func imageWithFilledPolygons(_ lines: [[CGPoint]]) -> UIImage {
-        let context = CGContext(data: nil,
-                                width: 64, height: 64,
-                                bitsPerComponent: 8, bytesPerRow: 8*64*4,
-                                space: CGColorSpaceCreateDeviceRGB(),
-                                bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue);
-        
+        let context = CGContext(
+            data: nil,
+            width: 64,
+            height: 64,
+            bitsPerComponent: 8,
+            bytesPerRow: 8*64*4,
+            space: CGColorSpaceCreateDeviceRGB(),
+            bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+        )
+
         let path = CGMutablePath()
         for linePoints in lines {
             path.addLines(between: linePoints)
         }
-        
+
         context?.addPath(path)
         context?.fillPath()
-        
+
         if let image = context?.makeImage() {
             return UIImage(cgImage: image, scale: UIScreen.main.scale, orientation: .up)
         }
-        
+
         return UIImage()
     }
-    
+
     class func playButtonImage() -> UIImage {
         return imageWithFilledPolygons([[
             CGPoint(x: 64, y: 32),
             CGPoint(x: 0, y: 64),
             CGPoint(x: 0, y: 0),
         ]])
     }
-    
+
     class func nextButtonImage() -> UIImage {
         return imageWithFilledPolygons([
             [
@@ -41,9 +45,10 @@ class PlaybackButtonGraphics {
                 CGPoint(x: 32, y: 32),
                 CGPoint(x: 0, y: 48),
                 CGPoint(x: 0, y: 16),
-            ]])
+            ],
+        ])
     }
-    
+
     class func previousButtonImage() -> UIImage {
         return imageWithFilledPolygons([
             [
@@ -54,22 +59,27 @@ class PlaybackButtonGraphics {
                 CGPoint(x: 0, y: 32),
                 CGPoint(x: 32, y: 48),
                 CGPoint(x: 32, y: 16),
-            ]])
+            ],
+        ])
     }
-    
+
     class func pauseButtonImage() -> UIImage {
-        let context = CGContext(data: nil,
-                                width: 64, height: 64,
-                                bitsPerComponent: 8, bytesPerRow: 8*64*4,
-                                space: CGColorSpaceCreateDeviceRGB(),
-                                bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue);
-        
-        context?.fill(CGRect(x: 0, y: 0, width: 20, height: 64));
-        context?.fill(CGRect(x: 44, y: 0, width: 20, height: 64));
+        let context = CGContext(
+            data: nil,
+            width: 64,
+            height: 64,
+            bitsPerComponent: 8,
+            bytesPerRow: 8*64*4,
+            space: CGColorSpaceCreateDeviceRGB(),
+            bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+        )
+
+        context?.fill(CGRect(x: 0, y: 0, width: 20, height: 64))
+        context?.fill(CGRect(x: 44, y: 0, width: 20, height: 64))
         if let image = context?.makeImage() {
             return UIImage(cgImage: image, scale: UIScreen.main.scale, orientation: .up)
         }
-        
+
         return UIImage()
     }
 }