Xcode 11 / iOS 13 (#62)

* fix pusher dependency version * update pods, migrate project to swift 5 * fix ability to dismiss login & spotify views on iOS 13 * fix glitch with disappearing search cancel button * fix issue with search bar clearing text * update travis build to xcode11 * disable ipad target * new screenshots * fix some busted shots
numutracker · Sep 26, 2019 · 970e311 · 970e311
1 parent 4ac22ce
commit 970e311
Show file tree

Hide file tree

Showing 116 changed files with 2,828 additions and 2,780 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode11
 
 before_install:
   - pod repo update

diff --git a/Design/app-screenshots/1.3.4/3.5-inch-screen1.png b/Design/app-screenshots/1.3.4/3.5-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/3.5-inch-screen2.png b/Design/app-screenshots/1.3.4/3.5-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/3.5-inch-screen3.png b/Design/app-screenshots/1.3.4/3.5-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/3.5-inch-screen4.png b/Design/app-screenshots/1.3.4/3.5-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/3.5-inch-screen5.png b/Design/app-screenshots/1.3.4/3.5-inch-screen5.png
diff --git a/Design/app-screenshots/1.3.4/4-inch-screen1.png b/Design/app-screenshots/1.3.4/4-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/4-inch-screen2.png b/Design/app-screenshots/1.3.4/4-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/4-inch-screen3.png b/Design/app-screenshots/1.3.4/4-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/4-inch-screen4.png b/Design/app-screenshots/1.3.4/4-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/4-inch-screen5.png b/Design/app-screenshots/1.3.4/4-inch-screen5.png
diff --git a/Design/app-screenshots/1.3.4/4.7-inch-screen1.png b/Design/app-screenshots/1.3.4/4.7-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/4.7-inch-screen2.png b/Design/app-screenshots/1.3.4/4.7-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/4.7-inch-screen3.png b/Design/app-screenshots/1.3.4/4.7-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/4.7-inch-screen4.png b/Design/app-screenshots/1.3.4/4.7-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/4.7-inch-screen5.png b/Design/app-screenshots/1.3.4/4.7-inch-screen5.png
diff --git a/Design/app-screenshots/1.3.4/5.5-inch-screen1.png b/Design/app-screenshots/1.3.4/5.5-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/5.5-inch-screen2.png b/Design/app-screenshots/1.3.4/5.5-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/5.5-inch-screen3.png b/Design/app-screenshots/1.3.4/5.5-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/5.5-inch-screen4.png b/Design/app-screenshots/1.3.4/5.5-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/5.5-inch-screen5.png b/Design/app-screenshots/1.3.4/5.5-inch-screen5.png
diff --git a/Design/app-screenshots/1.3.4/5.8-inch-screen1.png b/Design/app-screenshots/1.3.4/5.8-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/5.8-inch-screen2.png b/Design/app-screenshots/1.3.4/5.8-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/5.8-inch-screen3.png b/Design/app-screenshots/1.3.4/5.8-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/5.8-inch-screen4.png b/Design/app-screenshots/1.3.4/5.8-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/5.8-inch-screen5.png b/Design/app-screenshots/1.3.4/5.8-inch-screen5.png
diff --git a/Design/app-screenshots/1.3.4/6.5-inch-screen1.png b/Design/app-screenshots/1.3.4/6.5-inch-screen1.png
diff --git a/Design/app-screenshots/1.3.4/6.5-inch-screen2.png b/Design/app-screenshots/1.3.4/6.5-inch-screen2.png
diff --git a/Design/app-screenshots/1.3.4/6.5-inch-screen3.png b/Design/app-screenshots/1.3.4/6.5-inch-screen3.png
diff --git a/Design/app-screenshots/1.3.4/6.5-inch-screen4.png b/Design/app-screenshots/1.3.4/6.5-inch-screen4.png
diff --git a/Design/app-screenshots/1.3.4/6.5-inch-screen5.png b/Design/app-screenshots/1.3.4/6.5-inch-screen5.png
diff --git a/...pp-screenshots/12.9-inch Screenshot 1.png → ...eenshots/1.3.x/12.9-inch Screenshot 1.png b/...pp-screenshots/12.9-inch Screenshot 1.png → ...eenshots/1.3.x/12.9-inch Screenshot 1.png
diff --git a/...pp-screenshots/12.9-inch Screenshot 2.png → ...eenshots/1.3.x/12.9-inch Screenshot 2.png b/...pp-screenshots/12.9-inch Screenshot 2.png → ...eenshots/1.3.x/12.9-inch Screenshot 2.png
diff --git a/...pp-screenshots/12.9-inch Screenshot 3.png → ...eenshots/1.3.x/12.9-inch Screenshot 3.png b/...pp-screenshots/12.9-inch Screenshot 3.png → ...eenshots/1.3.x/12.9-inch Screenshot 3.png
diff --git a/...pp-screenshots/12.9-inch Screenshot 4.png → ...eenshots/1.3.x/12.9-inch Screenshot 4.png b/...pp-screenshots/12.9-inch Screenshot 4.png → ...eenshots/1.3.x/12.9-inch Screenshot 4.png
diff --git a/...pp-screenshots/12.9-inch Screenshot 5.png → ...eenshots/1.3.x/12.9-inch Screenshot 5.png b/...pp-screenshots/12.9-inch Screenshot 5.png → ...eenshots/1.3.x/12.9-inch Screenshot 5.png
diff --git a/...app-screenshots/3.5-inch Screenshot 1.png → ...reenshots/1.3.x/3.5-inch Screenshot 1.png b/...app-screenshots/3.5-inch Screenshot 1.png → ...reenshots/1.3.x/3.5-inch Screenshot 1.png
diff --git a/...app-screenshots/3.5-inch Screenshot 2.png → ...reenshots/1.3.x/3.5-inch Screenshot 2.png b/...app-screenshots/3.5-inch Screenshot 2.png → ...reenshots/1.3.x/3.5-inch Screenshot 2.png
diff --git a/...app-screenshots/3.5-inch Screenshot 3.png → ...reenshots/1.3.x/3.5-inch Screenshot 3.png b/...app-screenshots/3.5-inch Screenshot 3.png → ...reenshots/1.3.x/3.5-inch Screenshot 3.png
diff --git a/...app-screenshots/3.5-inch Screenshot 4.png → ...reenshots/1.3.x/3.5-inch Screenshot 4.png b/...app-screenshots/3.5-inch Screenshot 4.png → ...reenshots/1.3.x/3.5-inch Screenshot 4.png
diff --git a/...app-screenshots/3.5-inch Screenshot 5.png → ...reenshots/1.3.x/3.5-inch Screenshot 5.png b/...app-screenshots/3.5-inch Screenshot 5.png → ...reenshots/1.3.x/3.5-inch Screenshot 5.png
diff --git a/...n/app-screenshots/4-inch Screenshot 1.png → ...screenshots/1.3.x/4-inch Screenshot 1.png b/...n/app-screenshots/4-inch Screenshot 1.png → ...screenshots/1.3.x/4-inch Screenshot 1.png
diff --git a/...n/app-screenshots/4-inch Screenshot 2.png → ...screenshots/1.3.x/4-inch Screenshot 2.png b/...n/app-screenshots/4-inch Screenshot 2.png → ...screenshots/1.3.x/4-inch Screenshot 2.png
diff --git a/...n/app-screenshots/4-inch Screenshot 3.png → ...screenshots/1.3.x/4-inch Screenshot 3.png b/...n/app-screenshots/4-inch Screenshot 3.png → ...screenshots/1.3.x/4-inch Screenshot 3.png
diff --git a/...n/app-screenshots/4-inch Screenshot 4.png → ...screenshots/1.3.x/4-inch Screenshot 4.png b/...n/app-screenshots/4-inch Screenshot 4.png → ...screenshots/1.3.x/4-inch Screenshot 4.png
diff --git a/...n/app-screenshots/4-inch Screenshot 5.png → ...screenshots/1.3.x/4-inch Screenshot 5.png b/...n/app-screenshots/4-inch Screenshot 5.png → ...screenshots/1.3.x/4-inch Screenshot 5.png
diff --git a/...app-screenshots/4.7-inch Screenshot 1.png → ...reenshots/1.3.x/4.7-inch Screenshot 1.png b/...app-screenshots/4.7-inch Screenshot 1.png → ...reenshots/1.3.x/4.7-inch Screenshot 1.png
diff --git a/...app-screenshots/4.7-inch Screenshot 2.png → ...reenshots/1.3.x/4.7-inch Screenshot 2.png b/...app-screenshots/4.7-inch Screenshot 2.png → ...reenshots/1.3.x/4.7-inch Screenshot 2.png
diff --git a/...app-screenshots/4.7-inch Screenshot 3.png → ...reenshots/1.3.x/4.7-inch Screenshot 3.png b/...app-screenshots/4.7-inch Screenshot 3.png → ...reenshots/1.3.x/4.7-inch Screenshot 3.png
diff --git a/...app-screenshots/4.7-inch Screenshot 4.png → ...reenshots/1.3.x/4.7-inch Screenshot 4.png b/...app-screenshots/4.7-inch Screenshot 4.png → ...reenshots/1.3.x/4.7-inch Screenshot 4.png
diff --git a/...app-screenshots/4.7-inch Screenshot 5.png → ...reenshots/1.3.x/4.7-inch Screenshot 5.png b/...app-screenshots/4.7-inch Screenshot 5.png → ...reenshots/1.3.x/4.7-inch Screenshot 5.png
diff --git a/...app-screenshots/5.5-inch Screenshot 1.png → ...reenshots/1.3.x/5.5-inch Screenshot 1.png b/...app-screenshots/5.5-inch Screenshot 1.png → ...reenshots/1.3.x/5.5-inch Screenshot 1.png
diff --git a/...app-screenshots/5.5-inch Screenshot 2.png → ...reenshots/1.3.x/5.5-inch Screenshot 2.png b/...app-screenshots/5.5-inch Screenshot 2.png → ...reenshots/1.3.x/5.5-inch Screenshot 2.png
diff --git a/...app-screenshots/5.5-inch Screenshot 3.png → ...reenshots/1.3.x/5.5-inch Screenshot 3.png b/...app-screenshots/5.5-inch Screenshot 3.png → ...reenshots/1.3.x/5.5-inch Screenshot 3.png
diff --git a/...app-screenshots/5.5-inch Screenshot 4.png → ...reenshots/1.3.x/5.5-inch Screenshot 4.png b/...app-screenshots/5.5-inch Screenshot 4.png → ...reenshots/1.3.x/5.5-inch Screenshot 4.png
diff --git a/...app-screenshots/5.5-inch Screenshot 5.png → ...reenshots/1.3.x/5.5-inch Screenshot 5.png b/...app-screenshots/5.5-inch Screenshot 5.png → ...reenshots/1.3.x/5.5-inch Screenshot 5.png
diff --git a/...app-screenshots/5.8-inch Screenshot 1.png → ...reenshots/1.3.x/5.8-inch Screenshot 1.png b/...app-screenshots/5.8-inch Screenshot 1.png → ...reenshots/1.3.x/5.8-inch Screenshot 1.png
diff --git a/...app-screenshots/5.8-inch Screenshot 2.png → ...reenshots/1.3.x/5.8-inch Screenshot 2.png b/...app-screenshots/5.8-inch Screenshot 2.png → ...reenshots/1.3.x/5.8-inch Screenshot 2.png
diff --git a/...app-screenshots/5.8-inch Screenshot 3.png → ...reenshots/1.3.x/5.8-inch Screenshot 3.png b/...app-screenshots/5.8-inch Screenshot 3.png → ...reenshots/1.3.x/5.8-inch Screenshot 3.png
diff --git a/...app-screenshots/5.8-inch Screenshot 4.png → ...reenshots/1.3.x/5.8-inch Screenshot 4.png b/...app-screenshots/5.8-inch Screenshot 4.png → ...reenshots/1.3.x/5.8-inch Screenshot 4.png
diff --git a/...app-screenshots/5.8-inch Screenshot 5.png → ...reenshots/1.3.x/5.8-inch Screenshot 5.png b/...app-screenshots/5.8-inch Screenshot 5.png → ...reenshots/1.3.x/5.8-inch Screenshot 5.png
diff --git a/...app-screenshots/9.7-inch Screenshot 1.png → ...reenshots/1.3.x/9.7-inch Screenshot 1.png b/...app-screenshots/9.7-inch Screenshot 1.png → ...reenshots/1.3.x/9.7-inch Screenshot 1.png
diff --git a/...app-screenshots/9.7-inch Screenshot 2.png → ...reenshots/1.3.x/9.7-inch Screenshot 2.png b/...app-screenshots/9.7-inch Screenshot 2.png → ...reenshots/1.3.x/9.7-inch Screenshot 2.png
diff --git a/...app-screenshots/9.7-inch Screenshot 3.png → ...reenshots/1.3.x/9.7-inch Screenshot 3.png b/...app-screenshots/9.7-inch Screenshot 3.png → ...reenshots/1.3.x/9.7-inch Screenshot 3.png
diff --git a/...app-screenshots/9.7-inch Screenshot 4.png → ...reenshots/1.3.x/9.7-inch Screenshot 4.png b/...app-screenshots/9.7-inch Screenshot 4.png → ...reenshots/1.3.x/9.7-inch Screenshot 4.png
diff --git a/...app-screenshots/9.7-inch Screenshot 5.png → ...reenshots/1.3.x/9.7-inch Screenshot 5.png b/...app-screenshots/9.7-inch Screenshot 5.png → ...reenshots/1.3.x/9.7-inch Screenshot 5.png
diff --git a/Numu Tracker.xcodeproj/project.pbxproj b/Numu Tracker.xcodeproj/project.pbxproj
@@ -445,7 +445,7 @@
 					B4283A801D8548F300467CE6 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 2Y9M69QJKZ;
-						LastSwiftMigration = 1020;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -833,8 +833,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.numutracker.Numu-Tracker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -856,8 +856,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.numutracker.Numu-Tracker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

diff --git a/Numu Tracker.xcodeproj/xcshareddata/xcschemes/Numu Tracker.xcscheme b/Numu Tracker.xcodeproj/xcshareddata/xcschemes/Numu Tracker.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4283A801D8548F300467CE6"
+            BuildableName = "Numu Tracker.app"
+            BlueprintName = "Numu Tracker"
+            ReferencedContainer = "container:Numu Tracker.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -49,17 +58,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B4283A801D8548F300467CE6"
-            BuildableName = "Numu Tracker.app"
-            BlueprintName = "Numu Tracker"
-            ReferencedContainer = "container:Numu Tracker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
             ReferencedContainer = "container:Numu Tracker.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Numu Tracker/Info.plist b/Numu Tracker/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1109</string>
+	<string>1130</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
@@ -86,6 +86,8 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

diff --git a/Numu Tracker/Views/Base.lproj/Main.storyboard b/Numu Tracker/Views/Base.lproj/Main.storyboard
diff --git a/Numu Tracker/Views/artists/ArtistsTableViewController.swift b/Numu Tracker/Views/artists/ArtistsTableViewController.swift
@@ -42,6 +42,8 @@ class ArtistsTableViewController: UITableViewController, UISearchBarDelegate, UI
         queue.addOperation(importSpotifyOperation)
     }
 
