Prepare v1.3.0 (#80 )

* Prepare v1.3.0 * readme: fix keybindings * update changelog
fix(footer): hide option to save initial value
2025-05-06 11:46:29 +02:00 · 2025-05-06 11:25:29 +02:00 · 2025-05-02 12:52:35 +02:00 · 2025-05-02 12:39:26 +02:00 · 2025-04-30 14:27:30 +02:00 · 2025-04-30 14:19:13 +02:00
20 changed files with 847 additions and 467 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,48 @@
 # Changelog

-## [Unreleased]
+## v1.3.0 - 2025-05-06

 ### Features

- (notification) Blink clock when it reaches its `done` mode. (optional) [#65](https://github.com/sectore/timr-tui/pull/65)
- (notification) Native desktop notification (optional, experimental) [#49](https://github.com/sectore/timr-tui/pull/59)
+- (pomodoro) Count WORK rounds [#75](https://github.com/sectore/timr-tui/pull/75), [6b068bb](https://github.com/sectore/timr-tui/commit/6b068bbd094d9ec1a36b47598fadfc71296d9590)
+- (pomodoro/countdown) Change initial value [#79](https://github.com/sectore/timr-tui/pull/79), [aae5c38](https://github.com/sectore/timr-tui/commit/aae5c38cd6a666d5ba418b12fb67879a2146b9a2)
+
+### Changes
+
+- Update keybindings [#76](https://github.com/sectore/timr-tui/pull/76)
+
+### Misc.
+
+- (flake) use alsa-lib-with-plugins [#77](https://github.com/sectore/timr-tui/pull/77)
+- (readme) add keybindings + toc [#78](https://github.com/sectore/timr-tui/pull/78)
+
+## v1.2.1 - 2025-04-17
+
+### Fixes
+
+- (countdown) Reset `Mission Elapsed Time (MET)` if `countdown` is set by _cli arguments_ [#71](https://github.com/sectore/timr-tui/pull/71)
+- (countdown) Reset `Mission Elapsed Time (MET)` while setting `countdown` by _local time_ [#72](https://github.com/sectore/timr-tui/pull/72)
+
+### Misc.
+
+- (deps) Use latest `Rust 1.86` [#73](https://github.com/sectore/timr-tui/pull/73)
+- (cargo) Exclude files for packaging [e7a5a1b](https://github.com/sectore/timr-tui/commit/e7a5a1b2da7a7967f2602a0b92f391ac768ca638)
+- (just) `group` commands [#70](https://github.com/sectore/timr-tui/pull/70)
+
+## v1.2.0 - 2025-02-26
+
+### Features
+
+- (notification) Clock animation (blink) by reaching `done` mode (optional) [#65](https://github.com/sectore/timr-tui/pull/65)
+- (notification) Native desktop notification (optional, experimental) [#59](https://github.com/sectore/timr-tui/pull/59)
 - (notification) Sound notification (optional, experimental, available in local build only) [#62](https://github.com/sectore/timr-tui/pull/62)
+- (logging) Add `--log` arg to enable logs [e094d7d](https://github.com/sectore/timr-tui/commit/e094d7d81b99f58f0d3bc50124859a4e1f6dbe4f)
+
+### Misc.
+
+- (refactor) Extend event handling for using a `mpsc` channel to send `AppEvent`'s from anywhere. [#61](https://github.com/sectore/timr-tui/pull/61)
+- (extension) Use `set_panic_hook` for better error handling [#67](https://github.com/sectore/timr-tui/pull/67)
+- (deps) Use latest `Rust 1.85` and `Rust 2024 Edition`. Refactor `flake` to consider `rust-toolchain.toml` etc. [#68](https://github.com/sectore/timr-tui/pull/68)

 ## v1.1.0 - 2025-01-22

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,17 @@
 [package]
 name = "timr-tui"
-version = "1.1.0"
+version = "1.3.0"
 description = "TUI to organize your time: Pomodoro, Countdown, Timer."
 edition = "2024"
 # Reminder: Always keep `channel` in `rust-toolchain.toml` in sync with `rust-version`.
-rust-version = "1.85.0"
+rust-version = "1.86.0"
 homepage = "https://github.com/sectore/timr-tui"
 repository = "https://github.com/sectore/timr-tui"
 readme = "README.md"
 license = "MIT"
 keywords = ["tui", "timer", "countdown", "pomodoro"]
 categories = ["command-line-utilities"]
+exclude = [".github/*", "demo/*.tape", "result/*", "*.mp3"]

 [dependencies]
 ratatui = "0.29.0"
@@ -35,5 +36,6 @@ rodio = { version = "0.20.1", features = [
 ], default-features = false, optional = true }
 thiserror = { version = "2.0.11", optional = true }

+
 [features]
 sound = ["dep:rodio", "dep:thiserror"]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2024 Jens K.
+Copyright (c) 2024-2025 Jens Krause

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -8,9 +8,20 @@ TUI to organize your time: Pomodoro, Countdown, Timer.

 Built with [Ratatui](https://ratatui.rs/) / [Rust 🦀](https://www.rust-lang.org/).

-# Features

-_Side note:_ Theme colors depend on your terminal preferences.
+# Table of Contents
+
+- [Preview](./#preview)
+- [CLI](./#cli)
+- [Keybindings](./#keybindings)
+- [Installation](./#installation)
+- [Development](./#development)
+- [Misc](./#misc)
+- [License](./#license)
+
+# Preview
+
+_(theme depends on your terminal preferences)_

 ## Pomodoro

@@ -48,7 +59,7 @@ _Side note:_ Theme colors depend on your terminal preferences.
  <img alt="menu" src="demo/menu.gif" />
 </a>

-## Local time
+## Local time (footer)

 <a href="demo/local-time.gif">
  <img alt="menu" src="demo/local-time.gif" />
@@ -80,6 +91,7 @@ Options:
      --blink <BLINK>                Toggle blink mode to animate a clock when it reaches its finished mode. [possible values: on, off]
      --log [<LOG>]                  Directory to store log file. If not set, standard application log directory is used (check README for details).
  -h, --help                         Print help
+  -V, --version                      Print version
 ```

 Extra option (if `--features sound` is enabled by local build only):
@@ -88,6 +100,63 @@ Extra option (if `--features sound` is enabled by local build only):
 --sound <SOUND>                Path to sound file (.mp3 or .wav) to play as notification. Experimental.
 ```

+# Keybindings
+
+## Menu
+
+| Key | Description |
+| --- | --- |
+| <kbd>↑</kbd> / <kbd>↓</kbd> or <kbd>m</kbd> | Toggle menu |
+
+## Screens
+
+| Key | Description |
+| --- | --- |
+| <kbd>p</kbd> | Pomodoro |
+| <kbd>c</kbd> | Countdown |
+| <kbd>t</kbd> | Timer |
+
+## Controls
+
+| Key | Description |
+| --- | --- |
+| <kbd>s</kbd> | start |
+| <kbd>r</kbd> | reset |
+| <kbd>e</kbd> | enter edit mode |
+| <kbd>q</kbd> | quit |
+
+**In `edit` mode only:**
+
+| Key | Description |
+| --- | --- |
+| <kbd>s</kbd> | save changes |
+| <kbd>Esc</kbd> | skip changes |
+| <kbd>←</kbd> or <kbd>→</kbd> | change selection |
+| <kbd>↑</kbd> | edit to go up |
+| <kbd>↓</kbd> | edit to go down |
+
+**In `Pomodoro` screen only**
+
+| Key | Description |
+| --- | --- |
+| <kbd>←</kbd> or <kbd>→</kbd> | switch work/pause |
+| <kbd>^r</kbd> | reset round |
+| <kbd>^s</kbd> | save initial value |
+
+**In `Countdown` screen only:**
+
+| Key | Description |
+| --- | --- |
+| <kbd>^e</kbd> | edit by local time |
+| <kbd>^s</kbd> | save initial value |
+
+## Appearance
+
+| Key | Description |
+| --- | --- |
+| <kbd>,</kbd> | toggle styles |
+| <kbd>.</kbd> | toggle deciseconds |
+| <kbd>:</kbd> | toggle local time in footer |

 # Installation

@@ -113,12 +182,10 @@ Install [from the AUR](https://aur.archlinux.org/packages/timr/):
 paru -S timr
 ```

-
 ## Release binaries

 Pre-built artifacts are available to download from [latest GitHub release](https://github.com/sectore/timr-tui/releases).

-
 # Development

 ## Requirements
@@ -129,7 +196,6 @@ Pre-built artifacts are available to download from [latest GitHub release](https

 If you have [`direnv`](https://direnv.net) installed, run `direnv allow` once to install dependencies. In other case run `nix develop`.

-
 ### Non Nix users

 - [`Rust`](https://www.rust-lang.org/learn/get-started)
@@ -140,34 +206,62 @@ If you have [`direnv`](https://direnv.net) installed, run `direnv allow` once to
 ### Commands

 ```sh
-just --list
+just

 Available recipes:
-    build   # build app
-    b       # alias for `build`
-    default
-    format  # format files
-    f       # alias for `format`
-    lint    # lint
-    l       # alias for `lint`
-    run     # run app
-    r       # alias for `run`
-    test    # run tests
-    t       # alias for `test`
+    default               # list commands
+
+    [build]
+    build                 # build app [alias: b]
+
+    [demo]
+    demo-blink            # build demo: blink animation [alias: db]
+    demo-countdown        # build demo: countdown [alias: dc]
+    demo-countdown-met    # build demo: countdown + met [alias: dcm]
+    demo-decis            # build demo: deciseconds [alias: dd]
+    demo-local-time       # build demo: local time [alias: dlt]
+    demo-menu             # build demo: menu [alias: dm]
+    demo-pomodoro         # build demo: pomodoro [alias: dp]
+    demo-rocket-countdown # build demo: rocket countdown [alias: drc]
+    demo-style            # build demo: styles [alias: ds]
+    demo-timer            # build demo: timer [alias: dt]
+
+    [dev]
+    run                      # run app [alias: r]
+    run-args args            # run app with arguments. It expects arguments as a string (e.g. "-c 5:00"). [alias: ra]
+    run-sound path           # run app while sound feature is enabled. It expects a path to a sound file. [alias: rs]
+    run-sound-args path args # run app while sound feature is enabled by adding a path to a sound file and other arguments as string (e.g. "-c 5:00"). [alias: rsa]
+
+    [misc]
+    format                # format files [alias: f]
+    lint                  # lint [alias: l]
+
+    [test]
+    test                  # run tests [alias: t]
 ```

 ### Build

 - Linux
+
 ```sh
 nix build
+# or for bulding w/ statically linked binaries
+nix build .#linuxStatic
 ```

 - Windows (cross-compilation)
+
 ```sh
 nix build .#windows
 ```

+### Run tests
+
+```sh
+cargo test
+```
+
 # Misc.

 ## Persistant app state
@@ -199,3 +293,7 @@ C:/Users/{user}/AppData/Local/timr-tui/logs/app.log
 ```

 Optional: You can use a custom directory by passing it via `--log` arg.
+
+# License
+
+[MIT License](./LICENSE)
--- a/demo/menu.gif
+++ b/demo/menu.gif
--- a/demo/menu.tape
+++ b/demo/menu.tape
@@ -12,19 +12,15 @@ Set Margin 1
 # --- START ---
 Set LoopOffset 4
 Hide
-Type "cargo run -- -r -m p"
+Type "cargo run -- -r -m p --menu"
 Enter
-Sleep 0.2
+Type@200ms "m"
 Show
 # --- STYLES ---
-Sleep 0.5
-Type "m"
-Sleep 0.5
-Type@0.5s "t"
-Type@0.5s "c"
-Type@0.5s "p"
-Type@0.5s "e"
-Right@0.5s
-Left@0.5s
-Type@0.5s "e"
-Sleep 0.5
+Sleep 0.3s
+Type@0.3s "m"
+Type@0.3s "t"
+Type@0.3s "c"
+Type@0.3s "p"
+Type@0.3s "e"
+Escape@0.3s
--- a/demo/pomodoro.gif
+++ b/demo/pomodoro.gif
--- a/demo/pomodoro.tape
+++ b/demo/pomodoro.tape
@@ -10,9 +10,8 @@ Set Padding 0
 Set Margin 1

 # --- START ---
-Set LoopOffset 4
 Hide
-Type "cargo run -- -r -d -m p"
+Type "cargo run -- -d -m p --blink on"
 Enter
 Sleep 0.2
 Show
@@ -25,7 +24,7 @@ Sleep 0.2
 Down@30ms 80
 Sleep 100ms
 Type "e"
-Sleep 3
+Sleep 4
 # --- POMODORO PAUSE ---
 Right
 Sleep 0.5
@@ -36,4 +35,4 @@ Sleep 0.2
 Down@30ms 60
 Sleep 100ms
 Type "e"
-Sleep 3
+Sleep 4
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "crane": {
      "locked": {
-        "lastModified": 1739936662,
-        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
+        "lastModified": 1745454774,
+        "narHash": "sha256-oLvmxOnsEKGtwczxp/CwhrfmQUG2ym24OMWowcoRhH8=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
+        "rev": "efd36682371678e2b6da3f108fdb5c613b3ec598",
        "type": "github"
      },
      "original": {
@@ -23,11 +23,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1740378829,
-        "narHash": "sha256-cwmm7F73aQFJY6YN1roNibNKwxT6FlfXkG3MEbpSp7Q=",
+        "lastModified": 1745995211,
+        "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7",
+        "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3",
        "type": "github"
      },
      "original": {
@@ -56,11 +56,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1740367490,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
        "type": "github"
      },
      "original": {
@@ -81,11 +81,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1740329432,
-        "narHash": "sha256-eKQ7aBkNvF5AhUpyJ1cW450jxomZ4gTIaYir5qsNl7Y=",
+        "lastModified": 1745949276,
+        "narHash": "sha256-9ZK31t2HUiGdLLnDafrRnSrrO12JwqcAFbrJ9nRwh0Y=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "6d68c475c7aaf7534251182662456a4bf4216dfe",
+        "rev": "78a488dd5e7e4f17162001519665795e6e68b6f8",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
        {
          file = ./rust-toolchain.toml;
          # sha256 = nixpkgs.lib.fakeSha256;
-          sha256 = "sha256-AJ6LX/Q/Er9kS15bn9iflkUwcgYqRQxiOIL2ToVAXaU=";
+          sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
        };

      craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
@@ -88,16 +88,12 @@
            # some extra pkgs needed to play sound on Linux
            ++ lib.optionals stdenv.isLinux [
              pkgs.pkg-config
-              pkgs.alsa-lib.dev
-              pkgs.pipewire
+              (pkgs.alsa-lib-with-plugins.override {
+                plugins = [pkgs.alsa-plugins pkgs.pipewire];
+              })
            ];

          inherit (commonArgs) src;
-
-          ALSA_PLUGIN_DIR =
-            if stdenv.isLinux
-            then "${pkgs.pipewire}/lib/alsa-lib/"
-            else "";
        };
    });
 }
--- a/41
+++ b/41
@@ -2,24 +2,28 @@

 set unstable := true

+# list commands
 default:
    @just --list

 alias b := build

 # build app
+[group('build')]
 build:
    cargo build

 alias t := test

 # run tests
+[group('test')]
 test:
    cargo test

 alias f := format

 # format files
+[group('misc')]
 format:
    just --fmt
    cargo fmt
@@ -27,69 +31,106 @@ format:
 alias l := lint

 # lint
+[group('misc')]
 lint:
    cargo clippy --no-deps

 alias r := run

 # run app
+[group('dev')]
 run:
    cargo run

+alias ra := run-args
+
+# run app with arguments. It expects arguments as a string (e.g. "-c 5:00").
+[group('dev')]
+run-args args:
+    cargo run -- {{ args }}
+
 alias rs := run-sound

 # run app while sound feature is enabled. It expects a path to a sound file.
+[group('dev')]
 run-sound path:
    cargo run --features sound -- --sound={{ path }}

+alias rsa := run-sound-args
+
+# run app while sound feature is enabled by adding a path to a sound file and other arguments as string (e.g. "-c 5:00").
+[group('dev')]
+run-sound-args path args:
+    cargo run --features sound -- --sound={{ path }} {{ args }}
+
 # demos

 alias dp := demo-pomodoro

+# build demo: pomodoro
+[group('demo')]
 demo-pomodoro:
    vhs demo/pomodoro.tape

 alias dt := demo-timer

+# build demo: timer
+[group('demo')]
 demo-timer:
    vhs demo/timer.tape

 alias dc := demo-countdown

+# build demo: countdown
+[group('demo')]
 demo-countdown:
    vhs demo/countdown.tape

 alias dcm := demo-countdown-met

+# build demo: countdown + met
+[group('demo')]
 demo-countdown-met:
    vhs demo/countdown-met.tape

 alias ds := demo-style

+# build demo: styles
+[group('demo')]
 demo-style:
    vhs demo/style.tape

 alias dd := demo-decis

+# build demo: deciseconds
+[group('demo')]
 demo-decis:
    vhs demo/decis.tape

 alias dm := demo-menu

+# build demo: menu
+[group('demo')]
 demo-menu:
    vhs demo/menu.tape

 alias dlt := demo-local-time

+# build demo: local time
+[group('demo')]
 demo-local-time:
    vhs demo/local-time.tape

 alias drc := demo-rocket-countdown

+# build demo: rocket countdown
+[group('demo')]
 demo-rocket-countdown:
    vhs demo/met.tape

 alias db := demo-blink

+# build demo: blink animation
+[group('demo')]
 demo-blink:
    vhs demo/blink.tape
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,6 @@
 [toolchain]
 # Reminder: Always keep `rust-version` in `Cargo.toml` in sync with `channel`.
-channel = "1.85.0"
+channel = "1.86.0"
 components = ["clippy", "rustfmt", "rust-src", "rust-analyzer"]
 targets = ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl"]
 profile = "minimal"
--- a/src/app.rs
+++ b/src/app.rs
@@ -61,6 +61,7 @@ pub struct AppArgs {
    pub app_time_format: AppTimeFormat,
    pub content: Content,
    pub pomodoro_mode: PomodoroMode,
+    pub pomodoro_round: u64,
    pub initial_value_work: Duration,
    pub current_value_work: Duration,
    pub initial_value_pause: Duration,
@@ -94,6 +95,7 @@ impl From<FromAppArgs> for App {
            content: args.mode.unwrap_or(stg.content),
            style: args.style.unwrap_or(stg.style),
            pomodoro_mode: stg.pomodoro_mode,
+            pomodoro_round: stg.pomodoro_count,
            initial_value_work: args.work.unwrap_or(stg.inital_value_work),
            // invalidate `current_value_work` if an initial value is set via args
            current_value_work: args.work.unwrap_or(stg.current_value_work),
@@ -103,7 +105,11 @@ impl From<FromAppArgs> for App {
            initial_value_countdown: args.countdown.unwrap_or(stg.inital_value_countdown),
            // invalidate `current_value_countdown` if an initial value is set via args
            current_value_countdown: args.countdown.unwrap_or(stg.current_value_countdown),
-            elapsed_value_countdown: stg.elapsed_value_countdown,
+            elapsed_value_countdown: match args.countdown {
+                // reset value if countdown is set by arguments
+                Some(_) => Duration::ZERO,
+                None => stg.elapsed_value_countdown,
+            },
            current_value_timer: stg.current_value_timer,
            app_tx,
            #[cfg(feature = "sound")]
@@ -138,6 +144,7 @@ impl App {
            content,
            with_decis,
            pomodoro_mode,
+            pomodoro_round,
            notification,
            blink,
            sound_path,
@@ -179,6 +186,7 @@ impl App {
                initial_value_pause,
                current_value_pause,
                with_decis,
+                round: pomodoro_round,
                app_tx: app_tx.clone(),
            }),
            footer: FooterState::new(show_menu, app_time_format),
@@ -194,7 +202,7 @@ impl App {
        let handle_key_event = |app: &mut Self, key: KeyEvent| {
            debug!("Received key {:?}", key.code);
            match key.code {
-                KeyCode::Char('q') | KeyCode::Esc => app.mode = Mode::Quit,
+                KeyCode::Char('q') => app.mode = Mode::Quit,
                KeyCode::Char('c') => app.content = Content::Countdown,
                KeyCode::Char('t') => app.content = Content::Timer,
                KeyCode::Char('p') => app.content = Content::Pomodoro,
@@ -355,6 +363,7 @@ impl App {
            style: self.style,
            with_decis: self.with_decis,
            pomodoro_mode: self.pomodoro.get_mode().clone(),
+            pomodoro_count: self.pomodoro.get_round(),
            inital_value_work: Duration::from(*self.pomodoro.get_clock_work().get_initial_value()),
            current_value_work: Duration::from(*self.pomodoro.get_clock_work().get_current_value()),
            inital_value_pause: Duration::from(
@@ -405,7 +414,7 @@ impl StatefulWidget for AppWidget {
        let [v0, v1, v2] = Layout::vertical([
            Constraint::Length(1),
            Constraint::Percentage(100),
-            Constraint::Length(if state.footer.get_show_menu() { 4 } else { 1 }),
+            Constraint::Length(if state.footer.get_show_menu() { 5 } else { 1 }),
        ])
        .areas(area);

--- a/src/storage.rs
+++ b/src/storage.rs
@@ -18,6 +18,7 @@ pub struct AppStorage {
    pub style: Style,
    pub with_decis: bool,
    pub pomodoro_mode: PomodoroMode,
+    pub pomodoro_count: u64,
    // pomodoro -> work
    pub inital_value_work: Duration,
    pub current_value_work: Duration,
@@ -46,6 +47,7 @@ impl Default for AppStorage {
            style: Style::default(),
            with_decis: false,
            pomodoro_mode: PomodoroMode::Work,
+            pomodoro_count: 1,
            // pomodoro -> work
            inital_value_work: DEFAULT_WORK,
            current_value_work: DEFAULT_WORK,
--- a/src/widgets/clock.rs
+++ b/src/widgets/clock.rs
@@ -74,6 +74,7 @@ pub struct ClockState<T> {
    name: Option<String>,
    initial_value: DurationEx,
    current_value: DurationEx,
+    prev_value: DurationEx,
    tick_value: DurationEx,
    mode: Mode,
    format: Format,
@@ -142,6 +143,10 @@ impl<T> ClockState<T> {
        &self.initial_value
    }

+    pub fn set_initial_value(&mut self, duration: DurationEx) {
+        self.initial_value = duration;
+    }
+
    pub fn get_current_value(&self) -> &DurationEx {
        &self.current_value
    }
@@ -151,14 +156,18 @@ impl<T> ClockState<T> {
        self.update_format();
    }

+    pub fn get_prev_value(&self) -> &DurationEx {
+        &self.prev_value
+    }
+
    pub fn toggle_edit(&mut self) {
        self.mode = match self.mode.clone() {
            Mode::Editable(_, prev) => {
                let p = *prev;
-                // special cases: Should `Mode` be updated?
-                // 1. `Done` -> `Initial` ?
+                // Update `Mode`
+                // 1. `Done` -> `Pause`
                if p == Mode::Done && self.current_value.gt(&Duration::ZERO.into()) {
-                    Mode::Initial
+                    Mode::Pause
                }
                // 2. `_` -> `Done` ?
                else if p != Mode::Done && self.current_value.eq(&Duration::ZERO.into()) {
@@ -170,6 +179,8 @@ impl<T> ClockState<T> {
                }
            }
            mode => {
+                // store prev. value
+                self.prev_value = self.current_value;
                if self.format <= Format::Ss {
                    Mode::Editable(Time::Seconds, Box::new(mode))
                } else {
@@ -402,6 +413,7 @@ impl ClockState<Countdown> {
            name: None,
            initial_value: initial_value.into(),
            current_value: current_value.into(),
+            prev_value: current_value.into(),
            tick_value: tick_value.into(),
            mode: if current_value == Duration::ZERO {
                Mode::Done
@@ -475,6 +487,7 @@ impl ClockState<Timer> {
            name: None,
            initial_value: initial_value.into(),
            current_value: current_value.into(),
+            prev_value: current_value.into(),
            tick_value: tick_value.into(),
            mode: if current_value == initial_value {
                Mode::Initial
--- a/src/widgets/countdown.rs
+++ b/src/widgets/countdown.rs
@@ -144,8 +144,6 @@ impl CountdownState {

 impl TuiEventHandler for CountdownState {
    fn update(&mut self, event: TuiEvent) -> Option<TuiEvent> {
-        let is_edit_clock = self.clock.is_edit_mode();
-        let is_edit_time = self.edit_time.is_some();
        match event {
            TuiEvent::Tick => {
                if !self.clock.is_done() {
@@ -164,6 +162,96 @@ impl TuiEventHandler for CountdownState {
                    edit_time.set_max_time(max_time);
                }
            }
+            // EDIT CLOCK mode
+            TuiEvent::Key(key) if self.is_clock_edit_mode() => match key.code {
+                // skip editing
+                KeyCode::Esc => {
+                    // Important: set current value first
+                    self.clock.set_current_value(*self.clock.get_prev_value());
+                    // before toggling back to non-edit mode
+                    self.clock.toggle_edit();
+                }
+                // Apply changes and set new initial value
+                KeyCode::Char('s') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                    // toggle edit mode
+                    self.clock.toggle_edit();
+                    // set initial value
+                    self.clock
+                        .set_initial_value(*self.clock.get_current_value());
+                    // always reset `elapsed_clock`
+                    self.elapsed_clock.reset();
+                }
+                // Apply changes
+                KeyCode::Char('s') => {
+                    // toggle edit mode
+                    self.clock.toggle_edit();
+                    // always reset `elapsed_clock`
+                    self.elapsed_clock.reset();
+                }
+                KeyCode::Right => {
+                    self.clock.edit_prev();
+                }
+                KeyCode::Left => {
+                    self.clock.edit_next();
+                }
+                KeyCode::Up => {
+                    self.clock.edit_up();
+                }
+                KeyCode::Down => {
+                    self.clock.edit_down();
+                }
+                _ => return Some(event),
+            },
+            // EDIT LOCAL TIME mode
+            TuiEvent::Key(key) if self.is_time_edit_mode() => match key.code {
+                // skip editing
+                KeyCode::Esc => {
+                    self.edit_time = None;
+                }
+                // Apply changes and set new initial value
+                KeyCode::Char('s') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                    if let Some(edit_time) = &mut self.edit_time.clone() {
+                        // Order matters:
+                        // 1. update current value
+                        self.edit_time_done(edit_time);
+                        // 2. set initial value
+                        self.clock
+                            .set_initial_value(*self.clock.get_current_value());
+                    }
+                    // always reset `elapsed_clock`
+                    self.elapsed_clock.reset();
+                }
+                // Apply changes of editing by local time
+                KeyCode::Char('s') => {
+                    if let Some(edit_time) = &mut self.edit_time.clone() {
+                        self.edit_time_done(edit_time)
+                    }
+                    // always reset `elapsed_clock`
+                    self.elapsed_clock.reset();
+                }
+                // move edit position to the left
+                KeyCode::Left => {
+                    // safe unwrap because we are in `is_time_edit_mode`
+                    self.edit_time.as_mut().unwrap().next();
+                }
+                // move edit position to the right
+                KeyCode::Right => {
+                    // safe unwrap because we are in `is_time_edit_mode`
+                    self.edit_time.as_mut().unwrap().prev();
+                }
+                // Value up
+                KeyCode::Up => {
+                    // safe unwrap because of previous check in `is_time_edit_mode`
+                    self.edit_time.as_mut().unwrap().up();
+                }
+                // Value down
+                KeyCode::Down => {
+                    // safe unwrap because of previous check in `is_time_edit_mode`
+                    self.edit_time.as_mut().unwrap().down();
+                }
+                _ => return Some(event),
+            },
+            // default mode
            TuiEvent::Key(key) => match key.code {
                KeyCode::Char('r') => {
                    // reset both clocks to use intial values
@@ -189,85 +277,29 @@ impl TuiEventHandler for CountdownState {
                        self.edit_time_done(edit_time);
                    }
                }
-                // STRG + e => toggle edit time
+                // Enter edit by local time mode
                KeyCode::Char('e') if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                    // stop editing clock
-                    if self.clock.is_edit_mode() {
-                        // toggle edit mode
-                        self.clock.toggle_edit();
-                    }
-
-                    if let Some(edit_time) = &mut self.edit_time.clone() {
-                        self.edit_time_done(edit_time)
-                    } else {
-                        // update `edit_time`
+                    // set `edit_time`
                    self.edit_time = Some(EditTimeState::new(EditTimeStateArgs {
                        time: self.time_to_edit(),
                        min: self.min_time_to_edit(),
                        max: self.max_time_to_edit(),
                    }));
-                    }

-                    // stop `clock`
-                    if self.clock.is_running() {
-                        self.clock.toggle_pause();
-                    }
-
-                    // stop `elapsed_clock`
+                    // pause `elapsed_clock`
                    if self.elapsed_clock.is_running() {
                        self.elapsed_clock.toggle_pause();
                    }
                }
-                // STRG + e => toggle edit clock
+                // Enter edit clock mode
                KeyCode::Char('e') => {
                    // toggle edit mode
                    self.clock.toggle_edit();

-                    // stop `elapsed_clock`
+                    // pause `elapsed_clock`
                    if self.elapsed_clock.is_running() {
                        self.elapsed_clock.toggle_pause();
                    }
-
-                    // finish `edit_time` and continue for using `clock`
-                    if let Some(edit_time) = &mut self.edit_time.clone() {
-                        self.edit_time_done(edit_time);
-                    }
-                }
-                KeyCode::Left if is_edit_clock => {
-                    self.clock.edit_next();
-                }
-                KeyCode::Left if is_edit_time => {
-                    // safe unwrap because of previous check in `is_edit_time`
-                    self.edit_time.as_mut().unwrap().next();
-                }
-                KeyCode::Right if is_edit_clock => {
-                    self.clock.edit_prev();
-                }
-                KeyCode::Right if is_edit_time => {
-                    // safe unwrap because of previous check in `is_edit_time`
-                    self.edit_time.as_mut().unwrap().prev();
-                }
-                KeyCode::Up if is_edit_clock => {
-                    self.clock.edit_up();
-                    // whenever `clock`'s value is changed, reset `elapsed_clock`
-                    self.elapsed_clock.reset();
-                }
-                KeyCode::Up if is_edit_time => {
-                    // safe unwrap because of previous check in `is_edit_time`
-                    self.edit_time.as_mut().unwrap().up();
-                    // whenever `clock`'s value is changed, reset `elapsed_clock`
-                    self.elapsed_clock.reset();
-                }
-                KeyCode::Down if is_edit_clock => {
-                    self.clock.edit_down();
-                    // whenever clock value is changed, reset timer
-                    self.elapsed_clock.reset();
-                }
-                KeyCode::Down if is_edit_time => {
-                    // safe unwrap because of previous check in `is_edit_time`
-                    self.edit_time.as_mut().unwrap().down();
-                    // whenever clock value is changed, reset timer
-                    self.elapsed_clock.reset();
                }
                _ => return Some(event),
            },
--- a/src/widgets/footer.rs
+++ b/src/widgets/footer.rs
@@ -104,7 +104,7 @@ impl StatefulWidget for Footer {
            let widths = [Constraint::Length(12), Constraint::Percentage(100)];
            let table = Table::new(
                [
-                    // content
+                    // screens
                    Row::new(vec![
                        Cell::from(Span::styled(
                            "screens",
@@ -112,7 +112,7 @@ impl StatefulWidget for Footer {
                        )),
                        Cell::from(Line::from(content_labels)),
                    ]),
-                    // format
+                    // appearance
                    Row::new(vec![
                        Cell::from(Span::styled(
                            "appearance",
@@ -132,7 +132,7 @@ impl StatefulWidget for Footer {
                            )),
                        ])),
                    ]),
-                    // edit
+                    // controls - 1. row
                    Row::new(vec![
                        Cell::from(Span::styled(
                            "controls",
@@ -141,47 +141,85 @@ impl StatefulWidget for Footer {
                        Cell::from(Line::from({
                            match self.app_edit_mode {
                                AppEditMode::None => {
-                                    let mut spans = vec![
-                                        Span::from(if self.running_clock {
+                                    let mut spans = vec![Span::from(if self.running_clock {
                                        "[s]top"
                                    } else {
                                        "[s]tart"
-                                        }),
-                                        Span::from(SPACE),
-                                        Span::from("[r]eset"),
+                                    })];
+                                    spans.extend_from_slice(&[
                                        Span::from(SPACE),
                                        Span::from("[e]dit"),
-                                    ];
+                                    ]);
                                    if self.selected_content == Content::Countdown {
                                        spans.extend_from_slice(&[
                                            Span::from(SPACE),
                                            Span::from("[^e]dit by local time"),
                                        ]);
                                    }
+                                    spans.extend_from_slice(&[
+                                        Span::from(SPACE),
+                                        Span::from("[r]eset"),
+                                    ]);
                                    if self.selected_content == Content::Pomodoro {
                                        spans.extend_from_slice(&[
                                            Span::from(SPACE),
-                                            Span::from("[← →]switch work/pause"),
+                                            Span::from("[^r]eset round"),
                                        ]);
                                    }
                                    spans
                                }
-                                others => vec![
-                                    Span::from(match others {
-                                        AppEditMode::Clock => "[e]dit done",
-                                        AppEditMode::Time => "[^e]dit done",
-                                        _ => "",
-                                    }),
+                                _ => {
+                                    let mut spans = vec![Span::from("[s]ave changes")];
+                                    if self.selected_content == Content::Countdown
+                                        || self.selected_content == Content::Pomodoro
+                                    {
+                                        spans.extend_from_slice(&[
                                            Span::from(SPACE),
+                                            Span::from("[^s]ave initial value"),
+                                        ]);
+                                    }
+                                    spans.extend_from_slice(&[
+                                        Span::from(SPACE),
+                                        Span::from("[esc]skip changes"),
+                                    ]);
+                                    spans
+                                }
+                            }
+                        })),
+                    ]),
+                    // controls - 2. row
+                    Row::new(vec![
+                        Cell::from(Line::from("")),
+                        Cell::from(Line::from({
+                            match self.app_edit_mode {
+                                AppEditMode::None => {
+                                    let mut spans = vec![];
+                                    if self.selected_content == Content::Pomodoro {
+                                        spans.extend_from_slice(&[Span::from(
+                                            "[← →]switch work/pause",
+                                        )]);
+                                    }
+                                    spans
+                                }
+                                _ => vec![
                                    Span::from(format!(
-                                        "[{} {}]edit selection",
+                                        // ← →,
+                                        "[{} {}]change selection",
                                        scrollbar::HORIZONTAL.begin,
                                        scrollbar::HORIZONTAL.end
-                                    )), // ← →,
+                                    )),
                                    Span::from(SPACE),
-                                    Span::from(format!("[{}]edit up", scrollbar::VERTICAL.begin)), // ↑
+                                    Span::from(format!(
+                                        // ↑
+                                        "[{}]edit up",
+                                        scrollbar::VERTICAL.begin
+                                    )),
                                    Span::from(SPACE),
-                                    Span::from(format!("[{}]edit up", scrollbar::VERTICAL.end)), // ↓,
+                                    Span::from(format!(
+                                        // ↓
+                                        "[{}]edit up",
+                                        scrollbar::VERTICAL.end
+                                    )),
                                ],
                            }
                        })),
--- a/src/widgets/pomodoro.rs
+++ b/src/widgets/pomodoro.rs
@@ -5,9 +5,9 @@ use crate::{
    utils::center,
    widgets::clock::{ClockState, ClockStateArgs, ClockWidget, Countdown},
 };
+use crossterm::event::{KeyCode, KeyModifiers};
 use ratatui::{
    buffer::Buffer,
-    crossterm::event::KeyCode,
    layout::{Constraint, Layout, Rect},
    text::Line,
    widgets::{StatefulWidget, Widget},
@@ -45,6 +45,7 @@ impl ClockMap {
 pub struct PomodoroState {
    mode: Mode,
    clock_map: ClockMap,
+    round: u64,
 }

 pub struct PomodoroStateArgs {
@@ -55,6 +56,7 @@ pub struct PomodoroStateArgs {
    pub current_value_pause: Duration,
    pub with_decis: bool,
    pub app_tx: AppEventTx,
+    pub round: u64,
 }

 impl PomodoroState {
@@ -67,6 +69,7 @@ impl PomodoroState {
            current_value_pause,
            with_decis,
            app_tx,
+            round,
        } = args;
        Self {
            mode,
@@ -88,6 +91,7 @@ impl PomodoroState {
                })
                .with_name("Pause".to_owned()),
            },
+            round,
        }
    }

@@ -111,6 +115,10 @@ impl PomodoroState {
        &self.mode
    }

+    pub fn get_round(&self) -> u64 {
+        self.round
+    }
+
    pub fn set_with_decis(&mut self, with_decis: bool) {
        self.clock_map.work.with_decis = with_decis;
        self.clock_map.pause.with_decis = with_decis;
@@ -132,34 +140,77 @@ impl TuiEventHandler for PomodoroState {
                self.get_clock_mut().tick();
                self.get_clock_mut().update_done_count();
            }
+            // EDIT mode
+            TuiEvent::Key(key) if edit_mode => match key.code {
+                // Skip changes
+                KeyCode::Esc => {
+                    let clock = self.get_clock_mut();
+                    // Important: set current value first
+                    clock.set_current_value(*clock.get_prev_value());
+                    // before toggling back to non-edit mode
+                    clock.toggle_edit();
+                }
+                // Apply changes and update initial value
+                KeyCode::Char('s') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                    self.get_clock_mut().toggle_edit();
+                    // update initial value
+                    let c = *self.get_clock().get_current_value();
+                    self.get_clock_mut().set_initial_value(c);
+                }
+                // Apply changes
+                KeyCode::Char('s') => {
+                    self.get_clock_mut().toggle_edit();
+                }
+                // Value up
+                KeyCode::Up => {
+                    self.get_clock_mut().edit_up();
+                }
+                // Value down
+                KeyCode::Down => {
+                    self.get_clock_mut().edit_down();
+                }
+                // move edit position to the left
+                KeyCode::Left => {
+                    self.get_clock_mut().edit_next();
+                }
+                // move edit position to the right
+                KeyCode::Right => {
+                    self.get_clock_mut().edit_prev();
+                }
+                _ => return Some(event),
+            },
+            // default mode
            TuiEvent::Key(key) => match key.code {
+                // Toggle run/pause
                KeyCode::Char('s') => {
                    self.get_clock_mut().toggle_pause();
                }
+                // Enter edit mode
                KeyCode::Char('e') => {
                    self.get_clock_mut().toggle_edit();
                }
-                KeyCode::Left if edit_mode => {
-                    self.get_clock_mut().edit_next();
-                }
+                // toggle WORK/PAUSE
                KeyCode::Left => {
-                    // `next` is acting as same as a `prev` function, we don't have
+                    // `next` is acting as same as a "prev" function we don't have
                    self.next();
                }
-                KeyCode::Right if edit_mode => {
-                    self.get_clock_mut().edit_prev();
-                }
+                // toggle WORK/PAUSE
                KeyCode::Right => {
                    self.next();
                }
-                KeyCode::Up if edit_mode => {
-                    self.get_clock_mut().edit_up();
-                }
-                KeyCode::Down if edit_mode => {
-                    self.get_clock_mut().edit_down();
+                // reset round
+                KeyCode::Char('r') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                    self.round = 1;
                }
+                // reset values
                KeyCode::Char('r') => {
-                    self.get_clock_mut().reset();
+                    // count number of finished rounds of WORK before resetting the clock
+                    if self.get_mode() == &Mode::Work && self.get_clock().is_done() {
+                        self.round += 1;
+                    }
+                    // reset both clocks
+                    self.clock_map.pause.reset();
+                    self.clock_map.work.reset();
                }
                _ => return Some(event),
            },
@@ -186,6 +237,7 @@ impl StatefulWidget for PomodoroWidget {
            ))
            .to_uppercase(),
        );
+        let label_round = Line::raw((format!("round {}", state.get_round(),)).to_uppercase());

        let area = center(
            area,
@@ -196,13 +248,25 @@ impl StatefulWidget for PomodoroWidget {
                ),
                label.width() as u16,
            )),
-            Constraint::Length(clock_widget.get_height() + 1 /* height of mode_str */),
+            Constraint::Length(
+                // empty label + height of `label` + `label_round`
+                clock_widget.get_height() + 3,
+            ),
        );

-        let [v1, v2] =
-            Layout::vertical(Constraint::from_lengths([clock_widget.get_height(), 1])).areas(area);
+        let [v1, v2, v3, v4] = Layout::vertical(Constraint::from_lengths([
+            1,
+            clock_widget.get_height(),
+            1,
+            1,
+        ]))
+        .areas(area);

-        clock_widget.render(v1, buf, state.get_clock_mut());
-        label.centered().render(v2, buf);
+        // empty line keep everything in center vertically comparing to other
+        // views (which have one label below the clock only)
+        Line::raw("").centered().render(v1, buf);
+        clock_widget.render(v2, buf, state.get_clock_mut());
+        label.centered().render(v3, buf);
+        label_round.centered().render(v4, buf);
    }
 }
--- a/src/widgets/timer.rs
+++ b/src/widgets/timer.rs
@@ -39,28 +39,51 @@ impl TuiEventHandler for TimerState {
                self.clock.tick();
                self.clock.update_done_count();
            }
+            // EDIT mode
+            TuiEvent::Key(key) if edit_mode => match key.code {
+                // Skip changes
+                KeyCode::Esc => {
+                    // Important: set current value first
+                    self.clock.set_current_value(*self.clock.get_prev_value());
+                    // before toggling back to non-edit mode
+                    self.clock.toggle_edit();
+                }
+                // Apply changes
+                KeyCode::Char('s') => {
+                    self.clock.toggle_edit();
+                }
+                // move change position to the left
+                KeyCode::Left => {
+                    self.clock.edit_next();
+                }
+                // move change position to the right
+                KeyCode::Right => {
+                    self.clock.edit_prev();
+                }
+                // change value up
+                KeyCode::Up => {
+                    self.clock.edit_up();
+                }
+                // change value down
+                KeyCode::Down => {
+                    self.clock.edit_down();
+                }
+                _ => return Some(event),
+            },
+            // default mode
            TuiEvent::Key(key) => match key.code {
+                // Toggle run/pause
                KeyCode::Char('s') => {
                    self.clock.toggle_pause();
                }
+                // reset clock
                KeyCode::Char('r') => {
                    self.clock.reset();
                }
+                // enter edit mode
                KeyCode::Char('e') => {
                    self.clock.toggle_edit();
                }
-                KeyCode::Left if edit_mode => {
-                    self.clock.edit_next();
-                }
-                KeyCode::Right if edit_mode => {
-                    self.clock.edit_prev();
-                }
-                KeyCode::Up if edit_mode => {
-                    self.clock.edit_up();
-                }
-                KeyCode::Down if edit_mode => {
-                    self.clock.edit_down();
-                }
                _ => return Some(event),
            },
            _ => return Some(event),
Author	SHA1	Message	Date
Jens Krause	c370d3096b	Prepare v1.3.0 (#80 ) * Prepare v1.3.0 * readme: fix keybindings * update changelog	2025-05-06 11:46:29 +02:00
jk	aae5c38cd6	fix(footer): hide option to save initial value for timer. Available 4 pomodoro + countdown only.	2025-05-06 11:25:29 +02:00
jk	5ad09b9848	(demo) update menu	2025-05-02 12:52:35 +02:00
Jens Krause	52ed8267be	(pomodoro/countdown) Change initial value (#79 ) - While editing, an user can apply changes as a new initial value (pomodoro/countdown only). - New keybinding: `[^s]save initial value` - Update keybinding: `[s]ave changes` (instead of `[Enter]`) - Refactor event handling to re-structure `edit` / `non-edit` modes. - Refactor footer to reflect latest keybindings	2025-05-02 12:39:26 +02:00
jk	6b068bbd09	fix(pomodoro) add empty line to keep content centered vertically comparing to other views (which have one label below the clock only) In addition to #75.	2025-04-30 14:27:30 +02:00
Jens Krause	c96432779a	(readme) add keybindings + toc (#78 ) * (readme) add keybindings + toc * update LICENSE	2025-04-30 14:19:13 +02:00
Jens Krause	509cf73cdd	(flake) use `alsa-lib-with-plugins` (#77 ) by following an idea from @camuward mentioned here https://github.com/143mailliw/muzak/pull/28#issuecomment-2833601152 Incl. another `nix flake update`.	2025-04-30 12:12:03 +02:00
Jens Krause	e6291a3131	Update keybindings (#76 ) * (pomodoro) reset both clocks at once * quit app by pressing `q` only * (countdown) enter/esc keybindings * (timer) enter/esc keybindings * (pomodoro) enter/esc keybindings * update footer label * fix(coundown): don't reset elapsed clock while skipping editing changes * fix(clock): order of actions matters for ESC handling. Set `pause` instead of `initial` mode while toggeling back. * fix(timer): order of actions matters (ESC key) * (footer) update order, lowercase standard keys	2025-04-30 11:11:33 +02:00
Jens Krause	90d9988e7a	(pomodoro) count WORK rounds (#75 )	2025-04-29 16:20:02 +02:00
Jens Krause	028a067419	Prepare v1.2.1 (#74 )	2025-04-17 12:26:13 +02:00
jk	675428cfb0	Update README	2025-04-17 08:31:40 +02:00
Jens Krause	28c5d7194c	Rust 1.86.0 (#73 )	2025-04-13 21:37:47 +02:00
Jens Krause	5b445afe25	fix(countdown): reset `MET` while editing by local time (#72 )	2025-04-13 21:17:56 +02:00
jk	beb12d5ec2	just: run with args	2025-04-13 19:19:46 +02:00
Jens Krause	d9399eafc9	fix(countdown): Reset `MET` if `countdown` is set by cli arguments (#71 ) * fix: Reset MET if countdown is set by args * update CHANGELOG	2025-03-03 12:21:17 +01:00
Jens Krause	ffad78e093	fix(just): `group` commands (#70 )	2025-02-26 14:58:54 +01:00
jk	e7a5a1b2da	exclude files for packaging	2025-02-26 12:31:18 +01:00
Jens Krause	6f0df4d488	Prepare v1.2.0 (#69 ) * prepare v1.2.0 * update README * update justfile	2025-02-26 12:11:54 +01:00