Small nav bar tweaks #3

Lloyd1nSpace-zz · Oct 8, 2016 · 1b4522f · 1b4522f
1 parent 905d9de
commit 1b4522f
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 118 deletions.
diff --git a/Music-Hole/Music-Hole/ArtistInfoViewController.swift b/Music-Hole/Music-Hole/ArtistInfoViewController.swift
@@ -198,7 +198,6 @@ class ArtistInfoViewController: UIViewController, UIScrollViewDelegate {
         self.contentView.addSubview(self.similarArtistsLabel)
         self.contentView.addSubview(self.similarArtistImageLabelStackView)
 
-
         self.viewConstraints()
     }
 
@@ -468,6 +467,124 @@ class ArtistInfoViewController: UIViewController, UIScrollViewDelegate {
 
     }
 
+    func getArtistDiscographyWithCompletion(artistName: String, completion: @escaping () -> ()) {
+
+        var listOfAlbums = [Album]()
+        var listOfAlbumNames = [String]()
+
+
+        //need to get artistID before getting their discography info
+        SpotifyAPIClient.getArtistIDWithCompletion(artistName: artistName) { (ArtistID) in
+
+            SpotifyAPIClient.getArtistDiscographyWithCompletion(artistID: ArtistID) { (allArtistAlbums) in
+
+                print("ArtistName: \(artistName)\nArtistID: \(ArtistID)")
+
+                guard let allAlbums = allArtistAlbums["items"] as? [[String:AnyObject]]
+                    else {
+                        print("could not get list of albums")
+                        return }
+
+                for album in allAlbums {
+                    print("SPECIFIC ALBUM IN ALBUM RESULTS: \(album)")
+                    print("album name: \(album["name"])")
+                    print("album images: \(album["images"]?.lastObject)")
+                    guard
+                        let albumName = album["name"] as? String,
+                        let albumImageInfo = album["images"]?.lastObject as? [String:AnyObject],
+                        let albumImageURLString = albumImageInfo["url"] as? String
+                        else {
+                            print("could not get specific album info")
+                            return
+                    }
+
+                    let albumImageURL = URL(string: albumImageURLString)
+                    let albumImageData = try? Data(contentsOf: albumImageURL!)
+                    let albumImage = UIImage(data: albumImageData!)
+                    let addArtistAlbum = Album(albumArtist: artistName, albumName: albumName, albumImage: albumImage!)
+
+
+                    let checkDuplicateAlbumName = addArtistAlbum.albumName
+                    if !listOfAlbumNames.contains(checkDuplicateAlbumName) {
+                        listOfAlbumNames.append(checkDuplicateAlbumName)
+                        listOfAlbums.append(addArtistAlbum)
+                    }
+                }
+
+
+                for artist in self.artistDataStore.testArtistAndDiscography {
+                    print ("checking to add album for artist \(artist.name)")
+                    print("number of albums to add: \(listOfAlbums.count)")
+                    if artist.name == artistName {
+                        print("found a match! \(artistName) == \(artist.name)")
+                        print("current artist info: \(artist.discography?.count)")
+                        artist.discography!.append(contentsOf: listOfAlbums)
+                        print("after adding album: \(artist.discography?.count)")
+                    }
+                }
+
+                print("******** ARTIST & DISCOGRAPHY INFORMATION ********")
+                for artist in self.artistDataStore.testArtistAndDiscography {
+                    print("artist name: \(artist.name)")
+                    print("artist id: \(artist.spotifyID)")
+                    for album in artist.discography! {
+                        print("\(album.albumName)")
+                    }
+                }
+                print("***************************************************")
+
+                completion()
+            } // end discography call
+            completion()
+        } // end artist id call
+    }
+
+    func artistDiscographyImages(discographyForArtist: Artist) {
+
+        print("INSIDE FUNCTION -- obtaining discography images for \(discographyForArtist)")
+
+        guard let artistDiscography = discographyForArtist.discography else {
+            print("could not unwrap artist discography to populate images")
+            return
+        }
+        var discographyButtons = [self.discogButton1, self.discogButton2, self.discogButton3, self.discogButton4, self.discogButton5]
+        var discographyTextLabels = [self.discogLabel1, self.discogLabel2, self.discogLabel3, self.discogLabel4, self.discogLabel5]
+
+
+        var artistDiscographyInfoDisplay = [(UILabel, UIButton)]()
+        for (index, label) in discographyTextLabels.enumerated() {
+            let clearDiscographyButton = discographyButtons[index]
+            OperationQueue.main.addOperation {
+                clearDiscographyButton.backgroundColor = UIColor.clear
+            } //needed to add this queue b/c there was a delay in changing the background color from green to clear
+            artistDiscographyInfoDisplay.append((label, clearDiscographyButton))
+        }
+
+
+        for (index, album) in artistDiscography.enumerated() {
+            var currentLabel = UILabel()
+            var currentButton = UIButton()
+
+            if index <= artistDiscographyInfoDisplay.count-1 {
+                currentLabel = discographyTextLabels[index]
+                currentLabel.text = album.albumName
+
+                currentButton = discographyButtons[index]
+                currentButton.setBackgroundImage(album.albumImage, for: .normal)
+
+                artistDiscographyInfoDisplay[index] = (currentLabel, currentButton)
+            } else {
+                break
+            }
+        }
+
+        print("***** CHECKING DISCOG INFO *****")
+        for info in artistDiscographyInfoDisplay {
+            print("album name: \(info.0.text), album image: \(info.1.description)")
+        }
+
+    }
+
     @IBAction func similarArtist1ButtonTapped() {
 
         print("Similar artists button tapped!")
@@ -944,122 +1061,6 @@ class ArtistInfoViewController: UIViewController, UIScrollViewDelegate {
         })
     }
 
