Improve empty retry UX (#2323)

rnystrom · web-flow · commit 970ac9ddd1b1 · 2018-10-20T22:25:36.000-04:00
diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
@@ -621,8 +621,8 @@ final class IssuesViewController: MessageViewController,
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
-        self.feed.refreshHead()
+    func didTapRetry(view: EmptyView) {
+        feed.refreshHead()
     }
 
     // MARK: MessageTextViewListener
diff --git a/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift b/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift
@@ -193,8 +193,8 @@ final class PullRequestReviewCommentsViewController: MessageViewController,
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
-        self.feed.refreshHead()
+    func didTapRetry(view: EmptyView) {
+        feed.refreshHead()
     }
 
     // MARK: IssueTextActionsViewSendDelegate
diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift
@@ -169,8 +169,8 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
-        self.onRefresh()
+    func didTapRetry(view: EmptyView) {
+        onRefresh()
     }
 
 }
diff --git a/Classes/Repository/RepositoryWebViewController.swift b/Classes/Repository/RepositoryWebViewController.swift
@@ -133,8 +133,8 @@ extension RepositoryWebViewController: WKNavigationDelegate {
 
 extension RepositoryWebViewController: EmptyViewDelegate {
 
-    func didTapRetry() {
-        self.fetch()
+    func didTapRetry(view: EmptyView) {
+        fetch()
     }
 
 }
diff --git a/Classes/Search/SearchViewController.swift b/Classes/Search/SearchViewController.swift
@@ -235,7 +235,7 @@ class SearchViewController: UIViewController,
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
+    func didTapRetry(view: EmptyView) {
         searchBar.resignFirstResponder()
 
         guard let term = searchTerm(for: searchBar.text) else { return }
diff --git a/Classes/View Controllers/BaseListViewController.swift b/Classes/View Controllers/BaseListViewController.swift
@@ -78,7 +78,7 @@ LoadMoreSectionControllerDelegate {
     // MARK: Public API
 
     final func update(animated: Bool) {
-        self.feed.finishLoading(dismissRefresh: true, animated: animated)
+        feed.finishLoading(dismissRefresh: true, animated: animated)
     }
 
     final func update(
@@ -88,9 +88,9 @@ LoadMoreSectionControllerDelegate {
         ) {
         assert(Thread.isMainThread)
 
-        self.hasError = false
+        hasError = false
         self.page = page
-        self.feed.finishLoading(dismissRefresh: true, animated: animated, completion: completion)
+        feed.finishLoading(dismissRefresh: true, animated: animated, completion: completion)
     }
 
     final func error(
@@ -179,8 +179,11 @@ LoadMoreSectionControllerDelegate {
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
-        self.feed.refreshHead()
+    func didTapRetry(view: EmptyView) {
+        // order is required to hide the error empty view while loading
+        feed.refreshHead()
+        hasError = false
+        feed.adapter.performUpdates(animated: false, completion: nil)
     }
 
     // MARK: LoadMoreSectionControllerDelegate
diff --git a/Classes/View Controllers/BaseListViewController2.swift b/Classes/View Controllers/BaseListViewController2.swift
@@ -169,8 +169,11 @@ EmptyViewDelegate {
 
     // MARK: EmptyViewDelegate
 
-    func didTapRetry() {
-        self.feed.refreshHead()
+    func didTapRetry(view: EmptyView) {
+        // order is required to hide the error empty view while loading
+        feed.refreshHead()
+        hasError = false
+        feed.adapter.performUpdates(animated: false, completion: nil)
     }
 
 }
diff --git a/Classes/Views/Constants.swift b/Classes/Views/Constants.swift
@@ -56,7 +56,6 @@ enum Constants {
         static let assignees = NSLocalizedString("Assignees", comment: "")
         static let reviewers = NSLocalizedString("Reviewers", comment: "")
         static let reviewGitHubAccess = NSLocalizedString("Review GitHub Access", comment: "")
-        static let tryAgain = NSLocalizedString("Try Again", comment: "")
         static let clear = NSLocalizedString("Clear", comment: "")
     }
 }
diff --git a/Classes/Views/EmptyView.swift b/Classes/Views/EmptyView.swift
@@ -10,7 +10,7 @@ import UIKit
 import SnapKit
 
 protocol EmptyViewDelegate: class {
-    func didTapRetry()
+    func didTapRetry(view: EmptyView)
 }
 
 final class EmptyView: UIView {
@@ -30,8 +30,8 @@ final class EmptyView: UIView {
         addSubview(label)
 
         button.isHidden = true
-        button.titleLabel?.font = Styles.Text.button.preferredFont
-        button.setTitle(Constants.Strings.tryAgain, for: .normal)
+        button.titleLabel?.font = Styles.Text.secondaryBold.preferredFont
+        button.setTitle(NSLocalizedString("Try Again", comment: ""), for: .normal)
         button.setTitleColor(Styles.Colors.Blue.medium.color, for: .normal)
         button.addTarget(self, action: #selector(tapRetry), for: .touchUpInside)
         addSubview(button)
@@ -43,7 +43,7 @@ final class EmptyView: UIView {
 
         button.snp.makeConstraints { make in
             make.centerX.equalTo(self)
-            make.top.equalTo(label).offset(Styles.Sizes.gutter)
+            make.top.equalTo(label).offset(2*Styles.Sizes.gutter)
         }
     }
 
@@ -52,6 +52,6 @@ final class EmptyView: UIView {
     }
 
     @objc private func tapRetry(sender: UIButton) {
-        delegate?.didTapRetry()
+        delegate?.didTapRetry(view: self)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -621,8 +621,8 @@ final class IssuesViewController: MessageViewController,`
`621`	`621`
`622`	`622`	`// MARK: EmptyViewDelegate`
`623`	`623`
`624`		`- func didTapRetry() {`
`625`		`- self.feed.refreshHead()`
	`624`	`+ func didTapRetry(view: EmptyView) {`
	`625`	`+ feed.refreshHead()`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`// MARK: MessageTextViewListener`
Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,8 @@ final class PullRequestReviewCommentsViewController: MessageViewController,`
`193`	`193`
`194`	`194`	`// MARK: EmptyViewDelegate`
`195`	`195`
`196`		`- func didTapRetry() {`
`197`		`- self.feed.refreshHead()`
	`196`	`+ func didTapRetry(view: EmptyView) {`
	`197`	`+ feed.refreshHead()`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`// MARK: IssueTextActionsViewSendDelegate`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat`
`169`	`169`
`170`	`170`	`// MARK: EmptyViewDelegate`
`171`	`171`
`172`		`- func didTapRetry() {`
`173`		`- self.onRefresh()`
	`172`	`+ func didTapRetry(view: EmptyView) {`
	`173`	`+ onRefresh()`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ extension RepositoryWebViewController: WKNavigationDelegate {`
`133`	`133`
`134`	`134`	`extension RepositoryWebViewController: EmptyViewDelegate {`
`135`	`135`
`136`		`- func didTapRetry() {`
`137`		`- self.fetch()`
	`136`	`+ func didTapRetry(view: EmptyView) {`
	`137`	`+ fetch()`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,11 @@ EmptyViewDelegate {`
`169`	`169`
`170`	`170`	`// MARK: EmptyViewDelegate`
`171`	`171`
`172`		`- func didTapRetry() {`
`173`		`- self.feed.refreshHead()`
	`172`	`+ func didTapRetry(view: EmptyView) {`
	`173`	`+ // order is required to hide the error empty view while loading`
	`174`	`+ feed.refreshHead()`
	`175`	`+ hasError = false`
	`176`	`+ feed.adapter.performUpdates(animated: false, completion: nil)`
`174`	`177`	`}`
`175`	`178`
`176`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ enum Constants {`
`56`	`56`	`static let assignees = NSLocalizedString("Assignees", comment: "")`
`57`	`57`	`static let reviewers = NSLocalizedString("Reviewers", comment: "")`
`58`	`58`	`static let reviewGitHubAccess = NSLocalizedString("Review GitHub Access", comment: "")`
`59`		`- static let tryAgain = NSLocalizedString("Try Again", comment: "")`
`60`	`59`	`static let clear = NSLocalizedString("Clear", comment: "")`
`61`	`60`	`}`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import UIKit`
`10`	`10`	`import SnapKit`
`11`	`11`
`12`	`12`	`protocol EmptyViewDelegate: class {`
`13`		`- func didTapRetry()`
	`13`	`+ func didTapRetry(view: EmptyView)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`final class EmptyView: UIView {`
`@@ -30,8 +30,8 @@ final class EmptyView: UIView {`
`30`	`30`	`addSubview(label)`
`31`	`31`
`32`	`32`	`button.isHidden = true`
`33`		`- button.titleLabel?.font = Styles.Text.button.preferredFont`
`34`		`- button.setTitle(Constants.Strings.tryAgain, for: .normal)`
	`33`	`+ button.titleLabel?.font = Styles.Text.secondaryBold.preferredFont`
	`34`	`+ button.setTitle(NSLocalizedString("Try Again", comment: ""), for: .normal)`
`35`	`35`	`button.setTitleColor(Styles.Colors.Blue.medium.color, for: .normal)`
`36`	`36`	`button.addTarget(self, action: #selector(tapRetry), for: .touchUpInside)`
`37`	`37`	`addSubview(button)`
`@@ -43,7 +43,7 @@ final class EmptyView: UIView {`
`43`	`43`
`44`	`44`	`button.snp.makeConstraints { make in`
`45`	`45`	`make.centerX.equalTo(self)`
`46`		`- make.top.equalTo(label).offset(Styles.Sizes.gutter)`
	`46`	`+ make.top.equalTo(label).offset(2*Styles.Sizes.gutter)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`@@ -52,6 +52,6 @@ final class EmptyView: UIView {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@objc private func tapRetry(sender: UIButton) {`
`55`		`- delegate?.didTapRetry()`
	`55`	`+ delegate?.didTapRetry(view: self)`
`56`	`56`	`}`
`57`	`57`	`}`