From c2d5d2b61ae4d4905ecc7f61e7dbf90e46557071 Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Sun, 10 Aug 2025 15:40:42 +0700
Subject: [PATCH] pomodoro: remove unnecessary isLongBreak persistent state

---
 .config/quickshell/ii/modules/common/Persistent.qml |  1 -
 .config/quickshell/ii/services/TimerService.qml     | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.config/quickshell/ii/modules/common/Persistent.qml b/.config/quickshell/ii/modules/common/Persistent.qml
index e639f54f..29d41e18 100644
--- a/.config/quickshell/ii/modules/common/Persistent.qml
+++ b/.config/quickshell/ii/modules/common/Persistent.qml
@@ -67,7 +67,6 @@ Singleton {
                     property bool running: false
                     property int start: 0
                     property bool isBreak: false
-                    property bool isLongBreak: false
                     property int cycle: 0
                 }
                 property JsonObject stopwatch: JsonObject {
diff --git a/.config/quickshell/ii/services/TimerService.qml b/.config/quickshell/ii/services/TimerService.qml
index f4f9bde9..baf13c79 100644
--- a/.config/quickshell/ii/services/TimerService.qml
+++ b/.config/quickshell/ii/services/TimerService.qml
@@ -22,10 +22,9 @@ Singleton {
 
     property bool isPomodoroRunning: Persistent.states.timer.pomodoro.running
     property bool isBreak: Persistent.states.timer.pomodoro.isBreak
-    property bool isLongBreak: Persistent.states.timer.pomodoro.isLongBreak
-    property bool isPomodoroLongBreak: Persistent.states.timer.pomodoro.isLongBreak
+    property bool isLongBreak: Persistent.states.timer.pomodoro.isBreak && (pomodoroCycle + 1 == cyclesBeforeLongBreak);
     property int pomodoroLapDuration: isBreak ? (isLongBreak ? longBreakTime : breakTime) : focusTime
-    property int pomodoroSecondsLeft: focusTime
+    property int pomodoroSecondsLeft: isLongBreak ? longBreakTime : (isBreak ? breakTime : focusTime)
     property int pomodoroCycle: Persistent.states.timer.pomodoro.cycle
 
     property bool isStopwatchRunning: Persistent.states.timer.stopwatch.running
@@ -53,7 +52,6 @@ Singleton {
         if (getCurrentTimeInSeconds() >= Persistent.states.timer.pomodoro.start + pomodoroLapDuration) {
             // Reset counts
             Persistent.states.timer.pomodoro.isBreak = !Persistent.states.timer.pomodoro.isBreak;
-            Persistent.states.timer.pomodoro.isLongBreak = Persistent.states.timer.pomodoro.isBreak && (pomodoroCycle + 1 == cyclesBeforeLongBreak);
             Persistent.states.timer.pomodoro.start = getCurrentTimeInSeconds();
 
             // Send notification
@@ -97,7 +95,6 @@ Singleton {
     function resetPomodoro() {
         Persistent.states.timer.pomodoro.running = false;
         Persistent.states.timer.pomodoro.isBreak = false;
-        Persistent.states.timer.pomodoro.isLongBreak = false;
         Persistent.states.timer.pomodoro.start = getCurrentTimeInSeconds();
         Persistent.states.timer.pomodoro.cycle = 0;
         refreshPomodoro();
@@ -133,10 +130,9 @@ Singleton {
     }
 
     function stopwatchReset() {
-        Persistent.states.timer.stopwatch.running = false;
         stopwatchTime = 0;
-        Persistent.states.timer.stopwatch.start = getCurrentTimeIn10ms();
         Persistent.states.timer.stopwatch.laps = [];
+        Persistent.states.timer.stopwatch.running = false;
     }
 
     function stopwatchRecordLap() {