pomodoro: make pause/resume less weird

.config/quickshell/ii/modules/common/Config.qml

@@ -256,9 +256,9 @@ Singleton {
                 property JsonObject pomodoro: JsonObject {
                     property string alertSound: ""
                     property int breakTime: 300
-                    property int cycle: 4
+                    property int cyclesBeforeLongBreak: 4
                     property int focus: 1500
-                    property int longBreak: 1200
+                    property int longBreak: 900
                 }
             }
 

.config/quickshell/ii/modules/common/Persistent.qml

@@ -50,6 +50,7 @@ Singleton {
                     property bool running: false
                     property int start: 0
                     property bool isBreak: false
+                    property int cycle: 0
                 }
                 property JsonObject stopwatch: JsonObject {
                     property bool running: false

.config/quickshell/ii/modules/sidebarRight/pomodoro/PomodoroTimer.qml

@@ -9,22 +9,26 @@ import QtQuick.Layouts
 import Quickshell
 
 Item {
-    ColumnLayout {
+    id: root
-        anchors.horizontalCenter: parent.horizontalCenter
+
-        spacing: 20
+    implicitHeight: contentColumn.implicitHeight
+    implicitWidth: contentColumn.implicitWidth
+
+    ColumnLayout {
+        id: contentColumn
+        anchors.fill: parent
+        spacing: 0
 
-        RowLayout {
-            spacing: 40
         // The Pomodoro timer circle
         CircularProgress {
             Layout.alignment: Qt.AlignHCenter
-                lineWidth: 7
+            lineWidth: 8
             gapAngle: Math.PI / 14
             value: {
-                    let pomodoroTotalTime = Pomodoro.isBreak ? Pomodoro.breakTime : Pomodoro.focusTime
+                let pomodoroTotalTime = Pomodoro.isBreak ? Pomodoro.breakTime : Pomodoro.focusTime;
-                    return Pomodoro.pomodoroSecondsLeft / pomodoroTotalTime
+                return Pomodoro.pomodoroSecondsLeft / pomodoroTotalTime;
             }
-                size: 125
+            size: 200
             primaryColor: Appearance.m3colors.m3onSecondaryContainer
             secondaryColor: Appearance.colors.colSecondaryContainer
             enableAnimation: true
@@ -36,24 +40,24 @@ Item {
                 StyledText {
                     Layout.alignment: Qt.AlignHCenter
                     text: {
-                            let minutes = Math.floor(Pomodoro.pomodoroSecondsLeft / 60).toString().padStart(2, '0')
+                        let minutes = Math.floor(Pomodoro.pomodoroSecondsLeft / 60).toString().padStart(2, '0');
-                            let seconds = Math.floor(Pomodoro.pomodoroSecondsLeft % 60).toString().padStart(2, '0')
+                        let seconds = Math.floor(Pomodoro.pomodoroSecondsLeft % 60).toString().padStart(2, '0');
-                            return `${minutes}:${seconds}`
+                        return `${minutes}:${seconds}`;
                     }
-                        font.pixelSize: Appearance.font.pixelSize.hugeass + 4
+                    font.pixelSize: 40
                     color: Appearance.m3colors.m3onSurface
                 }
                 StyledText {
                     Layout.alignment: Qt.AlignHCenter
                     text: Pomodoro.isBreak ? Translation.tr("Break") : Translation.tr("Focus")
                     font.pixelSize: Appearance.font.pixelSize.normal
-                        color: Appearance.m3colors.m3onSurface
+                    color: Appearance.colors.colSubtext
                 }
             }
         }
 
         // The Start/Stop and Reset buttons
-            ColumnLayout {
+        RowLayout {
             Layout.alignment: Qt.AlignHCenter
             spacing: 10
 
@@ -77,7 +81,7 @@ Item {
                 implicitWidth: 90
 
                 onClicked: Pomodoro.resetPomodoro()
-                    enabled: (Pomodoro.pomodoroSecondsLeft < Pomodoro.focusTime)
+                enabled: (Pomodoro.pomodoroSecondsLeft < (Pomodoro.isBreak ? Pomodoro.breakTime : Pomodoro.focusTime))
 
                 font.pixelSize: Appearance.font.pixelSize.larger
                 colBackground: Appearance.colors.colErrorContainer
@@ -93,103 +97,4 @@ Item {
             }
         }
     }
-
-        // The SpinBoxes for adjusting duration
-        // GridLayout {
-        //     Layout.alignment: Qt.AlignHCenter
-        //     columns: 2
-        //     uniformCellWidths: true
-        //     columnSpacing: 20
-        //     rowSpacing: 4
-
-        //     StyledText {
-        //         Layout.alignment: Qt.AlignHCenter
-        //         text: Translation.tr("Focus")
-        //     }
-
-        //     StyledText {
-        //         Layout.alignment: Qt.AlignHCenter
-        //         text: Translation.tr("Break")
-        //     }
-
-        //     ConfigSpinBox {
-        //         id: focusSpinBox
-        //         spacing: 0
-        //         Layout.leftMargin: 0
-        //         Layout.rightMargin: 0
-        //         from: 0
-        //         to: 120
-        //         Connections {
-        //             target: Config
-        //             function onReadyChanged() {
-        //                 focusSpinBox.valueChanged()
-        //             }
-        //         }
-        //         value: {
-        //             console.log("New focus time: " + (Config.options.time.pomodoro.focus / 60))
-        //             return Config.options.time.pomodoro.focus / 60
-        //         }
-        //         onValueChanged: {
-        //             console.log("New focus time is " + value + " minutes, Config is ready:", Config.ready)
-        //             if (!Config.ready) return;
-        //             console.log("Setting focus time to " + value + " minutes")
-        //             Config.options.time.pomodoro.focus = value * 60
-        //             if (Pomodoro.isPomodoroReset) {  // Special case for Pomodoro in Reset state
-        //                 Pomodoro.pomodoroSecondsLeft = Pomodoro.focusTime
-        //                 Pomodoro.timeLeft = Pomodoro.focusTime
-        //             }
-        //         }
-        //     }
-
-        //     ConfigSpinBox {
-        //         id: breakSpinBox
-        //         value: Config.options.time.pomodoro.breakTime / 60
-        //         spacing: 0
-        //         from: 0
-        //         to: 120
-        //         Layout.leftMargin: 0
-        //         Layout.rightMargin: 0
-        //         onValueChanged: {
-        //             Config.options.time.pomodoro.breakTime = value * 60
-        //         }
-        //     }
-
-        //     StyledText {
-        //         Layout.topMargin: 6
-        //         Layout.alignment: Qt.AlignHCenter
-        //         text: Translation.tr("Cycle")
-        //     }
-        //     StyledText {
-        //         Layout.topMargin: 6
-        //         Layout.alignment: Qt.AlignHCenter
-        //         text: Translation.tr("Long break")
-        //     }
-
-        //     ConfigSpinBox {
-        //         id: cycleSpinBox
-        //         value: Config.options.time.pomodoro.cycle
-        //         spacing: 0
-        //         from: 1
-        //         to: 20
-        //         Layout.leftMargin: 0
-        //         Layout.rightMargin: 0
-        //         onValueChanged: {
-        //             Config.options.time.pomodoro.cycle = value
-        //         }
-        //     }
-
-        //     ConfigSpinBox {
-        //         id: longBreakSpinBox
-        //         spacing: 0
-        //         Layout.leftMargin: 0
-        //         Layout.rightMargin: 0
-        //         value: Config.options.time.pomodoro.longBreak / 60
-        //         from: 0
-        //         to: 120
-        //         onValueChanged: {
-        //             Config.options.time.pomodoro.longBreak = value * 60
-        //         }
-        //     }
-        // }
-    }
 }

.config/quickshell/ii/services/Pomodoro.qml

@@ -17,7 +17,7 @@ Singleton {
     property int focusTime: Config.options.time.pomodoro.focus
     property int breakTime: Config.options.time.pomodoro.breakTime
     property int longBreakTime: Config.options.time.pomodoro.longBreak
-    property int longBreakCycle: Config.options.time.pomodoro.cycle
+    property int cyclesBeforeLongBreak: Config.options.time.pomodoro.cyclesBeforeLongBreak
     property string alertSound: Config.options.time.pomodoro.alertSound
 
     property bool isPomodoroRunning: Persistent.states.timer.pomodoro.running
@@ -56,7 +56,7 @@ Singleton {
 
             let notificationTitle, notificationMessage
 
-            if (isBreak && pomodoroCycle % longBreakCycle === 0) {  // isPomodoroLongBreak
+            if (isBreak && pomodoroCycle % cyclesBeforeLongBreak === 0) {  // isPomodoroLongBreak
                 notificationMessage = Translation.tr(`Relax for %1 minutes`).arg(Math.floor(longBreakTime / 60))
             } else if (isBreak) {
                 notificationMessage = Translation.tr(`Relax for %1 minutes`).arg(Math.floor(breakTime / 60))
@@ -86,10 +86,8 @@ Singleton {
     function togglePomodoro() {
         isPomodoroReset = false
         Persistent.states.timer.pomodoro.running = !isPomodoroRunning
-        if (isPomodoroRunning) {  // Pressed Start button
+        if (Persistent.states.timer.pomodoro.running) { // Start/Resume
-            Persistent.states.timer.pomodoro.start = getCurrentTimeInSeconds()
+            Persistent.states.timer.pomodoro.start = getCurrentTimeInSeconds() + pomodoroSecondsLeft - (isBreak ? breakTime : focusTime)
-        } else {  // Pressed Stop button
-            timeLeft -= (getCurrentTimeInSeconds() - pomodoroStart)
         }
     }
 
@@ -99,7 +97,8 @@ Singleton {
         isPomodoroReset = true
         timeLeft = focusTime
         Persistent.states.timer.pomodoro.start = getCurrentTimeInSeconds()
-        pomodoroCycle = 1
+        pomodoroSecondsLeft = 0
+        Persistent.states.timer.pomodoro.cycle = 1
         refreshPomodoro()
     }