+    var lastSearch: String?
+
     var artists: [ArtistItem] = [] {
         didSet {
             if viewState == .user {
@@ -233,9 +235,14 @@ class ArtistsTableViewController: UITableViewController, UISearchBarDelegate, UI
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        self.lastSearch = searchController.searchBar.text
         searchController.dismiss(animated: false, completion: nil)
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+    }
+
     @objc func actOnImportNotification() {
         loadArtists()
     }
@@ -264,6 +271,9 @@ class ArtistsTableViewController: UITableViewController, UISearchBarDelegate, UI
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        if viewState == .search {
+            searchController.searchBar.text = self.lastSearch
+        }
     }
 
     // MARK: - Table view data source
@@ -288,6 +298,7 @@ class ArtistsTableViewController: UITableViewController, UISearchBarDelegate, UI
 
     func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
         self.viewState = .search
+        self.searchController.searchBar.showsCancelButton = true
     }
 
     func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
@@ -325,10 +336,6 @@ class ArtistsTableViewController: UITableViewController, UISearchBarDelegate, UI
         }
     }
 
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        self.searchController.isActive = false
-    }
-
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(
             withIdentifier: "artistInfoCell", for: indexPath) as? ArtistTableViewCell else {

diff --git a/Numu Tracker/Views/settings/LogRegPromptViewController.swift b/Numu Tracker/Views/settings/LogRegPromptViewController.swift
@@ -83,6 +83,11 @@ class LogRegPromptViewController: UIViewController, UITextFieldDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = true
+        }
+
         self.signUpPasswordTextField.delegate = self
         self.signUpEmailTextField.delegate = self
 

