Merge pull request #21 from amiantos/beta

v1.2

Numu Tracker.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		4401CBB8215DC8D000B0EB23 /* AlbumArtCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4401CBB7215DC8D000B0EB23 /* AlbumArtCache.swift */; };
+		441CC0AF215DB769009F4114 /* numuIcon_1024.png in Resources */ = {isa = PBXBuildFile; fileRef = 441CC0AE215DB769009F4114 /* numuIcon_1024.png */; };
 		4461CB79215844C9001939F0 /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4461CB78215844C9001939F0 /* AsyncOperation.swift */; };
 		4461CB7B2158470C001939F0 /* FetchJSONOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4461CB7A2158470C001939F0 /* FetchJSONOperation.swift */; };
 		4461CB7F21585488001939F0 /* NumuAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4461CB7E21585488001939F0 /* NumuAPI.swift */; };
@@ -25,7 +27,6 @@
 		B4283A911D8548F300467CE6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B4283A8F1D8548F300467CE6 /* LaunchScreen.storyboard */; };
 		B4283ABD1D8658AD00467CE6 /* ReleaseItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4283ABC1D8658AD00467CE6 /* ReleaseItem.swift */; };
 		B42866081DA5FC53000E5FA6 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42866071DA5FC53000E5FA6 /* User.swift */; };
-		B428660A1DA7645C000E5FA6 /* AlbumArtCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42866091DA7645C000E5FA6 /* AlbumArtCache.swift */; };
 		B43705D81E357C8C0060E6CC /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43705D71E357C8C0060E6CC /* SettingsTableViewController.swift */; };
 		B43E36B01F5DF9BA009834C9 /* NumuLogo1024.png in Resources */ = {isa = PBXBuildFile; fileRef = B43E36AF1F5DF9B9009834C9 /* NumuLogo1024.png */; };
 		B43E36B21F5DFAD0009834C9 /* LogRegPromptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43E36B11F5DFAD0009834C9 /* LogRegPromptViewController.swift */; };
@@ -46,14 +47,15 @@
 		B4CCFCC51DB4311B00D2277B /* AddArtistsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CCFCC41DB4311B00D2277B /* AddArtistsViewController.swift */; };
 		B4CCFCC71DB4353E00D2277B /* NumuUIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CCFCC61DB4353E00D2277B /* NumuUIButton.swift */; };
 		B4CCFCC91DB447B200D2277B /* HelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CCFCC81DB447B200D2277B /* HelpViewController.swift */; };
-		B4DA6EAE1F6DE5C50090C945 /* LogRegPromptSmallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4DA6EAD1F6DE5C50090C945 /* LogRegPromptSmallViewController.swift */; };
 		B4E8B97A1E7F67BD00643AD1 /* bradroot-new-2880-man.png in Resources */ = {isa = PBXBuildFile; fileRef = B4E8B9791E7F67BD00643AD1 /* bradroot-new-2880-man.png */; };
 		B4F1E3AB2058C6C100F2544A /* NumuReviewHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4F1E3AA2058C6C100F2544A /* NumuReviewHelper.swift */; };
 		E4EB5ACCF23F58468A5C04FF /* Pods_Numu_Tracker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD0F3687066D64A7B28C145 /* Pods_Numu_Tracker.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		01361C8695313B7121751750 /* Pods-Numu Tracker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Numu Tracker.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Numu Tracker/Pods-Numu Tracker.debug.xcconfig"; sourceTree = "<group>"; };
+		4401CBB7215DC8D000B0EB23 /* AlbumArtCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlbumArtCache.swift; sourceTree = "<group>"; };
+		441CC0AE215DB769009F4114 /* numuIcon_1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = numuIcon_1024.png; path = Design/icon/numuIcon_1024.png; sourceTree = SOURCE_ROOT; };
 		4461CB78215844C9001939F0 /* AsyncOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncOperation.swift; sourceTree = "<group>"; };
 		4461CB7A2158470C001939F0 /* FetchJSONOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchJSONOperation.swift; sourceTree = "<group>"; };
 		4461CB7E21585488001939F0 /* NumuAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumuAPI.swift; sourceTree = "<group>"; };
@@ -75,7 +77,6 @@
 		B4283A921D8548F300467CE6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B4283ABC1D8658AD00467CE6 /* ReleaseItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReleaseItem.swift; sourceTree = "<group>"; };
 		B42866071DA5FC53000E5FA6 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		B42866091DA7645C000E5FA6 /* AlbumArtCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlbumArtCache.swift; sourceTree = "<group>"; };
 		B43705D71E357C8C0060E6CC /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
 		B43AF1E31DCE4C94008F7EBD /* Numu Tracker.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Numu Tracker.entitlements"; sourceTree = "<group>"; };
 		B43E36AF1F5DF9B9009834C9 /* NumuLogo1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = NumuLogo1024.png; sourceTree = "<group>"; };
@@ -97,7 +98,6 @@
 		B4CCFCC41DB4311B00D2277B /* AddArtistsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddArtistsViewController.swift; sourceTree = "<group>"; };
 		B4CCFCC61DB4353E00D2277B /* NumuUIButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumuUIButton.swift; sourceTree = "<group>"; };
 		B4CCFCC81DB447B200D2277B /* HelpViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpViewController.swift; sourceTree = "<group>"; };
-		B4DA6EAD1F6DE5C50090C945 /* LogRegPromptSmallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogRegPromptSmallViewController.swift; sourceTree = "<group>"; };
 		B4E8B9791E7F67BD00643AD1 /* bradroot-new-2880-man.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bradroot-new-2880-man.png"; sourceTree = "<group>"; };
 		B4F1E3AA2058C6C100F2544A /* NumuReviewHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumuReviewHelper.swift; sourceTree = "<group>"; };
 		CBD0F3687066D64A7B28C145 /* Pods_Numu_Tracker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Numu_Tracker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -186,6 +186,7 @@
 			children = (
 				B4283A8D1D8548F300467CE6 /* Assets.xcassets */,
 				B43E36AF1F5DF9B9009834C9 /* NumuLogo1024.png */,
