add pause implementation for pomodoro

Razeeman · Razeeman · commit 95701b1cd8eb · 2025-08-31T11:24:58.000+03:00
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt
@@ -209,6 +209,10 @@ class PrefsRepoImpl @Inject constructor(
         KEY_POMODORO_MODE_STARTED_TIMESTAMP, 0,
     )
 
+    override var pomodoroModePausedTimestamp: Long by prefs.delegate(
+        KEY_POMODORO_MODE_PAUSED_TIMESTAMP, 0,
+    )
+
     override var pomodoroFocusTime: Long by prefs.delegate(
         KEY_POMODORO_FOCUS_TIME, POMODORO_DEFAULT_FOCUS_TIME_SEC,
     )
@@ -710,6 +714,7 @@ class PrefsRepoImpl @Inject constructor(
         private const val KEY_AUTOMATIC_EXPORT_ERROR = "automaticExportError"
         private const val KEY_AUTOMATIC_EXPORT_LAST_SAVE_TIME = "automaticExportLastSaveTime"
         private const val KEY_POMODORO_MODE_STARTED_TIMESTAMP = "pomodoroModeStartedTimestamp"
+        private const val KEY_POMODORO_MODE_PAUSED_TIMESTAMP = "pomodoroModePausedTimestamp"
         private const val KEY_WIDGET = "widget_"
         private const val KEY_STATISTICS_WIDGET_FILTERED_TYPES = "statistics_widget_filtered_types_"
         private const val KEY_STATISTICS_WIDGET_FILTERED_CATEGORIES = "statistics_widget_filtered_categories_"
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/GetPomodoroStateInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/GetPomodoroStateInteractor.kt
@@ -0,0 +1,26 @@
+package com.example.util.simpletimetracker.domain.pomodoro.interactor
+
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import javax.inject.Inject
+
+class GetPomodoroStateInteractor @Inject constructor(
+    private val prefsInteractor: PrefsInteractor,
+) {
+
+    suspend fun execute(): State {
+        val timeStarted = prefsInteractor.getPomodoroModeStartedTimestampMs()
+        val timePaused = prefsInteractor.getPomodoroModePausedTimestampMs()
+
+        return when {
+            timeStarted == 0L -> State.Stopped
+            timePaused != 0L -> State.Paused
+            else -> State.Running
+        }
+    }
+
+    sealed interface State {
+        data object Stopped : State
+        data object Paused : State
+        data object Running : State
+    }
+}
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroNextCycleInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroNextCycleInteractor.kt
@@ -9,15 +9,17 @@ class PomodoroNextCycleInteractor @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
     private val currentTimestampProvider: CurrentTimestampProvider,
     private val pomodoroCycleDurationsMapper: PomodoroCycleDurationsMapper,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
     private val getPomodoroSettingsInteractor: GetPomodoroSettingsInteractor,
     private val pomodoroCycleNotificationInteractor: PomodoroCycleNotificationInteractor,
 ) {
 
     suspend fun executePrev() {
         if (!prefsInteractor.getEnablePomodoroMode()) return
-        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
-        if (timeStartedMs == 0L) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Running) return
 
+        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
         val settings = getPomodoroSettingsInteractor.execute()
         val result = pomodoroCycleDurationsMapper.map(
             timeStartedMs = timeStartedMs,
@@ -43,9 +45,10 @@ class PomodoroNextCycleInteractor @Inject constructor(
 
     suspend fun executeNext() {
         if (!prefsInteractor.getEnablePomodoroMode()) return
-        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
-        if (timeStartedMs == 0L) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Running) return
 
+        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
         val settings = getPomodoroSettingsInteractor.execute()
         val result = pomodoroCycleDurationsMapper.map(
             timeStartedMs = timeStartedMs,
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroPauseCycleInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroPauseCycleInteractor.kt
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroPauseInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroPauseInteractor.kt
@@ -0,0 +1,35 @@
+package com.example.util.simpletimetracker.domain.pomodoro.interactor
+
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import javax.inject.Inject
+
+class PomodoroPauseInteractor @Inject constructor(
+    private val prefsInteractor: PrefsInteractor,
+    private val pomodoroCycleNotificationInteractor: PomodoroCycleNotificationInteractor,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
+) {
+
+    suspend fun pause() {
+        if (!prefsInteractor.getEnablePomodoroMode()) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Running) return
+
+        val current = System.currentTimeMillis()
+        prefsInteractor.setPomodoroModePausedTimestampMs(current)
+        pomodoroCycleNotificationInteractor.cancel()
+    }
+
+    suspend fun startAfterPause() {
+        if (!prefsInteractor.getEnablePomodoroMode()) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Paused) return
+
+        val current = System.currentTimeMillis()
+        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
+        val timePausedMs = prefsInteractor.getPomodoroModePausedTimestampMs()
+        val newTimeStarted = timeStartedMs + current - timePausedMs
+        prefsInteractor.setPomodoroModeStartedTimestampMs(newTimeStarted)
+        prefsInteractor.setPomodoroModePausedTimestampMs(0)
+        pomodoroCycleNotificationInteractor.checkAndReschedule()
+    }
+}
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroRestartCycleInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroRestartCycleInteractor.kt
@@ -7,15 +7,17 @@ import javax.inject.Inject
 class PomodoroRestartCycleInteractor @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
     private val pomodoroCycleDurationsMapper: PomodoroCycleDurationsMapper,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
     private val getPomodoroSettingsInteractor: GetPomodoroSettingsInteractor,
     private val pomodoroCycleNotificationInteractor: PomodoroCycleNotificationInteractor,
 ) {
 
     suspend fun execute() {
         if (!prefsInteractor.getEnablePomodoroMode()) return
-        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
-        if (timeStartedMs == 0L) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Running) return
 
+        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
         val result = pomodoroCycleDurationsMapper.map(
             timeStartedMs = timeStartedMs,
             settings = getPomodoroSettingsInteractor.execute(),
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroStartInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroStartInteractor.kt
@@ -5,6 +5,7 @@ import javax.inject.Inject
 
 class PomodoroStartInteractor @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
     private val pomodoroCycleNotificationInteractor: PomodoroCycleNotificationInteractor,
 ) {
 
@@ -16,8 +17,9 @@ class PomodoroStartInteractor @Inject constructor(
 
     suspend fun checkAndStart(typeId: Long) {
         if (!prefsInteractor.getEnablePomodoroMode()) return
+        val state = getPomodoroStateInteractor.execute()
 
-        if (prefsInteractor.getPomodoroModeStartedTimestampMs() == 0L &&
+        if (state is GetPomodoroStateInteractor.State.Stopped &&
             typeId in prefsInteractor.getAutostartPomodoroActivities()
         ) {
             start()
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroStopInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/pomodoro/interactor/PomodoroStopInteractor.kt
@@ -12,6 +12,7 @@ class PomodoroStopInteractor @Inject constructor(
 
     suspend fun stop() {
         prefsInteractor.setPomodoroModeStartedTimestampMs(0)
+        prefsInteractor.setPomodoroModePausedTimestampMs(0)
         pomodoroCycleNotificationInteractor.cancel()
     }
 
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt
@@ -390,6 +390,14 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.pomodoroModeStartedTimestamp = timestampMs
     }
 
+    suspend fun getPomodoroModePausedTimestampMs(): Long = withContext(Dispatchers.IO) {
+        prefsRepo.pomodoroModePausedTimestamp
+    }
+
+    suspend fun setPomodoroModePausedTimestampMs(timestampMs: Long) = withContext(Dispatchers.IO) {
+        prefsRepo.pomodoroModePausedTimestamp = timestampMs
+    }
+
     suspend fun getPomodoroFocusTime(): Long = withContext(Dispatchers.IO) {
         prefsRepo.pomodoroFocusTime
     }
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt
@@ -78,6 +78,8 @@ interface PrefsRepo {
 
     var pomodoroModeStartedTimestamp: Long // in milliseconds, 0 - disabled
 
+    var pomodoroModePausedTimestamp: Long // in milliseconds, 0 - disabled
+
     var pomodoroFocusTime: Long // in seconds, 0 - disabled
 
     var pomodoroBreakTime: Long // in seconds, 0 - disabled
diff --git a/features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/pomodoro/interactor/PomodoroCycleNotificationInteractorImpl.kt b/features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/pomodoro/interactor/PomodoroCycleNotificationInteractorImpl.kt
@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.feature_notification.pomodoro.interactor
 
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.GetPomodoroSettingsInteractor
+import com.example.util.simpletimetracker.domain.pomodoro.interactor.GetPomodoroStateInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroCycleNotificationInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.mapper.PomodoroCycleDurationsMapper
@@ -12,16 +13,18 @@ class PomodoroCycleNotificationInteractorImpl @Inject constructor(
     private val manager: NotificationPomodoroManager,
     private val scheduler: NotificationPomodoroScheduler,
     private val pomodoroCycleDurationsMapper: PomodoroCycleDurationsMapper,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
     private val getPomodoroSettingsInteractor: GetPomodoroSettingsInteractor,
     private val prefsInteractor: PrefsInteractor,
 ) : PomodoroCycleNotificationInteractor {
 
     override suspend fun checkAndReschedule() {
         scheduler.cancelSchedule()
         if (!prefsInteractor.getEnablePomodoroMode()) return
-        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
-        if (timeStartedMs == 0L) return
+        val state = getPomodoroStateInteractor.execute()
+        if (state !is GetPomodoroStateInteractor.State.Running) return
 
+        val timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs()
         val settings = getPomodoroSettingsInteractor.execute()
         val result = pomodoroCycleDurationsMapper.map(
             timeStartedMs = timeStartedMs,
diff --git a/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/mapper/PomodoroViewDataMapper.kt b/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/mapper/PomodoroViewDataMapper.kt
@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_pomodoro.timer.mapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.extension.dropMillis
 import com.example.util.simpletimetracker.domain.extension.toDuration
+import com.example.util.simpletimetracker.domain.pomodoro.interactor.GetPomodoroStateInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.mapper.PomodoroCycleDurationsMapper
 import com.example.util.simpletimetracker.domain.pomodoro.model.PomodoroCycleSettings
 import com.example.util.simpletimetracker.domain.pomodoro.model.PomodoroCycleType
@@ -18,8 +19,9 @@ class PomodoroViewDataMapper @Inject constructor(
 ) {
 
     fun mapButtonState(
-        isStarted: Boolean,
+        state: GetPomodoroStateInteractor.State,
     ): PomodoroButtonState {
+        val isStarted = state is GetPomodoroStateInteractor.State.Running
         val iconResId = if (isStarted) {
             R.drawable.button_stop
         } else {
@@ -33,17 +35,25 @@ class PomodoroViewDataMapper @Inject constructor(
     }
 
     fun mapTimerState(
-        isStarted: Boolean,
+        state: GetPomodoroStateInteractor.State,
         timeStartedMs: Long,
+        timePausedMs: Long,
         timerUpdateMs: Long,
         settings: PomodoroCycleSettings,
     ): PomodoroTimerState {
         // Min increment of one pixel.
         val maxProgress = 1024 * Math.PI
+        val isStarted = state !is GetPomodoroStateInteractor.State.Stopped
+        val isPaused = state is GetPomodoroStateInteractor.State.Paused
 
         return if (isStarted) {
+            val timerUpdate = if (isPaused) 0 else timerUpdateMs
             val result = pomodoroCycleDurationsMapper.map(
-                timeStartedMs = timeStartedMs.dropMillis(),
+                timeStartedMs = if (isPaused) {
+                    timeStartedMs + System.currentTimeMillis() - timePausedMs
+                } else {
+                    timeStartedMs
+                },
                 settings = settings,
             )
             val currentCycle = result.cycleType
@@ -54,14 +64,14 @@ class PomodoroViewDataMapper @Inject constructor(
             val currentCycleDuration = result.currentCycleDurationMs
 
             val timeLeft = cycleDuration - currentCycleDuration
-            val progression = (currentCycleDuration + timerUpdateMs) *
+            val progression = (currentCycleDuration + timerUpdate) *
                 maxProgress / cycleDuration
             val times = formatInterval(timeLeft)
 
             PomodoroTimerState(
                 maxProgress = maxProgress.toInt(),
                 progress = progression.toInt(),
-                timerUpdateMs = timerUpdateMs,
+                timerUpdateMs = timerUpdate,
                 durationState = mapToDurationState(times),
                 currentCycleHint = mapCurrentStateHint(currentCycle),
             )
diff --git a/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/view/PomodoroFragment.kt b/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/view/PomodoroFragment.kt
@@ -57,8 +57,8 @@ class PomodoroFragment : BaseFragment<Binding>() {
 
     private fun setButtonState(state: PomodoroButtonState) = with(binding) {
         ivPomodoroButton.setImageResource(state.iconResId)
-        btnPomodoroRestart.visible = state.additionalButtonsVisible
-        btnPomodoroPause.visible = state.additionalButtonsVisible
+        btnPomodoroRestart.isInvisible = !state.additionalButtonsVisible
+        btnPomodoroPause.isInvisible = !state.additionalButtonsVisible
         btnPomodoroPrev.isInvisible = !state.additionalButtonsVisible
         btnPomodoroNext.isInvisible = !state.additionalButtonsVisible
     }
diff --git a/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/viewModel/PomodoroViewModel.kt b/features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/viewModel/PomodoroViewModel.kt
@@ -6,8 +6,9 @@ import androidx.lifecycle.viewModelScope
 import com.example.util.simpletimetracker.core.base.BaseViewModel
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.GetPomodoroSettingsInteractor
+import com.example.util.simpletimetracker.domain.pomodoro.interactor.GetPomodoroStateInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroNextCycleInteractor
-import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroPauseCycleInteractor
+import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroPauseInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroRestartCycleInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroStartInteractor
@@ -34,7 +35,8 @@ class PomodoroViewModel @Inject constructor(
     private val pomodoroStopInteractor: PomodoroStopInteractor,
     private val pomodoroNextCycleInteractor: PomodoroNextCycleInteractor,
     private val pomodoroRestartCycleInteractor: PomodoroRestartCycleInteractor,
-    private val pomodoroPauseCycleInteractor: PomodoroPauseCycleInteractor,
+    private val pomodoroPauseInteractor: PomodoroPauseInteractor,
+    private val getPomodoroStateInteractor: GetPomodoroStateInteractor,
     private val getPomodoroSettingsInteractor: GetPomodoroSettingsInteractor,
 ) : BaseViewModel() {
 
@@ -56,11 +58,11 @@ class PomodoroViewModel @Inject constructor(
     }
 
     fun onStartStopClicked() = viewModelScope.launch {
-        // 0 - disabled.
-        if (isStarted()) {
-            pomodoroStopInteractor.stop()
-        } else {
-            pomodoroStartInteractor.start()
+        val state = getPomodoroStateInteractor.execute()
+        when (state) {
+            is GetPomodoroStateInteractor.State.Running -> pomodoroStopInteractor.stop()
+            is GetPomodoroStateInteractor.State.Paused -> pomodoroPauseInteractor.startAfterPause()
+            is GetPomodoroStateInteractor.State.Stopped -> pomodoroStartInteractor.start()
         }
         updateButtonState()
         updateTimerState()
@@ -73,7 +75,7 @@ class PomodoroViewModel @Inject constructor(
     }
 
     fun onPauseClicked() = viewModelScope.launch {
-        pomodoroPauseCycleInteractor.execute()
+        pomodoroPauseInteractor.pause()
         updateTimerState()
     }
 
@@ -93,10 +95,6 @@ class PomodoroViewModel @Inject constructor(
         timerState.value?.copy(progress = 0)?.let(timerState::set)
     }
 
-    private suspend fun isStarted(): Boolean {
-        return prefsInteractor.getPomodoroModeStartedTimestampMs() != 0L
-    }
-
     private fun startUpdate() {
         timerJob = viewModelScope.launch {
             timerJob?.cancelAndJoin()
@@ -121,7 +119,7 @@ class PomodoroViewModel @Inject constructor(
 
     private suspend fun loadButtonState(): PomodoroButtonState {
         return pomodoroViewDataMapper.mapButtonState(
-            isStarted = isStarted(),
+            state = getPomodoroStateInteractor.execute()
         )
     }
 
@@ -132,8 +130,9 @@ class PomodoroViewModel @Inject constructor(
 
     private suspend fun loadTimerState(): PomodoroTimerState {
         return pomodoroViewDataMapper.mapTimerState(
-            isStarted = isStarted(),
+            state = getPomodoroStateInteractor.execute(),
             timeStartedMs = prefsInteractor.getPomodoroModeStartedTimestampMs(),
+            timePausedMs = prefsInteractor.getPomodoroModePausedTimestampMs(),
             timerUpdateMs = TIMER_UPDATE_MS,
             settings = getPomodoroSettingsInteractor.execute(),
         )
diff --git a/features/feature_pomodoro/src/main/res/layout/pomodoro_fragment.xml b/features/feature_pomodoro/src/main/res/layout/pomodoro_fragment.xml

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ class PomodoroStopInteractor @Inject constructor(`
`12`	`12`
`13`	`13`	`suspend fun stop() {`
`14`	`14`	`prefsInteractor.setPomodoroModeStartedTimestampMs(0)`
	`15`	`+ prefsInteractor.setPomodoroModePausedTimestampMs(0)`
`15`	`16`	`pomodoroCycleNotificationInteractor.cancel()`
`16`	`17`	`}`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,14 @@ class PrefsInteractor @Inject constructor(`
`390`	`390`	`prefsRepo.pomodoroModeStartedTimestamp = timestampMs`
`391`	`391`	`}`
`392`	`392`
	`393`	`+ suspend fun getPomodoroModePausedTimestampMs(): Long = withContext(Dispatchers.IO) {`
	`394`	`+ prefsRepo.pomodoroModePausedTimestamp`
	`395`	`+ }`
	`396`	`+`
	`397`	`+ suspend fun setPomodoroModePausedTimestampMs(timestampMs: Long) = withContext(Dispatchers.IO) {`
	`398`	`+ prefsRepo.pomodoroModePausedTimestamp = timestampMs`
	`399`	`+ }`
	`400`	`+`
`393`	`401`	`suspend fun getPomodoroFocusTime(): Long = withContext(Dispatchers.IO) {`
`394`	`402`	`prefsRepo.pomodoroFocusTime`
`395`	`403`	`}`