diff --git a/Numu Tracker/Views/settings/Spotify Login/LoginSpotifyViewController.swift b/Numu Tracker/Views/settings/Spotify Login/LoginSpotifyViewController.swift
@@ -20,6 +20,10 @@ class LoginSpotifyViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = true
+        }
+
         // Do any additional setup after loading the view.
 
         self.title = "Spotify Login"

diff --git a/Numu Tracker/Views/settings/Spotify Login/LoginSpotifyViewController.xib b/Numu Tracker/Views/settings/Spotify Login/LoginSpotifyViewController.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +19,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rox-U7-iSI">
-                    <rect key="frame" x="141" y="378.5" width="93" height="30"/>
+                    <rect key="frame" x="141" y="398.5" width="93" height="30"/>
                     <state key="normal" title="Maybe later...">
                         <color key="titleColor" cocoaTouchSystemColor="lightTextColor"/>
                     </state>
@@ -32,10 +30,11 @@
             </subviews>
             <color key="backgroundColor" red="0.1333333333" green="0.1333333333" blue="0.1333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="rox-U7-iSI" firstAttribute="centerY" secondItem="fnl-2z-Ty3" secondAttribute="centerY" constant="50" id="2gt-Lt-F1g"/>
+                <constraint firstItem="rox-U7-iSI" firstAttribute="centerY" secondItem="fnl-2z-Ty3" secondAttribute="centerY" constant="80" id="2gt-Lt-F1g"/>
                 <constraint firstItem="rox-U7-iSI" firstAttribute="centerX" secondItem="fnl-2z-Ty3" secondAttribute="centerX" id="LGb-Ja-se6"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="138" y="143"/>
         </view>
     </objects>
 </document>
