Skip to content

Skip break, +5 min, wait for me - #19

Open
fidok15 wants to merge 1 commit into
feat/summary-after-stopfrom
feat/skip-extend
Open

fidok15 wants to merge 1 commit into
feat/summary-after-stopfrom
feat/skip-extend

Conversation

@fidok15

@fidok15 fidok15 commented Nov 17, 2026

Copy link
Copy Markdown
Owner

Stage 2 of the review fixes. Stacked on #18 (uses its SessionClock changes); base is feat/summary-after-stop, retarget to main after #18 is merged.

  • Break card: "skip break" (bottom right) starts the next study round now, even when the break is paused.
  • Study and break cards: "+5 min" extends the current phase. On the study card it sits on the sparkline row, because the time row is already full with the focus figure (it truncated "focus" with camera on, also in Polish "skupienie").
  • Settings: "wait for me after breaks" (off by default, persisted as waitForMe). When on, the next study round starts paused at its full length after a break, and waits for a click on the clock, the mug, "resume" or Space. It keeps waiting across sleep.
  • All in SessionClock (skipBreak, extend(by:at:), waitAfterBreak); phaseDuration grows with extend, so studied time stays right. The long-break rule is unchanged (isLongBreak uses the configured minutes).
  • Polish strings added.

Verification

  • swift run focus-check: 40 passed (new: skip break, +5 running/paused/break, wait after break across a long sleep).
  • scripts/build-app.sh succeeded. Real app from dist/FocusGuard.app with a 1 min / 1 min / 3 rounds config, pointer driven with CGEvents, screen captures:
    • break 1: hover on "+5 min" draws its underline; click took 0:12 to 5:10, and the menu bar countdown showed 5:10;
    • "skip break": hover underline, then click went to "study 2 of 3" at 0:59;
    • "wait for me after breaks" ticked in the settings note (written to defaults); after break 2 the round 3 card showed "study 3 of 3, 1:00, paused, space to resume", menu bar 1:00 and not counting; Space resumed (0:58);
    • "+5 min" on the study card: menu bar went to 5:52;
    • hover glow and tooltip on the clock still work.
  • Layout with the camera-on study fixture checked with the debug window render (layout only).

Design note: the waiting round reuses the paused state and its "paused, space to resume" line rather than adding a new wording.

SessionClock gains skipBreak and extend (paused or running), and
waitAfterBreak, which starts the next study round paused at its full
length so it waits for a click or space.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant