Skip to content

Fix: Corrected an issue where the Magic timer failed to accurately count down #25

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Corrected an issue where the Magic timer failed to accurately count down #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions Sources/MagicTimer/MagicTimer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ public class MagicTimer {
private var counter: MagicTimerCounterInterface
private var executive: MagicTimerExecutiveInterface
private var backgroundCalculator: MagicTimerBackgroundCalculatorInterface

// MARK: - Unavailable
/// A elapsed time that can observe
/// - Warning: renamed: "elapsedTimeDidChangeHandler"
public var observeElapsedTime: ((TimeInterval) -> Void)?

/// The current state of the timer.
/// - Warning: renamed: "lastState"
Expand Down Expand Up @@ -123,8 +118,9 @@ public class MagicTimer {
executive.fire {
self.backgroundCalculator.timerFiredDate = Date()
self.lastState = .fired
self.setCounter()
self.observeScheduleTimer()
}
}
}

/// Stop counting the timer.
Expand All @@ -151,6 +147,15 @@ public class MagicTimer {
}

// MARK: - Private methods
private func setCounter() {
switch countMode {
case .countDown(let fromSeconds):
counter.defultValue = fromSeconds
counter.resetToDefaultValue()
default: break
}
}

// It calculates the elapsed time user was in background.
private func calclulateBackgroundTime(elapsedTime: TimeInterval) {
switch countMode {
Expand All @@ -171,25 +176,24 @@ public class MagicTimer {
executive.scheduleTimerHandler = { [weak self] in
guard let self else { return }

switch self.countMode {
switch countMode {
case .stopWatch:
self.counter.add()
self.elapsedTime = self.counter.totalCountedValue
counter.add()
elapsedTime = counter.totalCountedValue
case .countDown(let fromSeconds):
// Checking if defaultValue plus fromSeconds not going to invalid format(negative seconds).
guard (self.defultValue + fromSeconds).truncatingRemainder(dividingBy: self.effectiveValue).isEqual(to: .zero) else {
guard (defultValue + fromSeconds).truncatingRemainder(dividingBy: effectiveValue).isEqual(to: .zero) else {
fatalError("The time does not lead to a valid format. Use valid effetiveValue")
}

self.counter.totalCountedValue = fromSeconds
guard counter.totalCountedValue.isBiggerThan(.zero) else {
executive.suspand {
self.lastState = .stopped
}
return
}
counter.subtract()
elapsedTime = self.counter.totalCountedValue
elapsedTime = counter.totalCountedValue
}
}
}
Expand Down