From 07340fdc1f31d265c6749db072c55fa28f4dc766 Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Sun, 3 Sep 2017 17:32:16 -0400 Subject: [PATCH] dont show repo empty state unless loaded --- Classes/Repository/RepositoryViewController.swift | 6 +++--- Classes/Systems/Feed.swift | 2 +- Resources/Info.plist | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/Repository/RepositoryViewController.swift b/Classes/Repository/RepositoryViewController.swift index e2f9b52e..061e2ce3 100644 --- a/Classes/Repository/RepositoryViewController.swift +++ b/Classes/Repository/RepositoryViewController.swift @@ -131,7 +131,7 @@ PrimaryViewController { if issuesNextPage != nil { builder.append(loadMore) } - } else { + } else if feed.status == .idle { builder.append(noIssuesResultsKey) } } else if !selection.issuesSelected { @@ -140,7 +140,7 @@ PrimaryViewController { if pullRequestsNextPage != nil { builder.append(loadMore) } - } else { + } else if feed.status == .idle { builder.append(noPullRequestsResultsKey) } } @@ -176,7 +176,7 @@ PrimaryViewController { // MARK: SegmentedControlSectionControllerDelegate func didChangeSelection(sectionController: SegmentedControlSectionController, model: SegmentedControlModel) { - update(dismissRefresh: false) + update(dismissRefresh: false, animated: false) } // MARK: SearchLoadMoreSectionControllerDelegate diff --git a/Classes/Systems/Feed.swift b/Classes/Systems/Feed.swift index 75ee39c5..ac1a2227 100644 --- a/Classes/Systems/Feed.swift +++ b/Classes/Systems/Feed.swift @@ -90,7 +90,7 @@ final class Feed: NSObject, UIScrollViewDelegate { func finishLoading(dismissRefresh: Bool, animated: Bool = true, completion: (() -> ())? = nil) { status = .idle - adapter.performUpdates(animated: true) { _ in + adapter.performUpdates(animated: animated) { _ in if dismissRefresh { self.feedRefresh.endRefreshing(completion: { completion?() diff --git a/Resources/Info.plist b/Resources/Info.plist index 32868d26..db71bf6b 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1619 + 1621 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes