FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't animate progress bar when initially added to the superview

This commit is contained in:
Maurice Parker 2020-04-29 14:29:21 -05:00
parent 83e3ad3645
commit d1c3d43018
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iOS/MasterFeed/RefreshProgressView.swift
View File

@ -19,7 +19,7 @@ class RefreshProgressView: UIView {
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange(_:)), name: UIContentSizeCategory.didChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange(_:)), name: UIContentSizeCategory.didChangeNotification, object: nil)
if !AccountManager.shared.combinedRefreshProgress.isComplete { if !AccountManager.shared.combinedRefreshProgress.isComplete {
progressChanged() progressChanged(animated: false)
} else { } else {
updateRefreshLabel() updateRefreshLabel()
} }
@ -28,7 +28,7 @@ class RefreshProgressView: UIView {
} }
override func didMoveToSuperview() { override func didMoveToSuperview() {
progressChanged() progressChanged(animated: false)
} }
func updateRefreshLabel() { func updateRefreshLabel() {
@ -54,7 +54,7 @@ class RefreshProgressView: UIView {
} }
@objc func progressDidChange(_ note: Notification) { @objc func progressDidChange(_ note: Notification) {
progressChanged() progressChanged(animated: true)
} }
@objc func contentSizeCategoryDidChange(_ note: Notification) { @objc func contentSizeCategoryDidChange(_ note: Notification) {
@ -73,7 +73,7 @@ class RefreshProgressView: UIView {
private extension RefreshProgressView { private extension RefreshProgressView {
func progressChanged() { func progressChanged(animated: Bool) {
// Layout may crash if not in the view hierarchy. // Layout may crash if not in the view hierarchy.
// https://github.com/Ranchero-Software/NetNewsWire/issues/1764 // https://github.com/Ranchero-Software/NetNewsWire/issues/1764
let isInViewHierarchy = self.superview != nil let isInViewHierarchy = self.superview != nil
@ -82,7 +82,7 @@ private extension RefreshProgressView {
if progress.isComplete { if progress.isComplete {
if isInViewHierarchy { if isInViewHierarchy {
progressView.setProgress(1, animated: true) progressView.setProgress(1, animated: animated)
} }
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
// Check that there are no pending downloads. // Check that there are no pending downloads.
@ -91,7 +91,7 @@ private extension RefreshProgressView {
self.label.isHidden = false self.label.isHidden = false
self.progressView.isHidden = true self.progressView.isHidden = true
if self.superview != nil { if self.superview != nil {
self.progressView.setProgress(0, animated: true) self.progressView.setProgress(0, animated: animated)
} }
} }
} }
@ -103,7 +103,7 @@ private extension RefreshProgressView {
// Don't let the progress bar go backwards unless we need to go back more than 25% // Don't let the progress bar go backwards unless we need to go back more than 25%
if percent > progressView.progress || progressView.progress - percent > 0.25 { if percent > progressView.progress || progressView.progress - percent > 0.25 {
progressView.setProgress(percent, animated: true) progressView.setProgress(percent, animated: animated)
} }
} }
} }