renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the refresh progress view correctly size itself

Browse Source
This commit is contained in:
Maurice Parker
2022-11-11 17:54:10 -06:00
parent 10381029ba
commit 8221e09702
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -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)

25
iOS/MasterFeed/RefreshProgressView.swift
View File

@@ -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 {

1
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -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()