FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusted the progress bar so that it will make it to 100%

Browse Source
This commit is contained in:
Maurice Parker 2019-09-14 17:53:37 -05:00
parent bec1aacffc
commit 612d7d0755
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iOS/Progress/NavigationProgressView.swift
View File

@ -45,7 +45,6 @@ public final class NavigationProgressView: UIView {
}
}
/* ====================================================================== */
// MARK: - initializer
/* ====================================================================== */
@ -119,14 +118,15 @@ public final class NavigationProgressView: UIView {
// MARK: - Method
/* ====================================================================== */
internal func setProgress(_ progress: Float, animated: Bool) {
let duration: TimeInterval = animated ? 0.1 : 0
internal func setProgress(_ progress: Float, animated: Bool, completion: @escaping () -> Void) {
let duration: TimeInterval = animated ? 0.2 : 0
self.progress = progress
UIView.animate(withDuration: duration, animations: {
self.layoutIfNeeded()
})
UIView.animate(withDuration: duration, animations: { self.layoutIfNeeded() }) { _ in
completion()
}
}
}

28
iOS/Progress/UINavigationController+Progress.swift
View File

@ -95,9 +95,9 @@ public extension UINavigationController {
- parameter progress: The new progress value.
- parameter animated: true if the change should be animated, false if the change should happen immediately.
*/
func setProgress(_ progress: Float, animated: Bool) {
func setProgress(_ progress: Float, animated: Bool, completion: @escaping () -> Void) {
progressView.bar.alpha = 1
progressView.setProgress(progress, animated: animated)
progressView.setProgress(progress, animated: animated, completion: completion)
}
/**
@ -105,26 +105,22 @@ public extension UINavigationController {
*/
func finishProgress() {
progressView.bar.alpha = 1
progressView.setProgress(1, animated: true)
UIView.animate(withDuration: 0.25,
animations: {
self.progressView.bar.alpha = 0
}, completion: { finished in
self.progressView.progress = 0
progressView.setProgress(1, animated: true) {
UIView.animate(withDuration: 0.5, animations: { self.progressView.bar.alpha = 0 }) { finished in
self.progressView.progress = 0
}
}
)
}
/**
While progress is changed to 0.0, the bar will fade out.
*/
func cancelProgress() {
progressView.setProgress(0, animated: true)
UIView.animate(withDuration: 0.25, animations: {
self.progressView.bar.alpha = 0
})
progressView.setProgress(0, animated: true) {
UIView.animate(withDuration: 0.5, animations: {
self.progressView.bar.alpha = 0
})
}
}
func updateAccountRefreshProgressIndicator() {
@ -137,7 +133,7 @@ public extension UINavigationController {
}
} else {
let percent = Float(progress.numberCompleted) / Float(progress.numberOfTasks)
setProgress(percent, animated: true)
setProgress(percent, animated: true) {}
}
}