From 8b2fa89622b9fbcb2848d6ae129075b74543f605 Mon Sep 17 00:00:00 2001 From: Brian Litwin Date: Thu, 27 Sep 2018 18:13:32 -0400 Subject: [PATCH 1/2] allows setting loading indicator's color --- Classes/Milestones/MilestonesViewController.swift | 1 + Classes/Systems/Feed.swift | 4 ++++ Classes/Views/EmptyLoadingView.swift | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/Classes/Milestones/MilestonesViewController.swift b/Classes/Milestones/MilestonesViewController.swift index d9ccd6f74..c9761bd55 100644 --- a/Classes/Milestones/MilestonesViewController.swift +++ b/Classes/Milestones/MilestonesViewController.swift @@ -44,6 +44,7 @@ MilestoneSectionControllerDelegate { preferredContentSize = Styles.Sizes.contextMenuSize feed.collectionView.backgroundColor = Styles.Colors.menuBackgroundColor.color dataSource = self + feed.setLoadingSpinnerColor(to: .white) } required init?(coder aDecoder: NSCoder) { diff --git a/Classes/Systems/Feed.swift b/Classes/Systems/Feed.swift index 3fffecd91..24ec2cf6f 100644 --- a/Classes/Systems/Feed.swift +++ b/Classes/Systems/Feed.swift @@ -66,6 +66,10 @@ final class Feed: NSObject, UIScrollViewDelegate { func showEmptyLoadingView() { loadingView.isHidden = false } + + func setLoadingSpinnerColor(to color: UIColor) { + loadingView.setSpinnerColor(to: color) + } func viewDidLoad() { guard let view = adapter.viewController?.view else { return } diff --git a/Classes/Views/EmptyLoadingView.swift b/Classes/Views/EmptyLoadingView.swift index 781cf99ad..ec72a1b3e 100644 --- a/Classes/Views/EmptyLoadingView.swift +++ b/Classes/Views/EmptyLoadingView.swift @@ -17,6 +17,10 @@ final class EmptyLoadingView: UIView { activity.startAnimating() addSubview(activity) } + + func setSpinnerColor(to color: UIColor) { + activity.color = color + } required init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") From 6525448de016b9c99fdd5a61271cb1b215e98bb4 Mon Sep 17 00:00:00 2001 From: Brian Litwin Date: Fri, 28 Sep 2018 09:03:28 -0400 Subject: [PATCH 2/2] updated spinner color to .white in Milestones/Labels/People --- Classes/Labels/LabelsViewController.swift | 1 + Classes/Milestones/MilestonesViewController.swift | 2 +- Classes/People/PeopleViewController.swift | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/Labels/LabelsViewController.swift b/Classes/Labels/LabelsViewController.swift index 547f0cf03..74eebc8af 100644 --- a/Classes/Labels/LabelsViewController.swift +++ b/Classes/Labels/LabelsViewController.swift @@ -30,6 +30,7 @@ final class LabelsViewController: BaseListViewController2, BaseListViewC preferredContentSize = Styles.Sizes.contextMenuSize title = Constants.Strings.labels feed.collectionView.backgroundColor = Styles.Colors.menuBackgroundColor.color + feed.setLoadingSpinnerColor(to: .white) dataSource = self } diff --git a/Classes/Milestones/MilestonesViewController.swift b/Classes/Milestones/MilestonesViewController.swift index c9761bd55..6f463e3f1 100644 --- a/Classes/Milestones/MilestonesViewController.swift +++ b/Classes/Milestones/MilestonesViewController.swift @@ -43,8 +43,8 @@ MilestoneSectionControllerDelegate { title = Constants.Strings.milestone preferredContentSize = Styles.Sizes.contextMenuSize feed.collectionView.backgroundColor = Styles.Colors.menuBackgroundColor.color - dataSource = self feed.setLoadingSpinnerColor(to: .white) + dataSource = self } required init?(coder aDecoder: NSCoder) { diff --git a/Classes/People/PeopleViewController.swift b/Classes/People/PeopleViewController.swift index c1dd2408e..381fcb022 100644 --- a/Classes/People/PeopleViewController.swift +++ b/Classes/People/PeopleViewController.swift @@ -55,6 +55,7 @@ PeopleSectionControllerDelegate { } feed.collectionView.backgroundColor = Styles.Colors.menuBackgroundColor.color + feed.setLoadingSpinnerColor(to: .white) preferredContentSize = Styles.Sizes.contextMenuSize updateSelectionCount() }