fix issue #10 - add network indicator when network requests are runni…

…ng - udacity/ios-nd-networking#10
BrentMifsud · Jun 2, 2019 · 401deae · 401deae
1 parent 6f89097
commit 401deae
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/TheMovieManager/Controller/FavoritesViewController.swift b/TheMovieManager/Controller/FavoritesViewController.swift
@@ -38,7 +38,6 @@ class FavoritesViewController: UIViewController {
             detailVC.movie = MovieModel.favorites[selectedIndex]
         }
     }
-
 }
 
 extension FavoritesViewController: UITableViewDataSource, UITableViewDelegate {
@@ -53,6 +52,8 @@ extension FavoritesViewController: UITableViewDataSource, UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "MovieTableViewCell")!
+
+		isDownloading(true)
 
         let movie = MovieModel.favorites[indexPath.row]
 
@@ -62,8 +63,12 @@ extension FavoritesViewController: UITableViewDataSource, UITableViewDelegate {
 		if let posterPath = movie.posterPath {
 			TMDBClient.downloadPosterImage(posterPath: posterPath) { (data, error) in
 				guard let data = data else { return }
+
+				unowned let favoritesVC = self
+
 				cell.imageView?.image = UIImage(data: data)
 				cell.setNeedsLayout()
+				favoritesVC.isDownloading(false)
 			}
 		}
 

diff --git a/TheMovieManager/Controller/SearchViewController.swift b/TheMovieManager/Controller/SearchViewController.swift
@@ -74,7 +74,9 @@ extension SearchViewController: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "MovieTableViewCell")!
 
-        let movie = movies[indexPath.row]
+		isDownloading(true)
+
+		let movie = movies[indexPath.row]
 
         cell.textLabel?.text = "\(movie.title)"
 
@@ -87,8 +89,12 @@ extension SearchViewController: UITableViewDataSource, UITableViewDelegate {
 		if let posterPath = movie.posterPath {
 			TMDBClient.downloadPosterImage(posterPath: posterPath) { (data, error) in
 				guard let data = data else { return }
+
+				unowned let searchVC = self
+
 				cell.imageView?.image = UIImage(data: data)
 				cell.setNeedsLayout()
+				searchVC.isDownloading(false)
 			}
 		}
 
@@ -108,6 +114,7 @@ extension SearchViewController: UITableViewDataSource, UITableViewDelegate {
 		guard indexPath.row == movies.count-1 else { return }
 
 		if let query = searchBar.text {
+			isDownloading(true)
 			TMDBClient.searchForMovie(query: query, page: currentPageNumber + 1) { (movieResults, error) in
 				if let movieResults = movieResults {
 					weak var searchVC = self
@@ -117,6 +124,7 @@ extension SearchViewController: UITableViewDataSource, UITableViewDelegate {
 					searchVC?.maxPageCount = movieResults.totalPages
 				}
 			}
+			isDownloading(false)
 		}
 	}
 

diff --git a/TheMovieManager/Controller/UIViewController+Extension.swift b/TheMovieManager/Controller/UIViewController+Extension.swift
@@ -17,4 +17,8 @@ extension UIViewController {
 			}
 		}
     }
+
+	func isDownloading(_ downloading: Bool) {
+		UIApplication.shared.isNetworkActivityIndicatorVisible = downloading
+	}
 }
diff --git a/TheMovieManager/Controller/WatchlistViewController.swift b/TheMovieManager/Controller/WatchlistViewController.swift
@@ -53,16 +53,22 @@ extension WatchlistViewController: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "MovieTableViewCell")!
 
-        let movie = MovieModel.watchlist[indexPath.row]
+		isDownloading(true)
+
+		let movie = MovieModel.watchlist[indexPath.row]
 
 		cell.textLabel?.text = movie.title
 		cell.imageView?.image = UIImage(named: "MoviePlaceholder")
 
 		if let posterPath = movie.posterPath {
 			TMDBClient.downloadPosterImage(posterPath: posterPath) { (data, error) in
 				guard let data = data else { return }
+
+				unowned let watchlistVC = self
+
 				cell.imageView?.image = UIImage(data: data)
 				cell.setNeedsLayout()
+				watchlistVC.isDownloading(false)
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,8 @@ extension UIViewController { @@
     			}
     		}
         }
+    	func isDownloading(_ downloading: Bool) {
+    		UIApplication.shared.isNetworkActivityIndicatorVisible = downloading
+    	}
     }