diff --git a/Podfile b/Podfile
@@ -10,7 +10,7 @@ target 'Numu Tracker' do
   use_frameworks!
 
   # Pods for Numu Tracker
-    pod 'PusherSwift'
+    pod 'PusherSwift', '~> 6.1.0'
     pod 'SwiftyJSON'
     pod 'Fabric'
     pod 'Crashlytics', '~>  3.10'

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - Alamofire (4.8.1)
-  - AlamofireObjectMapper (5.2.0):
+  - Alamofire (4.9.0)
+  - AlamofireObjectMapper (5.2.1):
     - Alamofire (~> 4.7)
     - ObjectMapper (~> 3.4)
   - AlamoRecord (1.2.2):
     - AlamofireObjectMapper (~> 5.1)
-  - Crashlytics (3.12.0):
-    - Fabric (~> 1.9.0)
+  - Crashlytics (3.14.0):
+    - Fabric (~> 1.10.2)
   - CryptoSwift (0.9.0)
-  - Fabric (1.9.0)
+  - Fabric (1.10.2)
   - Kingfisher (4.10.1)
-  - ObjectMapper (3.4.2)
+  - ObjectMapper (3.5.1)
   - PusherSwift (6.1.0):
     - CryptoSwift (~> 0.9.0)
     - ReachabilitySwift (~> 4.1.0)
