From d66620d906b34d6028e09f7831ae37ae462bcb0b Mon Sep 17 00:00:00 2001
From: Vlad Suhomlinov <suhomlinov.dev@gmail.com>
Date: Thu, 16 Sep 2021 08:50:35 +0300
Subject: [PATCH] refactor: add pause and resume

---
 .../Sources/TITimer/Protocols/ITimer.swift    |  3 +-
 .../TITimer/Sources/TITimer/TITimer.swift     | 46 ++++++++++++-------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/TIFoundationUtils/Sources/TITimer/Sources/TITimer/Protocols/ITimer.swift b/TIFoundationUtils/Sources/TITimer/Sources/TITimer/Protocols/ITimer.swift
index 5d5d4900..17757062 100644
--- a/TIFoundationUtils/Sources/TITimer/Sources/TITimer/Protocols/ITimer.swift
+++ b/TIFoundationUtils/Sources/TITimer/Sources/TITimer/Protocols/ITimer.swift
@@ -21,6 +21,7 @@
 //
 
 import Foundation
+import TISwiftUtils
 
 public protocol ITimer: Invalidatable {
     
@@ -31,7 +32,7 @@ public protocol ITimer: Invalidatable {
     var isRunning: Bool { get }
     
     // Подписка на изменение прошедшего времени
-    var eventHandler: ((TimeInterval) -> Void)? { get set }
+    var eventHandler: ParameterClosure<TimeInterval>? { get set }
     
     // Запустить работу таймера
     func start(with interval: TimeInterval)
diff --git a/TIFoundationUtils/Sources/TITimer/Sources/TITimer/TITimer.swift b/TIFoundationUtils/Sources/TITimer/Sources/TITimer/TITimer.swift
index fe89c6f3..90ca49b8 100644
--- a/TIFoundationUtils/Sources/TITimer/Sources/TITimer/TITimer.swift
+++ b/TIFoundationUtils/Sources/TITimer/Sources/TITimer/TITimer.swift
@@ -66,30 +66,27 @@ public final class TITimer: ITimer {
         invalidate()
         
         self.interval = interval
+        self.elapsedTime = 0
         
-        switch type {
-        case let .dispatchSourceTimer(queue):
-            sourceTimer = startDispatchSourceTimer(interval: interval, queue: queue)
-            
-        case let .runloopTimer(runloop, mode):
-            sourceTimer = startTimer(interval: interval, runloop: runloop, mode: mode)
-            
-        case let .custom(timer):
-            sourceTimer = timer
+        createTimer(with: interval)
 
-            timer.start(with: interval)
-        }
-        
         eventHandler?(elapsedTime)
     }
     
     public func invalidate() {
-        elapsedTime = 0
         sourceTimer?.invalidate()
         sourceTimer = nil
     }
     
-    // MARK: - Private
+    public func pause() {
+        invalidate()
+    }
+    
+    public func resume() {
+        createTimer(with: interval)
+    }
+    
+    // MARK: - Actions
     
     @objc private func handleSourceUpdate() {
         guard enterBackgroundDate == nil else {
@@ -100,6 +97,23 @@ public final class TITimer: ITimer {
         
         eventHandler?(elapsedTime)
     }
+    
+    // MARK: - Private
+    
+    private func createTimer(with interval: TimeInterval) {
+        switch type {
+        case let .dispatchSourceTimer(queue):
+            sourceTimer = startDispatchSourceTimer(interval: interval, queue: queue)
+            
+        case let .runloopTimer(runloop, mode):
+            sourceTimer = startTimer(interval: interval, runloop: runloop, mode: mode)
+            
+        case let .custom(timer):
+            sourceTimer = timer
+            
+            timer.start(with: interval)
+        }
+    }
 }
 
 // MARK: - Factory
@@ -107,7 +121,7 @@ public final class TITimer: ITimer {
 extension TITimer {
 
     public static var `default`: TITimer {
-        .init(type: .runloopTimer(runloop: .main, mode: .default), mode: .activeAndBackground)
+        .init(type: .runloopTimer(runloop: .main, mode: .common), mode: .activeAndBackground)
     }
 }
 
@@ -159,8 +173,6 @@ private extension TITimer {
             self?.handleSourceUpdate()
         }
         
-        timer.resume()
-        
         return timer as? DispatchSource
     }
 }