-    func getArtistDiscographyWithCompletion(artistName: String, completion: @escaping () -> ()) {
-
-        var listOfAlbums = [Album]()
-        var listOfAlbumNames = [String]()
-
-
-        //need to get artistID before getting their discography info
-        SpotifyAPIClient.getArtistIDWithCompletion(artistName: artistName) { (ArtistID) in
-
-            SpotifyAPIClient.getArtistDiscographyWithCompletion(artistID: ArtistID) { (allArtistAlbums) in
-
-                print("ArtistName: \(artistName)\nArtistID: \(ArtistID)")
-
-                guard let allAlbums = allArtistAlbums["items"] as? [[String:AnyObject]]
-                    else {
-                        print("could not get list of albums")
-                        return }
-
-                for album in allAlbums {
-                    print("SPECIFIC ALBUM IN ALBUM RESULTS: \(album)")
-                    print("album name: \(album["name"])")
-                    print("album images: \(album["images"]?.lastObject)")
-                    guard
-                        let albumName = album["name"] as? String,
-                        let albumImageInfo = album["images"]?.lastObject as? [String:AnyObject],
-                        let albumImageURLString = albumImageInfo["url"] as? String
-                        else {
-                            print("could not get specific album info")
-                            return
-                    }
-
-                    let albumImageURL = URL(string: albumImageURLString)
-                    let albumImageData = try? Data(contentsOf: albumImageURL!)
-                    let albumImage = UIImage(data: albumImageData!)
-                    let addArtistAlbum = Album(albumArtist: artistName, albumName: albumName, albumImage: albumImage!)
-
-
-                    let checkDuplicateAlbumName = addArtistAlbum.albumName
-                    if !listOfAlbumNames.contains(checkDuplicateAlbumName) {
-                        listOfAlbumNames.append(checkDuplicateAlbumName)
-                        listOfAlbums.append(addArtistAlbum)
-                    }
-                }
-
-
-                for artist in self.artistDataStore.testArtistAndDiscography {
-                    print ("checking to add album for artist \(artist.name)")
-                    print("number of albums to add: \(listOfAlbums.count)")
-                    if artist.name == artistName {
-                        print("found a match! \(artistName) == \(artist.name)")
-                        print("current artist info: \(artist.discography?.count)")
-                        artist.discography!.append(contentsOf: listOfAlbums)
-                        print("after adding album: \(artist.discography?.count)")
-                    }
-                }
-
-                print("******** ARTIST & DISCOGRAPHY INFORMATION ********")
-                for artist in self.artistDataStore.testArtistAndDiscography {
-                    print("artist name: \(artist.name)")
-                    print("artist id: \(artist.spotifyID)")
-                    for album in artist.discography! {
-                        print("\(album.albumName)")
-                    }
-                }
-                print("***************************************************")
-
-                completion()
-            } // end discography call
-            completion()
-        } // end artist id call
-    }
 
