diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 6b6da7579..459033260 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -81,6 +81,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner, Ma refreshControl!.tintColor = .clear progressBarViewController.view.backgroundColor = .clear + progressBarViewController.view.translatesAutoresizingMaskIntoConstraints = false let refreshProgressItemButton = UIBarButtonItem(customView: progressBarViewController.view) toolbarItems?.insert(refreshProgressItemButton, at: 2) diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/MasterFeed/RefreshProgressView.swift index a93e1c1ce..654789e65 100644 --- a/iOS/MasterFeed/RefreshProgressView.swift +++ b/iOS/MasterFeed/RefreshProgressView.swift @@ -23,23 +23,20 @@ struct RefreshProgressView: View { } var body: some View { - ZStack { - if refreshProgressModel.isRefreshing { - if refreshProgressModel.isIndeterminate { - indeterminateProgressView - } else { - ProgressView(value: refreshProgressModel.progress) - .progressViewStyle(LinearProgressViewStyle()) - .frame(width: Self.width, height: Self.height) - } + if refreshProgressModel.isRefreshing { + if refreshProgressModel.isIndeterminate { + indeterminateProgressView } else { - Text(refreshProgressModel.label) - .accessibilityLabel(refreshProgressModel.label) - .font(.footnote) - .foregroundColor(.secondary) + ProgressView(value: refreshProgressModel.progress) + .progressViewStyle(LinearProgressViewStyle()) + .frame(width: Self.width, height: Self.height) } + } else { + Text(refreshProgressModel.label) + .accessibilityLabel(refreshProgressModel.label) + .font(.footnote) + .foregroundColor(.secondary) } - .frame(width: 200, height: 44) } var indeterminateProgressView: some View { diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index bdd4289a5..c55c36f4a 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -101,6 +101,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner refreshControl!.tintColor = .clear progressBarViewController.view.backgroundColor = .clear + progressBarViewController.view.translatesAutoresizingMaskIntoConstraints = false refreshProgressItemButton = UIBarButtonItem(customView: progressBarViewController.view) configureToolbar()