+				441CC0AE215DB769009F4114 /* numuIcon_1024.png */,
 				B4E8B9791E7F67BD00643AD1 /* bradroot-new-2880-man.png */,
 			);
 			name = Images;
@@ -257,7 +258,6 @@
 				B46754551F6DA64B00C80544 /* AboutViewController.swift */,
 				B46754571F6DA66F00C80544 /* InstructionsViewController.swift */,
 				B43E36B11F5DFAD0009834C9 /* LogRegPromptViewController.swift */,
-				B4DA6EAD1F6DE5C50090C945 /* LogRegPromptSmallViewController.swift */,
 			);
 			name = Settings;
 			path = settings;
@@ -266,7 +266,7 @@
 		B4CCFCC11DB425FD00D2277B /* Backend */ = {
 			isa = PBXGroup;
 			children = (
-				B42866091DA7645C000E5FA6 /* AlbumArtCache.swift */,
+				4401CBB7215DC8D000B0EB23 /* AlbumArtCache.swift */,
 				B45A133C20548632001EBDA5 /* NumuCredential.swift */,
 				B45A133E2054CBDF001EBDA5 /* NumuClient.swift */,
 				B45A134020551C46001EBDA5 /* Extensions.swift */,
@@ -376,6 +376,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				441CC0AF215DB769009F4114 /* numuIcon_1024.png in Resources */,
 				B4E8B97A1E7F67BD00643AD1 /* bradroot-new-2880-man.png in Resources */,
 				B4283A911D8548F300467CE6 /* LaunchScreen.storyboard in Resources */,
 				B43E36B01F5DF9BA009834C9 /* NumuLogo1024.png in Resources */,
@@ -395,6 +396,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Numu Tracker/Pods-Numu Tracker-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
 				"${BUILT_PRODUCTS_DIR}/PusherSwift/PusherSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
 				"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
@@ -404,6 +406,7 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
@@ -508,6 +511,7 @@
 				B4CCFCC71DB4353E00D2277B /* NumuUIButton.swift in Sources */,
 				B4CCFCC51DB4311B00D2277B /* AddArtistsViewController.swift in Sources */,
 				4461CB8B21589AB4001939F0 /* RegisterWithCKOperation.swift in Sources */,
+				4401CBB8215DC8D000B0EB23 /* AlbumArtCache.swift in Sources */,
 				B440D9D71DB2D19300477938 /* ArtistItem.swift in Sources */,
 				B440D9D51DB2D13900477938 /* ArtistsTableViewController.swift in Sources */,
 				B4B49B871E5EBE4B001CE1C7 /* ReleaseFiltersViewController.swift in Sources */,
@@ -516,9 +520,7 @@
 				B440D9D91DB2D28A00477938 /* ArtistTableViewCell.swift in Sources */,
 				B416A6621DC52DBA000F86D9 /* ReleaseTableViewCell.swift in Sources */,
 				B45A134120551C46001EBDA5 /* Extensions.swift in Sources */,
-				B4DA6EAE1F6DE5C50090C945 /* LogRegPromptSmallViewController.swift in Sources */,
 				B42866081DA5FC53000E5FA6 /* User.swift in Sources */,
-				B428660A1DA7645C000E5FA6 /* AlbumArtCache.swift in Sources */,
 				4461CB79215844C9001939F0 /* AsyncOperation.swift in Sources */,
 				B4CCFCBC1DB3F8EE00D2277B /* ArtistReleaseTableViewCell.swift in Sources */,
 				B40E35921DB1D88C004BA8C7 /* NumuTabBarController.swift in Sources */,

Numu Tracker/Classes/ArtistItem.swift

@@ -19,7 +19,7 @@ struct ArtistItem {
     let artistArtLarge: String
     let artistArtXLarge: String
     var followStatus: String
-    let thumbUrl: NSURL
+    let thumbUrl: URL
     let unlistened: String
     let totalReleases: String
 
@@ -61,9 +61,9 @@ struct ArtistItem {
         }
 
         if !self.artistArtFull.isEmpty {
-            self.thumbUrl = NSURL(string: self.artistArtFull)!
+            self.thumbUrl = URL(string: self.artistArtFull)!
         } else {
-            self.thumbUrl = NSURL(string: "")!
+            self.thumbUrl = URL(string: "")!
         }
     }
 

Numu Tracker/Classes/ReleaseItem.swift

@@ -28,7 +28,7 @@ struct ReleaseItem {
     let artistArtLarge: String
     let artistArtXLarge: String
     let releaseType: String
-    let thumbUrl: NSURL
+    let thumbUrl: URL
     var listenStatus: String
 
     init?(json: JSON) {
@@ -94,11 +94,11 @@ struct ReleaseItem {
         self.listenStatus = json["status"].string ?? "0"
 
         if self.albumArtThumb == "https://www.numutracker.com/nonly3-1024.png" {
-            self.thumbUrl = NSURL(string: self.artistArtFull)!
+            self.thumbUrl = URL(string: self.artistArtFull)!
         } else if !self.albumArtThumb.isEmpty {
-            self.thumbUrl = NSURL(string: self.albumArtFull)!
+            self.thumbUrl = URL(string: self.albumArtFull)!
         } else {
-            self.thumbUrl = NSURL(string: "")!
+            self.thumbUrl = URL(string: "")!
         }
 
     }

Numu Tracker/Classes/User.swift

@@ -23,7 +23,7 @@ class User {
 
         guard let album = json["album"].string,
             let single = json["single"].string,
-            let extendedPlay = json["extendedPlay"].string,
+            let extendedPlay = json["ep"].string,
             let live = json["live"].string,
             let soundtrack = json["soundtrack"].string,
             let remix = json["remix"].string,

Numu Tracker/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>159</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Numu Tracker/Operations/Auth/AuthOperation.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import UIKit
+import Crashlytics
 
 class AuthOperation: AsyncOperation {
 
@@ -24,6 +25,9 @@ class AuthOperation: AsyncOperation {
                     result == "1" {
                     print("SUCCESS: AuthTest with existing credentials successful!")
                     defaults.logged = true
+                    if let username = NumuCredential.shared.getUsername() {
+                        Crashlytics.sharedInstance().setUserEmail(username)
+                    }
                     self.sendNotifcations()
                     self.state = .isFinished
                 } else {

Numu Tracker/Operations/Auth/RegisterWithCKOperation.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Crashlytics
 
 class RegisterWithCKOperation: AsyncOperation {
 
@@ -31,6 +32,7 @@ class RegisterWithCKOperation: AsyncOperation {
                 DispatchQueue.main.async(execute: {
                     if result == "1" {
                         print("Success registering with iCloud ID")
+                        Answers.logSignUp(withMethod: "AutoCKRegistration", success: true, customAttributes: nil)
                         NumuCredential.shared.storeCredential(username: userRecordID, password: "icloud")
                         self.state = .isFinished
                     } else {

Numu Tracker/Operations/ImportAppleMusicOperation.swift

@@ -9,6 +9,7 @@
 import Foundation
 import MediaPlayer
 import UIKit
+import Crashlytics
 
 class ImportAppleMusicOperation: AsyncOperation {
 
@@ -67,9 +68,13 @@ class ImportAppleMusicOperation: AsyncOperation {
                     if let returnedJSON = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                         if let success = returnedJSON["success"] {
                             self.artistsImported = success as! Int
-                            NotificationCenter.default.post(name: .UpdatedArtists, object: self)
                             NumuReviewHelper.incrementAndAskForReview()
                             self.displaySuccessMessage()
+                            DispatchQueue.main.async(execute: {
+                                NotificationCenter.default.post(name: .UpdatedArtists, object: nil)
+                                NotificationCenter.default.post(name: .LoggedIn, object: nil)
+                                Answers.logCustomEvent(withName: "AM Artist Import")
+                            })
                         }
                     }
                 } catch {
@@ -92,8 +97,8 @@ class ImportAppleMusicOperation: AsyncOperation {
         DispatchQueue.main.async {
             let controller = UIAlertController(
                 title: "Success",
-                message: "\(self.artistsImported) artists imported." +
-                    "Please allow several minutes for all artists to appear.",
+                message: "Your artists have been imported." +
+                    " Please allow several minutes for all artists to appear.",
                 preferredStyle: .alert)
             controller.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
             if let appDelegate = UIApplication.shared.delegate,
@@ -111,7 +116,7 @@ class ImportAppleMusicOperation: AsyncOperation {
             error = "Media library access restricted by corporate or parental settings"
         case .denied:
             error = "We cannot access your Apple Music artists because access has been denied to Numu." +
-                "Please go to General -> Privacy -> Media & Apple Music to enable Numu's access."
+                " Please go to General -> Privacy -> Media & Apple Music to enable Numu's access."
         default:
             error = "Unknown error"
         }