From 54de89a566350e058316cce79057e3d8d3b045f5 Mon Sep 17 00:00:00 2001 From: Nishant Mishra Date: Mon, 18 Aug 2025 19:46:57 +0530 Subject: [PATCH] fix: Fix a bug that caused the long break to fail to trigger if the session length was changed Closes #18 --- .../pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt index f3b56d8..b99458d 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt @@ -124,8 +124,8 @@ class TimerViewModel( timerMode = TimerMode.FOCUS, timeStr = millisecondsToStr(time.value), totalTime = time.value, - nextTimerMode = TimerMode.SHORT_BREAK, - nextTimeStr = millisecondsToStr(timerRepository.shortBreakTime) + nextTimerMode = if (timerRepository.sessionLength > 1) TimerMode.SHORT_BREAK else TimerMode.LONG_BREAK, + nextTimeStr = millisecondsToStr(if (timerRepository.sessionLength > 1) timerRepository.shortBreakTime else timerRepository.longBreakTime) ) } } @@ -147,8 +147,8 @@ class TimerViewModel( timerMode = TimerMode.FOCUS, timeStr = millisecondsToStr(time.value), totalTime = time.value, - nextTimerMode = if (cycles == 6) TimerMode.LONG_BREAK else TimerMode.SHORT_BREAK, - nextTimeStr = if (cycles == 6) millisecondsToStr( + nextTimerMode = if (cycles == (timerRepository.sessionLength - 1) * 2) TimerMode.LONG_BREAK else TimerMode.SHORT_BREAK, + nextTimeStr = if (cycles == (timerRepository.sessionLength - 1) * 2) millisecondsToStr( timerRepository.longBreakTime ) else millisecondsToStr( timerRepository.shortBreakTime