From befbc708e00f8c5dbf8471ebb75709c8d883922d Mon Sep 17 00:00:00 2001
From: Nishant Mishra <nishant.28@outlook.com>
Date: Mon, 30 Jun 2025 20:12:15 +0530
Subject: [PATCH] Significantly increase clock accuracy using SystemClock

---
 .../pomodoro/ui/viewModel/UiViewModel.kt      | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/viewModel/UiViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/viewModel/UiViewModel.kt
index c0167f1..528eeac 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/viewModel/UiViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/viewModel/UiViewModel.kt
@@ -1,5 +1,6 @@
 package org.nsh07.pomodoro.ui.viewModel
 
+import android.os.SystemClock
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Job
@@ -30,11 +31,17 @@ class UiViewModel : ViewModel() {
     private val _time = MutableStateFlow(focusTime)
     val time: StateFlow<Int> = _time.asStateFlow()
 
-    var cycles = 0
+    private var cycles = 0
+    private var startTime = 0L
+    private var pauseTime = 0L
+    private var pauseDuration = 0L
 
     fun resetTimer() {
-        _time.update {  focusTime }
+        _time.update { focusTime }
         cycles = 0
+        startTime = 0L
+        pauseTime = 0L
+        pauseDuration = 0L
 
         _uiState.update { currentState ->
             currentState.copy(
@@ -53,32 +60,51 @@ class UiViewModel : ViewModel() {
                 currentState.copy(timerRunning = false)
             }
             timerJob?.cancel()
+            pauseTime = SystemClock.elapsedRealtime()
         } else {
             _uiState.update { it.copy(timerRunning = true) }
+            if (pauseTime != 0L) pauseDuration += SystemClock.elapsedRealtime() - pauseTime
+
             timerJob = viewModelScope.launch {
                 while (true) {
                     if (!uiState.value.timerRunning) break
-                    _time.update { it - 100 }
+                    if (startTime == 0L) startTime = SystemClock.elapsedRealtime()
+
+                    _time.update {
+                        when (uiState.value.timerMode) {
+                            TimerMode.FOCUS ->
+                                focusTime - (SystemClock.elapsedRealtime() - startTime - pauseDuration).toInt()
+                            TimerMode.SHORT_BREAK ->
+                                shortBreakTime - (SystemClock.elapsedRealtime() - startTime - pauseDuration).toInt()
+                            TimerMode.LONG_BREAK ->
+                                longBreakTime - (SystemClock.elapsedRealtime() - startTime - pauseDuration).toInt()
+                        }
+                    }
 
                     if (time.value < 0) {
+                        startTime = 0L
+                        pauseTime = 0L
+                        pauseDuration = 0L
                         cycles++
 
                         if (cycles % 2 == 0) {
-                            _time.update {  focusTime }
+                            _time.update { focusTime }
                             _uiState.update { currentState ->
                                 currentState.copy(
                                     timerMode = TimerMode.FOCUS,
                                     timeStr = millisecondsToStr(time.value),
                                     totalTime = time.value,
                                     nextTimerMode = if (cycles % 6 == 0) TimerMode.LONG_BREAK else TimerMode.SHORT_BREAK,
-                                    nextTimeStr = if (cycles % 6 == 0) millisecondsToStr(longBreakTime) else millisecondsToStr(
+                                    nextTimeStr = if (cycles % 6 == 0) millisecondsToStr(
+                                        longBreakTime
+                                    ) else millisecondsToStr(
                                         shortBreakTime
                                     )
                                 )
                             }
                         } else {
                             val long = cycles % 7 == 0
-                            _time.update {  if (long) longBreakTime else shortBreakTime }
+                            _time.update { if (long) longBreakTime else shortBreakTime }
 
                             _uiState.update { currentState ->
                                 currentState.copy(