less thrashy loading spinner

Author: Ryan Nystrom

Classes/Issues/IssuesViewController.swift

@@ -169,7 +169,6 @@ final class IssuesViewController:
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        feed.viewDidAppear(animated)
         let informator = HandoffInformator(
             activityName: "viewIssue",
             activityTitle: "\(model.owner)/\(model.repo)#\(model.number)",

Classes/Labels/LabelsViewController.swift

@@ -20,15 +20,11 @@ final class LabelsViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let emptyView = EmptyView()
-        emptyView.label.text = NSLocalizedString("No labels found", comment: "")
-        emptyView.isHidden = true
-        tableView.backgroundView = emptyView
+        tableView.backgroundView = EmptyLoadingView()
 
         tableView.refreshControl = feedRefresh.refreshControl
         feedRefresh.refreshControl.addTarget(self, action: #selector(LabelsViewController.onRefresh), for: .valueChanged)
 
-        feedRefresh.beginRefreshing()
         fetch()
 
         preferredContentSize = CGSize(width: 200, height: 240)
@@ -61,7 +57,14 @@ final class LabelsViewController: UITableViewController {
         self.labels = labels.sorted { $0.name < $1.name }
         tableView.reloadData()
         tableView.layoutIfNeeded()
-        tableView.backgroundView?.isHidden = labels.count > 0
+
+        if labels.count == 0 {
+            let emptyView = EmptyView()
+            emptyView.label.text = NSLocalizedString("No labels found", comment: "")
+            tableView.backgroundView = emptyView
+        } else {
+            tableView.backgroundView?.removeFromSuperview()
+        }
     }
 
     // MARK: UITableViewDataSource

Classes/Milestones/MilestonesViewController.swift

@@ -21,15 +21,11 @@ final class MilestonesViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let emptyView = EmptyView()
-        emptyView.label.text = NSLocalizedString("No open milestones", comment: "")
-        emptyView.isHidden = true
-        tableView.backgroundView = emptyView
+        tableView.backgroundView = EmptyLoadingView()
 
         tableView.refreshControl = feedRefresh.refreshControl
         feedRefresh.refreshControl.addTarget(self, action: #selector(onRefresh), for: .valueChanged)
 
-        feedRefresh.beginRefreshing()
         fetch()
 
         preferredContentSize = CGSize(width: 200, height: 240)
@@ -64,8 +60,15 @@ final class MilestonesViewController: UITableViewController {
             case .error:
                 ToastManager.showGenericError()
             }
-            self?.tableView.backgroundView?.isHidden = (self?.milestones.count ?? 0) > 0
             self?.feedRefresh.endRefreshing()
+
+            if self?.milestones.count == 0 {
+                let emptyView = EmptyView()
+                emptyView.label.text = NSLocalizedString("No labels found", comment: "")
+                self?.tableView.backgroundView = emptyView
+            } else {
+                self?.tableView.backgroundView?.removeFromSuperview()
+            }
         }
     }
 

Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift

@@ -80,11 +80,6 @@ final class PullRequestReviewCommentsViewController: MessageViewController,
         messageView.add(contentView: actions)
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        feed.viewDidAppear(animated)
-    }
-
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         feed.viewWillLayoutSubviews(view: view)
@@ -188,8 +183,10 @@ final class PullRequestReviewCommentsViewController: MessageViewController,
             let emptyView = EmptyView()
             emptyView.label.text = NSLocalizedString("Error loading review comments.", comment: "")
             return emptyView
-        case .loading, .loadingNext:
+        case .loadingNext:
             return nil
+        case .loading:
+            return EmptyLoadingView()
         }
     }
 

Classes/Systems/Feed.swift

