Added remaining time restoring

Rstoring of the remaining minutes after detecting the user inactivity
masich · Mar 12, 2020 · caaa2c1 · caaa2c1
1 parent fe30730
commit caaa2c1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/SaveMyEyes/Source/Common/Constants.swift b/SaveMyEyes/Source/Common/Constants.swift
@@ -15,6 +15,7 @@ struct Constants {
 
     public static let minute: TimeInterval = 60 // seconds
 
-    // If user is inactive for more than `allowedUserInactivityInterval` seconds -> internal timer will be paused
-    public static let allowedUserInactivityInterval: TimeInterval = 5 * minute
+    // If user is inactive for more than `allowedUserInactivityMinutes` minutes -> internal timer will be paused
+    public static let allowedUserInactivityMinutes: Int = 5
+    public static let allowedUserInactivityInterval: TimeInterval = TimeInterval(allowedUserInactivityMinutes) * minute
 }
diff --git a/SaveMyEyes/Source/Common/Preferences.swift b/SaveMyEyes/Source/Common/Preferences.swift
@@ -76,4 +76,8 @@ class System {
     public static func isUserInactive(forTimeInterval: TimeInterval) -> Bool {
         return (getUserInactiveSeconds() ?? 0) >= forTimeInterval
     }
+
+    public static func isUserInactive(forMinutes: Int) -> Bool {
+        return isUserInactive(forTimeInterval: TimeInterval(forMinutes) * Constants.minute)
+    }
 }
diff --git a/SaveMyEyes/Source/Main/MainViewModel.swift b/SaveMyEyes/Source/Main/MainViewModel.swift
@@ -56,6 +56,7 @@ class MainViewModel: ObservableObject {
 
     private var timerWorker: TimerWorker!
     private var cancellables = [AnyCancellable]()
+    private var isUserInactive = false
 
     private let allowedUserInactivityInterval: TimeInterval
     private let timerInterval: TimeInterval
@@ -113,7 +114,13 @@ class MainViewModel: ObservableObject {
      Performs time management only if user was active for at least last `allowedUserInactivityInterval` seconds
      */
     public func timerHandler(timer: Timer) {
-        if isBreakTimeNow || !System.isUserInactive(forTimeInterval: allowedUserInactivityInterval) {
+        let isUserIncativeNew = System.isUserInactive(forMinutes: Constants.allowedUserInactivityMinutes)
+        if !isUserInactive && isUserIncativeNew {
+            remainingMins += Constants.allowedUserInactivityMinutes
+        }
+        isUserInactive = isUserIncativeNew
+
+        if isBreakTimeNow || !isUserInactive {
             remainingMins -= 1
             if remainingMins <= 0 {
                 if isBreakTimeNow {