Added some final touch ups before archiving this project.

ThasianX · Dec 19, 2019 · ca6a892 · ca6a892
1 parent 9609bdb
commit ca6a892
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 76 deletions.
diff --git a/SpotifyDaily/Base.lproj/LaunchScreen.storyboard b/SpotifyDaily/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,21 +15,7 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="qRa-Th-GCS">
-                                <rect key="frame" x="87" y="384" width="240" height="128"/>
-                                <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="240" id="rnq-Ji-4We"/>
-                                    <constraint firstAttribute="height" constant="128" id="vwF-2C-NCl"/>
-                                </constraints>
-                            </imageView>
-                        </subviews>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="qRa-Th-GCS" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="1E3-Ch-r6s"/>
-                            <constraint firstItem="qRa-Th-GCS" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="3KL-XS-EIY"/>
-                        </constraints>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                 </viewController>
@@ -38,7 +24,4 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="logo" width="60" height="60"/>
-    </resources>
 </document>
diff --git a/SpotifyDaily_iOS/App/AppCoordinator.swift b/SpotifyDaily_iOS/App/AppCoordinator.swift
@@ -26,16 +26,17 @@ class AppCoordinator: BaseCoordinator {
     }
 
     override func start() {
-        self.window.makeKeyAndVisible()
 
-        ViewControllerUtils.setRootViewController(
-        window: self.window,
-        viewController: StartupViewController(),
-        withAnimation: true)
+        // Uncomment this line out if you are getting problems with the root view controller not being set by the time appdelegate returns.
+//        ViewControllerUtils.setRootViewController(
+//        window: self.window,
+//        viewController: StartupViewController(),
+//        withAnimation: true)
 
         self.sessionService.loadSession()
             .bind(onNext: { [unowned self] session in
                 session == nil ? self.showSignIn() : self.showDashboard()
+                self.window.makeKeyAndVisible()
             })
             .disposed(by: disposeBag)
 

diff --git a/SpotifyDaily_iOS/App/Dashboard/DashboardViewController.swift b/SpotifyDaily_iOS/App/Dashboard/DashboardViewController.swift
@@ -48,7 +48,7 @@ final class DashboardViewController: ViewControllerWithSideMenu, BindableType {
         super.viewDidLoad()
 
         self.view.backgroundColor = ColorPreference.secondaryColor
-        title = "Spotify Daily Dashboard"
+        title = "Dashboard"
         self.setUpView()
     }
 

diff --git a/SpotifyDaily_iOS/App/Dashboard/Recently Played/RecentlyPlayedTracksViewController.swift b/SpotifyDaily_iOS/App/Dashboard/Recently Played/RecentlyPlayedTracksViewController.swift
@@ -58,7 +58,7 @@ final class RecentlyPlayedTracksViewController: UIViewController, BindableType {
         recentlyPlayedTitle.leadingAnchor.constraint(equalTo: layoutGuide.leadingAnchor).isActive = true
         recentlyPlayedTitle.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
 
-        tableView.topAnchor.constraint(equalTo: recentlyPlayedTitle.bottomAnchor, constant: Constraints.outerMargins*2).isActive = true
+        tableView.topAnchor.constraint(equalTo: recentlyPlayedTitle.bottomAnchor).isActive = true
         tableView.leadingAnchor.constraint(equalTo: layoutGuide.leadingAnchor).isActive = true
         tableView.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
         tableView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor).isActive = true

diff --git a/SpotifyDaily_iOS/App/Dashboard/Recently Played/RecentlyPlayedTracksViewModel.swift b/SpotifyDaily_iOS/App/Dashboard/Recently Played/RecentlyPlayedTracksViewModel.swift
@@ -73,7 +73,7 @@ RecentlyPlayedTracksViewModelOutput {
         // Initializing utputs
         title = Observable.just("Your Recently Played Tracks")
 
-        trackCollections = sessionService.getRecentlyPlayedTracks(limit: 20)
+        trackCollections = sessionService.getRecentlyPlayedTracks(limit: 50)
             .flatMapLatest { [unowned self] tracks -> Observable<[RecentlyPlayedTrack]> in
                 var updatedTracks = [RecentlyPlayedTrack]()
 

diff --git a/SpotifyDaily_iOS/App/Dashboard/Top Artists/TopArtistsCollectionViewController.swift b/SpotifyDaily_iOS/App/Dashboard/Top Artists/TopArtistsCollectionViewController.swift
@@ -66,7 +66,7 @@ final class TopArtistsCollectionViewController: UIViewController, BindableType {
         artistsTimeRangeControl.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
         artistsTimeRangeControl.heightAnchor.constraint(equalToConstant: Constraints.height).isActive = true
 
-        collectionView.topAnchor.constraint(equalTo: artistsTimeRangeControl.bottomAnchor, constant: Constraints.controlMargin*2).isActive = true
+        collectionView.topAnchor.constraint(equalTo: artistsTimeRangeControl.bottomAnchor).isActive = true
         collectionView.leadingAnchor.constraint(equalTo: layoutGuide.leadingAnchor).isActive = true
         collectionView.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
         collectionView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor).isActive = true

diff --git a/SpotifyDaily_iOS/App/Dashboard/Top Tracks/TopTracksCollectionViewController.swift b/SpotifyDaily_iOS/App/Dashboard/Top Tracks/TopTracksCollectionViewController.swift
@@ -66,7 +66,7 @@ final class TopTracksCollectionViewController: UIViewController, BindableType {
         tracksTimeRangeControl.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
         tracksTimeRangeControl.heightAnchor.constraint(equalToConstant: Constraints.height).isActive = true
 
-        collectionView.topAnchor.constraint(equalTo: tracksTimeRangeControl.bottomAnchor, constant: Constraints.controlMargin*2).isActive = true
+        collectionView.topAnchor.constraint(equalTo: tracksTimeRangeControl.bottomAnchor).isActive = true
         collectionView.leadingAnchor.constraint(equalTo: layoutGuide.leadingAnchor).isActive = true
         collectionView.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor).isActive = true
         collectionView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor).isActive = true

diff --git a/SpotifyDaily_iOS/App/DrawerMenu/DrawerMenuViewController.swift b/SpotifyDaily_iOS/App/DrawerMenu/DrawerMenuViewController.swift
@@ -13,7 +13,7 @@ import RxCocoa
 
 class DrawerMenuViewController: UIViewController {
 
-    private var selectedRow: Int = 0
+    private var selectedRow: Int = 1
     private let disposeBag = DisposeBag()
 
     private lazy var tableView = UITableView.tableView
@@ -23,7 +23,7 @@ class DrawerMenuViewController: UIViewController {
 
     var viewModel: DrawerMenuViewModel? {
         didSet {
-            self.selectedRow = 0
+            self.selectedRow = 1
             self.setUpBindings()
         }
     }

diff --git a/SpotifyDaily_iOS/App/DrawerMenu/DrawerMenuViewModel.swift b/SpotifyDaily_iOS/App/DrawerMenu/DrawerMenuViewModel.swift
@@ -14,7 +14,7 @@ class DrawerMenuViewModel {
     private let sessionService: SessionService
     private let dataManager: DataManager
 
-    let didSelectScreen = BehaviorSubject(value: DrawerMenuScreen.new_releases)
+    let didSelectScreen = BehaviorSubject(value: DrawerMenuScreen.dashboard)
 
     let menuItems = Observable.just([
         "New Releases",

diff --git a/SpotifyDaily_iOS/App/New Releases/Cell/NewTrackCell.swift b/SpotifyDaily_iOS/App/New Releases/Cell/NewTrackCell.swift
@@ -102,7 +102,7 @@ private extension UILabel {
     static var trackLabel: UILabel {
         let label = UILabel()
         label.textColor = ColorPreference.tertiaryColor
-        label.font = UIFont.systemFont(ofSize: 18, weight: .semibold)
+        label.font = UIFont.systemFont(ofSize: 14, weight: .semibold)
         label.textAlignment = .left
         label.numberOfLines = 0
 

diff --git a/SpotifyDaily_iOS/App/New Releases/NewReleasesViewController.swift b/SpotifyDaily_iOS/App/New Releases/NewReleasesViewController.swift
@@ -71,7 +71,7 @@ final class NewReleasesViewController: ViewControllerWithSideMenu, BindableType
         emptyLabel.topAnchor.constraint(equalTo: newReleasesSlider.bottomAnchor).isActive = true
         emptyLabel.leadingAnchor.constraint(equalTo: layoutGuide.leadingAnchor, constant: Constraints.outerMargins).isActive = true
         emptyLabel.trailingAnchor.constraint(equalTo: layoutGuide.trailingAnchor, constant: -Constraints.outerMargins).isActive = true
-        emptyLabel.bottomAnchor.constraint(equalTo: self.view.bottomAnchor).isActive = true
+        emptyLabel.bottomAnchor.constraint(equalTo: layoutGuide.bottomAnchor).isActive = true
     }
 
     private func configureNavigationBar() {