@@ -29,6 +29,7 @@ final class Feed: NSObject, UIScrollViewDelegate {
     private weak var delegate: FeedDelegate?
     private let feedRefresh = FeedRefresh()
     private let managesLayout: Bool
+    private let loadingView = EmptyLoadingView()
 
     init(
         viewController: UIViewController,
@@ -58,6 +59,10 @@ final class Feed: NSObject, UIScrollViewDelegate {
         feedRefresh.beginRefreshing()
     }
 
+    func showEmptyLoadingView() {
+        loadingView.isHidden = false
+    }
+
     func viewDidLoad() {
         guard let view = adapter.viewController?.view else { return }
 
@@ -70,21 +75,15 @@ final class Feed: NSObject, UIScrollViewDelegate {
         if collectionView.superview == nil {
             view.addSubview(collectionView)
         }
-    }
 
-    func viewDidAppear(_ animated: Bool) {
-        // put in a small delay to let container finish laying out
-        // prevents a bug from double-insetting the refresh control
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: {
-            if self.status == .loading {
-                self.feedRefresh.beginRefreshing()
-            }
-        })
+        view.addSubview(loadingView)
     }
 
     func viewWillLayoutSubviews(view: UIView) {
         let bounds = view.bounds
 
+        loadingView.frame = bounds
+
         let changed = bounds != collectionView.frame
         if managesLayout && changed {
             collectionView.frame = bounds
@@ -96,6 +95,7 @@ final class Feed: NSObject, UIScrollViewDelegate {
 
     func finishLoading(dismissRefresh: Bool, animated: Bool = true, completion: (() -> Void)? = nil) {
         status = .idle
+        loadingView.isHidden = true
 
         adapter.performUpdates(animated: animated) { _ in
             if dismissRefresh {

Classes/View Controllers/BaseListViewController.swift

@@ -63,11 +63,6 @@ LoadMoreSectionControllerDelegate {
         rz_smoothlyDeselectRows(collectionView: feed.collectionView)
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        feed.viewDidAppear(animated)
-    }
-
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         feed.viewWillLayoutSubviews(view: view)

Classes/Views/EmptyLoadingView.swift

@@ -0,0 +1,30 @@
+//
+//  EmptyLoadingView.swift
+//  Freetime
+//
+//  Created by Ryan Nystrom on 4/15/18.
+//  Copyright © 2018 Ryan Nystrom. All rights reserved.
+//
+
+import UIKit
+
+final class EmptyLoadingView: UIView {
+
+    private let activity = UIActivityIndicatorView(activityIndicatorStyle: .gray)
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        activity.startAnimating()
+        addSubview(activity)
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        activity.center = CGPoint(x: bounds.width/2, y: bounds.height/2)
+    }
+
+}

Freetime.xcodeproj/project.pbxproj

@@ -160,6 +160,7 @@
 		294B11221F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */; };
 		294B11241F7B37D300E04F2D /* ImageCellHeightCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B11231F7B37D200E04F2D /* ImageCellHeightCache.swift */; };
 		2950AB1B2082E47200C6F19A /* AppSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */; };
+		2950AB1D2083B1E400C6F19A /* EmptyLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2950AB1C2083B1E400C6F19A /* EmptyLoadingView.swift */; };
 		2957777B200129EB00DDD785 /* Int+Abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2957777A200129EB00DDD785 /* Int+Abbreviated.swift */; };
 		295840651EE89F28007723C6 /* IssueStatusEventModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295840641EE89F28007723C6 /* IssueStatusEventModel.swift */; };
 		295840671EE89FE4007723C6 /* IssueStatusEventCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295840661EE89FE4007723C6 /* IssueStatusEventCell.swift */; };
@@ -591,6 +592,7 @@
 		294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ScrollToTop.swift"; sourceTree = "<group>"; };
 		294B11231F7B37D200E04F2D /* ImageCellHeightCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCellHeightCache.swift; sourceTree = "<group>"; };
 		2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSplitViewController.swift; sourceTree = "<group>"; };
+		2950AB1C2083B1E400C6F19A /* EmptyLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyLoadingView.swift; sourceTree = "<group>"; };
 		2957777A200129EB00DDD785 /* Int+Abbreviated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Int+Abbreviated.swift"; sourceTree = "<group>"; };
 		295840641EE89F28007723C6 /* IssueStatusEventModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueStatusEventModel.swift; sourceTree = "<group>"; };
 		295840661EE89FE4007723C6 /* IssueStatusEventCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueStatusEventCell.swift; sourceTree = "<group>"; };
@@ -1508,6 +1510,7 @@
 				29A4768D1ED07A23005D0953 /* DateDetailsFormatter.swift */,
 				291929601F3FD2960012067B /* DiffString.swift */,
 				D8C2AEF41F9AA94600A95945 /* DotListView.swift */,
+				2950AB1C2083B1E400C6F19A /* EmptyLoadingView.swift */,
 				29C167681ECA016500439D62 /* EmptyView.swift */,
 				291929541F3FAADF0012067B /* FeedRefresh.swift */,
 				29136BDA200A626D007317BE /* FixedRefreshControl.swift */,
@@ -1520,6 +1523,7 @@
 				D8BAD05F1FDA0A1A00C41071 /* LabelListCell.swift */,
 				D8BAD0631FDF221900C41071 /* LabelListView.swift */,
 				299F63D3205DA24A0015D901 /* MarkdownAttributeHandling.swift */,
+				299F63E920603FB80015D901 /* MarkdownStyledTextView.swift */,
 				297A6CE52027880C0027E03B /* MessageView+Styles.swift */,
 				29136BE0200A7D3D007317BE /* NavigationTitleDropdownView.swift */,
 				2963A9331EE2118E0066509C /* ResponderButton.swift */,
@@ -1549,7 +1553,6 @@
 				292FF8B11F302FE7009E63F7 /* UITextView+SelectedRange.swift */,
 				298BA08E1EC90FEE00B01946 /* UIView+BottomBorder.swift */,
 				299F63E1205DE1470015D901 /* UIView+DateDetails.swift */,
-				299F63E920603FB80015D901 /* MarkdownStyledTextView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -2657,6 +2660,7 @@
 				29AC90E51F00A7C8000B80E4 /* SplitViewControllerDelegate.swift in Sources */,
 				65A3152B2044376D0074E3B6 /* Route.swift in Sources */,
 				29DB264A1FCA10A800C3D0C9 /* GithubHighlighting.swift in Sources */,
+				2950AB1D2083B1E400C6F19A /* EmptyLoadingView.swift in Sources */,
 				29A08FC11F12F08100C5368E /* String+HashDisplay.swift in Sources */,
 				29B0EF871F93DF6C00870291 /* RepositoryCodeBlobViewController.swift in Sources */,
 				2931EA471EF7734B00AEE0FF /* String+NSRange.swift in Sources */,