-    func artistDiscographyImages(discographyForArtist: Artist) {
-
-        print("INSIDE FUNCTION -- obtaining discography images for \(discographyForArtist)")
-
-        guard let artistDiscography = discographyForArtist.discography else {
-            print("could not unwrap artist discography to populate images")
-            return
-        }
-        var discographyButtons = [self.discogButton1, self.discogButton2, self.discogButton3, self.discogButton4, self.discogButton5]
-        var discographyTextLabels = [self.discogLabel1, self.discogLabel2, self.discogLabel3, self.discogLabel4, self.discogLabel5]
-
-
-        var artistDiscographyInfoDisplay = [(UILabel, UIButton)]()
-        for (index, label) in discographyTextLabels.enumerated() {
-            let clearDiscographyButton = discographyButtons[index]
-            OperationQueue.main.addOperation {
-                clearDiscographyButton.backgroundColor = UIColor.clear
-            } //needed to add this queue b/c there was a delay in changing the background color from green to clear
-            artistDiscographyInfoDisplay.append((label, clearDiscographyButton))
-        }
-
-
-        for (index, album) in artistDiscography.enumerated() {
-            var currentLabel = UILabel()
-            var currentButton = UIButton()
-
-            if index <= artistDiscographyInfoDisplay.count-1 {
-                currentLabel = discographyTextLabels[index]
-                currentLabel.text = album.albumName
-
-                currentButton = discographyButtons[index]
-                currentButton.setBackgroundImage(album.albumImage, for: .normal)
-
-                artistDiscographyInfoDisplay[index] = (currentLabel, currentButton)
-            } else {
-                break
-            }
-        }
-
-        print("***** CHECKING DISCOG INFO *****")
-        for info in artistDiscographyInfoDisplay {
-            print("album name: \(info.0.text), album image: \(info.1.description)")
-        }
-
-    }
 
 }
diff --git a/Music-Hole/Music-Hole/ArtistNameViewController.swift b/Music-Hole/Music-Hole/ArtistNameViewController.swift
@@ -26,6 +26,12 @@ class ArtistNameViewController: UIViewController, UITableViewDelegate, UITableVi
 
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+             self.navigationController?.navigationBar.topItem?.title = "Top Artists"
+    }
+
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.artistDataStore.topArtists.count
     }

diff --git a/Music-Hole/Music-Hole/SearchViewController.swift b/Music-Hole/Music-Hole/SearchViewController.swift
@@ -21,6 +21,8 @@ class SearchViewController: UIViewController, UISearchBarDelegate {
 
     func searchBarSetup() {
 
+        self.navigationController?.navigationBar.topItem?.title = "Search"
+
       //  self.view.backgroundColor = UIColor.init(gradientStyle: UIGradientStyle.topToBottom, withFrame: self.view.frame, andColors: Constants.orangeToYellowColorArray)
         self.view.backgroundColor = UIColor.yellow
 
@@ -31,7 +33,6 @@ class SearchViewController: UIViewController, UISearchBarDelegate {
         self.searchBar.widthAnchor.constraint(equalTo: self.view.widthAnchor).isActive = true
         self.searchBar.centerYAnchor.constraint(equalTo: self.view.topAnchor, constant: 80).isActive = true
         self.searchBar.centerXAnchor.constraint(equalTo: self.view.centerXAnchor).isActive = true
-
 
         self.searchBar.barTintColor = Constants.mainColor
         self.searchBar.isTranslucent = true