Skip to content

Fixed Issue: Calling start and then end too quickly causes dismiss to fail #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dragonsajan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed Issue: Calling start and then end too quickly causes dismiss to fail #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a418616
fix: Calling start and then end too quickly causes dismiss to fail
sajankushwaha Jun 20, 2023
7a40ce9
fix: Calling start and then end too quickly causes dismiss to fail
sajankushwaha Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions Progress/Classes/Prog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public final class Prog {
internal var progressors: [[Progressor]] = []
internal var maxEndingAnimationDuration: TimeInterval = 0.4
internal var fadingDuration: TimeInterval = 0.2
internal var competedAnimation = false

// MARK: - Progressors
var builtInProgressorTypes: [String: Progressor.Type] = [
Expand Down Expand Up @@ -113,6 +114,7 @@ public final class Prog {
print("\(parent) is already in progress")
return
}
shared.competedAnimation = false
shared.progressParents.append(parent)
shared.progressors.append([])

Expand All @@ -122,6 +124,11 @@ public final class Prog {
}

static func recursiveStart(in parent: ProgressParent, remainingTypes: [ProgressorType], completion: @escaping (()->Void)) {
if shared.competedAnimation {
shared.competedAnimation = true
completion()
}

if let type = remainingTypes.first {
start(in: parent, type: type) {
var remain = remainingTypes
Expand Down Expand Up @@ -172,13 +179,14 @@ public final class Prog {
- parameter completion: callback function after all the ending animation
*/
public static func end(in parent: ProgressParent, completion: @escaping (()->Void) = {}) {
recursiveEnd(in: parent, remainingProgressors: progressors(of: parent).reversed()) {
if let index = shared.progressParents.index(where: { $0 === parent}) {
shared.progressParents.remove(at: index)
shared.progressors.remove(at: index)
shared.competedAnimation = true
recursiveEnd(in: parent, remainingProgressors: progressors(of: parent).reversed()) {
if let index = shared.progressParents.index(where: { $0 === parent}) {
shared.progressParents.remove(at: index)
shared.progressors.remove(at: index)
}
completion()
}
completion()
}
}

static func recursiveEnd(in parent: ProgressParent, remainingProgressors: [Progressor], completion: @escaping (()->Void)) {
Expand Down