From f4b4e5b9e470730d9b232a711261ae313b2be8fc Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 11 Nov 2022 19:01:01 -0600 Subject: [PATCH] Make the refresh progress view a fixed width --- iOS/MasterFeed/RefreshProgressView.swift | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/MasterFeed/RefreshProgressView.swift index 654789e65..a93e1c1ce 100644 --- a/iOS/MasterFeed/RefreshProgressView.swift +++ b/iOS/MasterFeed/RefreshProgressView.swift @@ -23,20 +23,23 @@ struct RefreshProgressView: View { } var body: some View { - if refreshProgressModel.isRefreshing { - if refreshProgressModel.isIndeterminate { - indeterminateProgressView + ZStack { + if refreshProgressModel.isRefreshing { + if refreshProgressModel.isIndeterminate { + indeterminateProgressView + } else { + ProgressView(value: refreshProgressModel.progress) + .progressViewStyle(LinearProgressViewStyle()) + .frame(width: Self.width, height: Self.height) + } } else { - ProgressView(value: refreshProgressModel.progress) - .progressViewStyle(LinearProgressViewStyle()) - .frame(width: Self.width, height: Self.height) + Text(refreshProgressModel.label) + .accessibilityLabel(refreshProgressModel.label) + .font(.footnote) + .foregroundColor(.secondary) } - } else { - Text(refreshProgressModel.label) - .accessibilityLabel(refreshProgressModel.label) - .font(.footnote) - .foregroundColor(.secondary) } + .frame(width: 200, height: 44) } var indeterminateProgressView: some View {