@@ -21,15 +21,15 @@ PODS:
     - AlamoRecord (~> 1.2.0)
   - SpotifyLogin (0.1.6)
   - Starscream (3.0.6)
-  - SwiftLint (0.30.1)
-  - SwiftyJSON (4.2.0)
+  - SwiftLint (0.35.0)
+  - SwiftyJSON (5.0.0)
   - TaskQueue (1.1.1)
 
 DEPENDENCIES:
   - Crashlytics (~> 3.10)
   - Fabric
   - Kingfisher (~> 4.0)
-  - PusherSwift
+  - PusherSwift (~> 6.1.0)
   - Spartan
   - SpotifyLogin (~> 0.1)
   - SwiftLint
@@ -55,23 +55,23 @@ SPEC REPOS:
     - TaskQueue
 
 SPEC CHECKSUMS:
-  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
-  AlamofireObjectMapper: 92b6ce2423a9d159e686f6a1d514a009bf903ddc
+  Alamofire: afc3e7c6db61476cb45cdd23fed06bad03bbc321
+  AlamofireObjectMapper: 1989f690e982b71921b9253f53a4f33a9bc00d88
   AlamoRecord: 5850c563a811fdca40cd361b1b27622004bccef3
-  Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
+  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
   CryptoSwift: bca8c5b653dcc2d9734409242a070ff53bafac86
-  Fabric: f988e33c97f08930a413e08123064d2e5f68d655
+  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
-  ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
+  ObjectMapper: 70187b8941977c62ccfb423caf6b50be405cabf0
   PusherSwift: 6f2535d616cf0d6867a58bee501999995ad37999
   ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
   Spartan: 2fb99ad25f2b0e8182799f251c800091977f0a40
   SpotifyLogin: 9cdf82ff13e5f37e5ddc7fd07cf9793a9ebd1124
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
-  SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
-  SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
+  SwiftLint: 5553187048b900c91aa03552807681bb6b027846
+  SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   TaskQueue: 53a3cdaf817d9ce3cd50837ff6610aeb7b968997
 
-PODFILE CHECKSUM: c6b1bb7e314f6a235aa19b7a0e75454f2fccab41
+PODFILE CHECKSUM: 418b54f490088fb42a1db376f5ca3b19f1584f30
 
-COCOAPODS: 1.6.0.rc.2
+COCOAPODS: 1.7.0.beta.3
diff --git a/Pods/Alamofire/README.md b/Pods/Alamofire/README.md
diff --git a/Pods/Alamofire/Source/MultipartFormData.swift b/Pods/Alamofire/Source/MultipartFormData.swift
diff --git a/Pods/Alamofire/Source/NetworkReachabilityManager.swift b/Pods/Alamofire/Source/NetworkReachabilityManager.swift
diff --git a/Pods/Alamofire/Source/Request.swift b/Pods/Alamofire/Source/Request.swift