cargo build

.gitignore

@@ -21,7 +21,3 @@ result/**/*
 
 # ignore (possible) sound files
 **/*.{mp3,wav}
-
-
-CLAUDE.md
-.claude

AGENTS.md

@@ -1,24 +0,0 @@
-# About
-
-`timr-tui` is a TUI to maintain productivity and focus by providing different timers: Pomodoro, Countdown, Timer, Events.
-
-Built with Rust using `Ratatui` as the main library.
-
-# Development, Build, Tests
-
-Check [README](./README.md) chapter `Development` to get all information about how to run, build, test the app.
-
-# Code Guidelines
-
-- Idiomatic Rust everywhere
-- DRY whenever it makes sense
-- Rare or no comments are preferred instead of commenting everything which the code already describes
-- Keep tests compact and simple
-
-# Agent Guidelines
-
-- Keep your answers compact, but explicit. An user will ask if something is missing.
-- For complex tasks provide a plan.
-- Structure plans as small as possible.
-- Solve complex problems step by step, never all at once.
-- Act as a pair programmer, not as a vibe-coding provider. That's an user should guide you, not the opposite. Always ask if something is not clear to you.

CHANGELOG.md

@@ -1,65 +1,10 @@
 # Changelog
 
-## [unreleased]
-
-### Misc.
-
-- (deps) Rust 1.91.0 [#140](https://github.com/sectore/timr-tui/pull/140)
-
-## v1.6.1 - 2025-10-29
-
-### Fix
-
-- (event) Ignore all key events except `KeyEventKind::Press` [#137](https://github.com/sectore/timr-tui/issues/137)
-
-### Misc.
-
-- (docs) Update all demos [#135](https://github.com/sectore/timr-tui/pull/135), [513f1fe](https://github.com/sectore/timr-tui/commit/513f1fec11ab8bdad46ca565b0c3f08ed37d6219)
-
-## v1.6.0 - 2025-10-16
-
-### Features
-
-- (event) New `event` screen to count custom date times in the future or past. [#117](https://github.com/sectore/timr-tui/pull/117), [#120](https://github.com/sectore/timr-tui/pull/120), [#122](https://github.com/sectore/timr-tui/pull/122), [#123](https://github.com/sectore/timr-tui/pull/123), [#124](https://github.com/sectore/timr-tui/pull/124), [#125](https://github.com/sectore/timr-tui/pull/125), [#129](https://github.com/sectore/timr-tui/pull/129), [#130](https://github.com/sectore/timr-tui/pull/130), [#131](https://github.com/sectore/timr-tui/pull/131), [#132](https://github.com/sectore/timr-tui/pull/132)
-- (keybindings) Switch screens by `←` or `→` keys [#127](https://github.com/sectore/timr-tui/pull/127)
-- (duration) Inrease `MAX_DURATION` to `9999y 364d 23:59:59.9` [#128](https://github.com/sectore/timr-tui/pull/128)
-
-### Breaking change
-
-- (pomodoro)! New keybindings `ctrl+←` or `ctrl+→` to switch `work`/`pause` [#127](https://github.com/sectore/timr-tui/pull/127)
-- (keybindings)! Change keys for `screens` [#126](https://github.com/sectore/timr-tui/pull/126)
-- (cli)! Remove `--countdown-target` argument [#121](https://github.com/sectore/timr-tui/pull/121)
-
-### Misc.
-
-- Add `AGENTS.md` [#133](https://github.com/sectore/timr-tui/pull/133)
-
-## v1.5.0 - 2025-10-03
-
-### Features
-
-- (cli) Accept `years` and `days` for `--countdown` argument [#114](https://github.com/sectore/timr-tui/pull/114)
-- (cli) New `--countdown-target` argument to parse `countdown` values by given time in the future or past [#112](https://github.com/sectore/timr-tui/pull/112)
-- (localtime) Show `date` [#111](https://github.com/sectore/timr-tui/pull/111)
-- (edit) Change any value by `10x` up or down [#110](https://github.com/sectore/timr-tui/pull/110)
-- (timer/countdown): Support `days` and `years` up to `999y 364d 23:59:59` [#96](https://github.com/sectore/timr-tui/pull/96)
-
-### Fix
-
-- (edit) Auto jump to next possible value while decreasing, but ignoring `zero` values [#109](https://github.com/sectore/timr-tui/pull/109)
-- (format) Improve format handling + fix `days` (no zero-padding) [#107](https://github.com/sectore/timr-tui/pull/107)
-
-### Misc.
-
-- (deps) Upgrade dependencies [#113](https://github.com/sectore/timr-tui/pull/113)
-- (deps) Rust 1.90.0 [#95](https://github.com/sectore/timr-tui/pull/95)
-- (guide) Add contributing guidelines [#94](https://github.com/sectore/timr-tui/pull/94)
-
 ## v1.4.0 - 2025-09-02
 
 ### Features
 
-- (screen) Local Time [#89](https://github.com/sectore/timr-tui/pull/89), [#90](https://github.com/sectore/timr-tui/pull/90), [#91](https://github.com/sectore/timr-tui/pull/91)
+- (screen): Local Time [#89](https://github.com/sectore/timr-tui/pull/89), [#90](https://github.com/sectore/timr-tui/pull/90), [#91](https://github.com/sectore/timr-tui/pull/91)
 
 ### Misc.
 

CONTRIBUTING.md

@@ -1,18 +0,0 @@
-# Contributing
-
-Any feedback / contribution are welcome. Just open an `issue`, a `PR` or start a `discussion`.
-
-## Code style / conventions
-
-- Try to write [clean, idiomatic Rust code](https://github.com/mre/idiomatic-rust).
-- Keep code [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself) whenever it makes sense.
-- Before pushing any code make sure to run `clippy` and `fmt`. Check provided [`just`](./jusfile) file to run such commands, [CI](https://github.com/sectore/timr-tui/blob/main/.github/workflows/ci.yml) will do the same.
-- Have fun to write code.
-
-## Design files
-
-Use [Figma Design file](https://www.figma.com/community/file/1553076532392275586/timr-tui) to suggest design changes
-
-## AI
-
-Always understand what AI provides to you. Never push any code based on [`vibe coding`](https://en.wikipedia.org/wiki/Vibe_coding) you or anybody else can't follow. Make sure your agent still follows all code styles and conventions suggested above. Use AI for better, not for worse code.

Cargo.toml

@@ -1,24 +1,17 @@
 [package]
 name = "timr-tui"
-version = "1.6.1"
+version = "1.4.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.91.0"
+rust-version = "1.89.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",
-    ".claude",
-    "CLAUDE.md",
-]
+exclude = [".github/*", "demo/*.tape", "result/*", "*.mp3"]
 
 [dependencies]
 ratatui = "0.29.0"
@@ -28,21 +21,20 @@ futures = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
 strum = { version = "0.26.3", features = ["derive"] }
-tokio = { version = "1.47.1", features = ["full"] }
+tokio = { version = "1.45.1", features = ["full"] }
 tokio-stream = "0.1.17"
-tokio-util = "0.7.16"
+tokio-util = "0.7.15"
 tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 directories = "5.0.1"
-clap = { version = "4.5.48", features = ["derive"] }
-time = { version = "0.3.44", features = ["formatting", "local-offset", "parsing", "macros", "serde"] }
+clap = { version = "4.5.40", features = ["derive"] }
+time = { version = "0.3.41", features = ["formatting", "local-offset"] }
 notify-rust = "4.11.7"
 rodio = { version = "0.20.1", features = [
     "symphonia-mp3",
     "symphonia-wav",
 ], default-features = false, optional = true }
-thiserror = { version = "2.0.17", optional = true }
-tui-input = "0.14.0"
+thiserror = { version = "2.0.12", optional = true }
 
 
 [features]

README.md

@@ -1,11 +1,10 @@
 # timr-tui
 
-TUI to organize your time: Pomodoro, Countdown, Timer, Event.
+TUI to organize your time: Pomodoro, Countdown, Timer.
 
-- `[1] countdown` Use it for your workout, yoga/breathing sessions, meditation, handstand or whatever.
-- `[2] timer` Check the time on anything you are you doing.
-- `[3] pomodoro` Organize your working time to be focused all the time by following the [Pomodoro Technique](https://en.wikipedia.org/wiki/Pomodoro_Technique).
-- `[4] event` Count the time for any event in the future or past.
+- `[t]imer` Check the time on anything you are you doing.
+- `[c]ountdown` Use it for your workout, yoga session, meditation, handstand or whatever.
+- `[p]omodoro` Organize your working time to be focused all the time by following the [Pomodoro Technique](https://en.wikipedia.org/wiki/Pomodoro_Technique).
 
 Built with [Ratatui](https://ratatui.rs/) / [Rust 🦀](https://www.rust-lang.org/).
 
@@ -18,7 +17,6 @@ Built with [Ratatui](https://ratatui.rs/) / [Rust 🦀](https://www.rust-lang.or
 - [Installation](./#installation)
 - [Development](./#development)
 - [Misc](./#misc)
-- [Contributing](./#contributing)
 - [License](./#license)
 
 # Preview
@@ -37,28 +35,29 @@ _(theme depends on your terminal preferences)_
   <img alt="pomodoro" src="demo/timer.gif" />
 </a>
 
-## Countdown (*incl. [Mission Elapsed Time](https://en.wikipedia.org/wiki/Mission_Elapsed_Time)*)
+## Countdown
 
 <a href="demo/countdown.gif">
   <img alt="countdown" src="demo/countdown.gif" />
 </a>
 
-## Event (*past/future*)
+## Countdown: Mission Elapsed Time ([MET](https://en.wikipedia.org/wiki/Mission_Elapsed_Time))
 
-<a href="demo/event.gif">
-  <img alt="event" src="demo/event.gif" />
+<a href="demo/countdown-met.gif">
+  <img alt="menu" src="demo/countdown-met.gif" />
 </a>
 
+
 ## Local time
 
 <a href="demo/local-time.gif">
-  <img alt="local time" src="demo/local-time.gif" />
+  <img alt="menu" src="demo/local-time.gif" />
 </a>
 
-## Local time (*footer*)
+## Local time (footer)
 
 <a href="demo/local-time-footer.gif">
-  <img alt="local time at footer" src="demo/local-time-footer.gif" />
+  <img alt="menu" src="demo/local-time-footer.gif" />
 </a>
 
 ## Toggle deciseconds
@@ -67,13 +66,6 @@ _(theme depends on your terminal preferences)_
   <img alt="deciseconds" src="demo/decis.gif" />
 </a>
 
-## Maximum (*`9999y`* *`364d`* *`23:59:59.9`*)
-
-<a href="demo/timer-max.png">
-  <img alt="maximum" src="demo/timer-max.png" />
-</a>
-
-
 ## Change style
 
 <a href="demo/style.gif">
@@ -94,18 +86,17 @@ timr-tui --help
 Usage: timr-tui [OPTIONS]
 
 Options:
-  -c, --countdown <COUNTDOWN>        Countdown time to start from. Formats: 'Yy Dd hh:mm:ss', 'Dd hh:mm:ss', 'Yy mm:ss', 'Dd mm:ss', 'Yy ss', 'Dd ss', 'hh:mm:ss', 'mm:ss', 'ss'. Examples: '1y 5d 10:30:00', '2d 4:00', '1d 10', '5:03'.
-  -w, --work <WORK>                  Work time to count down from. Formats: 'ss', 'mm:ss', 'hh:mm:ss'
-  -p, --pause <PAUSE>                Pause time to count down from. Formats: 'ss', 'mm:ss', 'hh:mm:ss'
-  -e, --event <EVENT>                Event date time and title (optional). Format: 'YYYY-MM-DD HH:MM:SS' or 'time=YYYY-MM-DD HH:MM:SS[,title=...]'. Examples: '2025-10-10 14:30:00' or 'time=2025-10-10 14:30:00,title=My Event'.
+  -c, --countdown <COUNTDOWN>        Countdown time to start from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'
+  -w, --work <WORK>                  Work time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'
+  -p, --pause <PAUSE>                Pause time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'
   -d, --decis                        Show deciseconds.
-  -m, --mode <MODE>                  Mode to start with. [possible values: countdown, timer, pomodoro, event, localtime]
+  -m, --mode <MODE>                  Mode to start with. [possible values: countdown, timer, pomodoro, localtime]
   -s, --style <STYLE>                Style to display time with. [possible values: full, light, medium, dark, thick, cross, braille]
-      --menu                         Open menu.
-  -r, --reset                        Reset stored values to defaults.
+      --menu                         Open the menu.
+  -r, --reset                        Reset stored values to default values.
   -n, --notification <NOTIFICATION>  Toggle desktop notifications. Experimental. [possible values: on, off]
       --blink <BLINK>                Toggle blink mode to animate a clock when it reaches its finished mode. [possible values: on, off]
-      --log [<LOG>]                  Directory for log file. If not set, standard application log directory is used (check README for details).
+      --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
 ```
@@ -128,13 +119,10 @@ Extra option (if `--features sound` is enabled by local build only):
 
 | Key | Description |
 | --- | --- |
-| <kbd>1</kbd> | Pomodoro |
-| <kbd>2</kbd> | Countdown |
-| <kbd>3</kbd> | Timer |
-| <kbd>4</kbd> | Event |
-| <kbd>0</kbd> | Local Time |
-| <kbd>→</kbd> | next screen |
-| <kbd>←</kbd> | previous screen |
+| <kbd>p</kbd> | Pomodoro |
+| <kbd>c</kbd> | Countdown |
+| <kbd>t</kbd> | Timer |
+| <kbd>l</kbd> | Local Time |
 
 ## Controls
 
@@ -153,32 +141,22 @@ Extra option (if `--features sound` is enabled by local build only):
 | <kbd>Esc</kbd> | skip changes |
 | <kbd>←</kbd> or <kbd>→</kbd> | change selection |
 | <kbd>↑</kbd> | edit to go up |
-| <kbd>ctrl+↑</kbd> | edit to go up 10x |
 | <kbd>↓</kbd> | edit to go down |
-| <kbd>ctrl+↓</kbd> | edit to go down 10x |
-
-**In `Event` `edit` mode only:**
-
-| Key | Description |
-| --- | --- |
-| <kbd>Enter</kbd> | save changes |
-| <kbd>Esc</kbd> | skip changes |
-| <kbd>Tab</kbd> | switch input |
 
 **In `Pomodoro` screen only:**
 
 | Key | Description |
 | --- | --- |
-| <kbd>ctrl+←</kbd> or <kbd>ctrl+→</kbd> | switch work/pause |
-| <kbd>ctrl+r</kbd> | reset round |
-| <kbd>ctrl+s</kbd> | save initial value |
+| <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>ctrl+e</kbd> | edit by local time |
-| <kbd>ctrl+s</kbd> | save initial value |
+| <kbd>^e</kbd> | edit by local time |
+| <kbd>^s</kbd> | save initial value |
 
 ## Appearance
 
@@ -249,7 +227,6 @@ Available recipes:
     demo-countdown           # build demo: countdown [alias: dc]
     demo-countdown-met       # build demo: countdown + met [alias: dcm]
     demo-decis               # build demo: deciseconds [alias: dd]
-    demo-event               # build demo: event [alias: de]
     demo-local-time          # build demo: local time [alias: dlt]
     demo-local-time-footer   # build demo: local time (footer) [alias: dltf]
     demo-menu                # build demo: menu [alias: dm]
@@ -326,10 +303,6 @@ C:/Users/{user}/AppData/Local/timr-tui/logs/app.log
 
 Optional: You can use a custom directory by passing it via `--log` arg.
 
-# Contributing
-
-[CONTRIBUTING.md](./CONTRIBUTING.md)
-
 # License
 
 [MIT License](./LICENSE)

demo/blink.tape

@@ -4,8 +4,8 @@ Output demo/blink.gif
 Set Theme "nord-light"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 

demo/countdown-max.tape

@@ -1,19 +0,0 @@
-
-# https://github.com/charmbracelet/vhs/blob/main/THEMES.md
-Set Theme "Retro"
-
-Set FontSize 14
-Set Width 1000
-Set Height 500
-Set Padding 0
-Set Margin 1
-
-# --- START ---
-Type 'cargo run -- -r -d -c "10000y"'
-Enter
-Sleep .2
-Type "m"
-# --- SCREENSHOT ---
-Sleep 1s
-Screenshot demo/countdown-max.png
-Sleep 1s

demo/countdown-met.tape

@@ -0,0 +1,22 @@
+Output demo/countdown-met.gif
+
+# https://github.com/charmbracelet/vhs/blob/main/THEMES.md
+Set Theme "iceberg-light"
+
+Set FontSize 14
+Set Width 800
+Set Height 400
+Set Padding 0
+Set Margin 1
+
+# --- START ---
+Set LoopOffset 4
+Hide
+Type "cargo run -- -m c -c 3"
+Enter
+Sleep 0.2
+Show
+Type "s"
+Sleep 6
+Type "r"
+Sleep 1

demo/countdown.tape

@@ -1,24 +1,23 @@
 Output demo/countdown.gif
 
 # https://github.com/charmbracelet/vhs/blob/main/THEMES.md
-Set Theme "iceberg-light"
+Set Theme "Builtin Solarized Light"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
 # --- START ---
 Set LoopOffset 4
 Hide
-Type "cargo run -- -r -d -c 10:00"
+Type "cargo run -- -r -d -m c"
 Enter
-Sleep .2
-Type "m" # hide menu
+Sleep 0.2
 Show
 # --- COUNTDOWN ---
-Sleep .5
+Sleep 1
 Type "s"
 Sleep 1.4
 Type "s"
@@ -29,5 +28,6 @@ Type "e"
 Sleep 0.1
 Down@10ms 65
 Sleep 0.1
-Type "s"
+Type "e"
+Sleep 0.1
 Sleep 3

demo/decis.tape

@@ -4,8 +4,8 @@ Output demo/decis.gif
 Set Theme "nord-light"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
@@ -14,8 +14,7 @@ Set LoopOffset 4
 Hide
 Type "cargo run -- -r -m t"
 Enter
-Sleep .2
-Type "m" # hide menu
+Sleep 0.2
 Show
 # --- STYLES ---
 Type "s"

demo/event.tape

@@ -1,31 +0,0 @@
-Output demo/event.gif
-
-# https://github.com/charmbracelet/vhs/blob/main/THEMES.md
-Set Theme "Builtin Solarized Dark"
-
-Set FontSize 14
-Set Width 1000
-Set Height 500
-Set Padding 0
-Set Margin 1
-
-# --- START ---
-Set LoopOffset 4
-Hide
-Type "cargo run -- -r -e 'time=2010-01-10 10:00:00,title=hello world'"
-Enter
-Type "m"
-Sleep 0.2
-Show
-# --- EVENT ---
-Sleep 1
-Type "e"
-Backspace@1ms 17
-Type@20ms "50-01-01 01:00:01"
-Enter
-Type "e"
-Tab
-Backspace@10ms 11
-Type@20ms "hello future"
-Enter
-Sleep 1

demo/local-time-footer.tape

@@ -4,18 +4,17 @@ Output demo/local-time-footer.gif
 Set Theme "AtomOneLight"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
 # --- START ---
 Set LoopOffset 4
 Hide
-Type "cargo run -- -r -m c"
+Type "cargo run -- -m c"
 Enter
 Sleep 0.2
-Type "m" # hide menu
 Show
 # --- toggle local time ---
-Type@1s ":::"
+Type@1.5s ":::"

demo/local-time.tape

@@ -4,8 +4,8 @@ Output demo/local-time.gif
 Set Theme "Atom"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
@@ -14,8 +14,7 @@ Set LoopOffset 4
 Hide
 Type "cargo run -- -m l"
 Enter
-Sleep .2
-Type "m" # hide menu
+Sleep 0.2
 Show
 # --- toggle local time ---
-Type@1s ":::"
+Type@1.5s ":::"

demo/menu.tape

@@ -4,24 +4,23 @@ Output demo/menu.gif
 Set Theme "Apple Classic"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
 # --- START ---
 Set LoopOffset 4
 Hide
-Type "cargo run -- -r -m c"
+Type "cargo run -- -r -m p --menu"
 Enter
-Type@200ms "m" # hide menu
+Type@200ms "m"
 Show
 # --- STYLES ---
 Sleep 0.3s
-Type@0.3s "m" # show menu
-Type@0.3s "2"
-Type@0.3s "3"
+Type@0.3s "m"
+Type@0.3s "t"
+Type@0.3s "c"
+Type@0.3s "p"
 Type@0.3s "e"
 Escape@0.3s
-Type@0.3s "4"
-Type@0.3s "0"

demo/pomodoro.tape

@@ -1,35 +1,32 @@
-# Note: PR "support ctrl + arrow keys" https://github.com/charmbracelet/vhs/pull/673 needs to be merged to run this `tape`.
-
 Output demo/pomodoro.gif
 
 # https://github.com/charmbracelet/vhs/blob/main/THEMES.md
 Set Theme "Catppuccin Frappe"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
 # --- START ---
 Hide
-Type "cargo run -- -r -d -m p --blink on"
+Type "cargo run -- -d -m p --blink on"
 Enter
-Sleep .2
-Type "m" # hide menu
+Sleep 0.2
 Show
 # --- POMODORO WORK ---
-Sleep .5
-Type "s" # start
+Sleep 1
+Type "s"
 Sleep 2.3
 Type "e"
 Sleep 0.2
 Down@30ms 80
 Sleep 100ms
-Type "s" # save
+Type "e"
 Sleep 4
 # --- POMODORO PAUSE ---
-Ctrl+Right
+Right
 Sleep 0.5
 Type "s"
 Sleep 2.3
@@ -37,5 +34,5 @@ Type "e"
 Sleep 0.2
 Down@30ms 60
 Sleep 100ms
-Type "s" # save
+Type "e"
 Sleep 4

demo/style.tape

@@ -4,8 +4,8 @@ Output demo/style.gif
 Set Theme "OneDark"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
@@ -15,7 +15,6 @@ Hide
 Type "cargo run -- -r -d -m c"
 Enter
 Sleep 0.2
-Type "m" # hide menu
 Show
 # --- STYLES ---
 Sleep 0.5

demo/timer-max.tape

@@ -1,37 +0,0 @@
-# https://github.com/charmbracelet/vhs/blob/main/THEMES.md
-Set Theme "SeaShells"
-
-Set FontSize 14
-Set Width 1000
-Set Height 500
-Set Padding 0
-Set Margin 1
-
-# --- START ---
-Type 'cargo run -- -r -m t'
-Enter
-Type "m"
-Type "e"
-Up@1ms 60 # ss
-Left
-Up@1ms 60 # mm
-Left
-Up@1ms 23 # hh
-Left
-Up@1ms 363 # ddd
-Left
-Up@1ms 9999 # yyyy
-Right 4
-Down # ss
-Left
-Down ## mm
-Left 2
-Down ## ddd
-Up 2
-Type "."
-Type "s" # save
-Type "s" # start to reach DONE
-Sleep 2s
-# --- SCREENSHOT ---
-Screenshot demo/timer-max.png
-Sleep 1s

demo/timer.tape

@@ -4,8 +4,8 @@ Output demo/timer.gif
 Set Theme "Belafonte Day"
 
 Set FontSize 14
-Set Width 1000
-Set Height 500
+Set Width 800
+Set Height 400
 Set Padding 0
 Set Margin 1
 
@@ -15,7 +15,6 @@ Hide
 Type "cargo run -- -r -d -m t"
 Enter
 Sleep 0.2
-Type "m" # hide menu
 Show
 # --- TIMER ---
 Type "s"
@@ -28,5 +27,5 @@ Type "e"
 Sleep 0.2
 Up@30ms 57
 Sleep 0.7
-Type "s"
+Type "e"
 Sleep 4

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1760924934,
-        "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=",
+        "lastModified": 1754269165,
+        "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f",
+        "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1762065744,
-        "narHash": "sha256-c04mxJoCb8f6BBrdaREWmdQq+pfp395olXhC+B0G7DI=",
+        "lastModified": 1755240331,
+        "narHash": "sha256-wEtw76+R/TOHEIjYOnxADC91G6s422HGruAngbjzsDw=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "e0f24085a4a0da1c32adc308ec4c518ae886ff35",
+        "rev": "3f076d4502001c64877099093318b2dbd8b062a1",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761907660,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
+        "lastModified": 1755027561,
+        "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
+        "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1762016333,
-        "narHash": "sha256-PT8hXDYyeRjh9BGyLF/nZWm9TqRwP2EzeKuqUFH0M3w=",
+        "lastModified": 1755004716,
+        "narHash": "sha256-TbhPR5Fqw5LjAeI3/FOPhNNFQCF3cieKCJWWupeZmiA=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "fca718c0f2074bdccf9a996bb37b0fcaff80dc97",
+        "rev": "b2a58b8c6eff3c3a2c8b5c70dbf69ead78284194",
         "type": "github"
       },
       "original": {

flake.nix

@@ -23,8 +23,8 @@
         fenix.packages.${system}.fromToolchainFile
         {
           file = ./rust-toolchain.toml;
-          # sha256 = nixpkgs.lib.fakeSha256;
-          sha256 = "sha256-2eWc3xVTKqg5wKSHGwt1XoM/kUBC6y3MWfKg74Zn+fY=";
+          #sha256 = nixpkgs.lib.fakeSha256;
+          sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE=";
         };
 
       craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
@@ -85,18 +85,15 @@
               pkgs.nixd
               pkgs.alejandra
             ]
-            # pkgs needed to play sound on Linux
+            # some extra pkgs needed to play sound on Linux
             ++ lib.optionals stdenv.isLinux [
               pkgs.pkg-config
-              pkgs.pipewire
-              pkgs.alsa-lib
+              (pkgs.alsa-lib-with-plugins.override {
+                plugins = [pkgs.alsa-plugins pkgs.pipewire];
+              })
             ];
 
           inherit (commonArgs) src;
-
-          # Environment variables needed discover ALSA/PipeWire properly on Linux
-          LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${pkgs.alsa-lib}/lib:${pkgs.pipewire}/lib";
-          ALSA_PLUGIN_DIR = lib.optionalString stdenv.isLinux "${pkgs.pipewire}/lib/alsa-lib";
         };
     });
 }

justfile

@@ -65,17 +65,6 @@ run-sound-args path args:
 
 # demos
 
-alias da := demo-all
-
-# build all demos
-[group('demo')]
-demo-all:
-    #!/usr/bin/env bash
-    for tape in demo/*.tape; do
-        echo "Building demo: $tape"
-        vhs "$tape"
-    done
-
 alias dp := demo-pomodoro
 
 # build demo: pomodoro
@@ -152,24 +141,3 @@ alias db := demo-blink
 [group('demo')]
 demo-blink:
     vhs demo/blink.tape
-
-alias de := demo-event
-
-# build demo: event
-[group('demo')]
-demo-event:
-    vhs demo/event.tape
-
-alias dcmx := demo-countdown-max
-
-# build demo: timer-max
-[group('demo')]
-demo-countdown-max:
-    vhs demo/countdown-max.tape
-
-alias dtm := demo-timer-max
-
-# build demo: timer-max
-[group('demo')]
-demo-timer-max:
-    vhs demo/timer-max.tape

rust-toolchain.toml

@@ -1,6 +1,6 @@
 [toolchain]
 # Reminder: Always keep `rust-version` in `Cargo.toml` in sync with `channel`.
-channel = "1.91.0"
+channel = "1.89.0"
 components = ["clippy", "rustfmt", "rust-src", "rust-analyzer"]
 targets = ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl"]
 profile = "minimal"

src/app.rs

@@ -2,14 +2,12 @@ use crate::{
     args::Args,
     common::{AppEditMode, AppTime, AppTimeFormat, ClockTypeId, Content, Style, Toggle},
     constants::TICK_VALUE_MS,
-    event::Event,
     events::{self, TuiEventHandler},
     storage::AppStorage,
     terminal::Terminal,
     widgets::{
         clock::{self, ClockState, ClockStateArgs},
         countdown::{Countdown, CountdownState, CountdownStateArgs},
-        event::{EventState, EventStateArgs, EventWidget},
         footer::{Footer, FooterState},
         header::Header,
         local_time::{LocalTimeState, LocalTimeStateArgs, LocalTimeWidget},
@@ -18,8 +16,6 @@ use crate::{
     },
 };
 
-use crossterm::event::Event as CrosstermEvent;
-
 #[cfg(feature = "sound")]
 use crate::sound::Sound;
 
@@ -27,11 +23,12 @@ use color_eyre::Result;
 use ratatui::{
     buffer::Buffer,
     crossterm::event::{KeyCode, KeyEvent},
-    layout::{Constraint, Layout, Position, Rect},
+    layout::{Constraint, Layout, Rect},
     widgets::{StatefulWidget, Widget},
 };
 use std::path::PathBuf;
 use std::time::Duration;
+use time::OffsetDateTime;
 use tracing::{debug, error};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -52,12 +49,10 @@ pub struct App {
     countdown: CountdownState,
     timer: TimerState,
     pomodoro: PomodoroState,
-    event: EventState,
     local_time: LocalTimeState,
     style: Style,
     with_decis: bool,
     footer: FooterState,
-    cursor_position: Option<Position>,
 }
 
 pub struct AppArgs {
@@ -78,7 +73,6 @@ pub struct AppArgs {
     pub current_value_countdown: Duration,
     pub elapsed_value_countdown: Duration,
     pub current_value_timer: Duration,
-    pub event: Event,
     pub app_tx: events::AppEventTx,
     pub sound_path: Option<PathBuf>,
     pub footer_toggle_app_time: Toggle,
@@ -111,8 +105,6 @@ impl From<FromAppArgs> for App {
                         Content::Pomodoro
                     } else if args.countdown.is_some() {
                         Content::Countdown
-                    } else if args.event.is_some() {
-                        Content::Event
                     }
                     // in other case just use latest stored state
                     else {
@@ -131,14 +123,13 @@ impl From<FromAppArgs> for App {
             current_value_pause: args.pause.unwrap_or(stg.current_value_pause),
             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.inital_value_countdown),
+            current_value_countdown: args.countdown.unwrap_or(stg.current_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,
-            event: args.event.unwrap_or(stg.event),
             app_tx,
             #[cfg(feature = "sound")]
             sound_path: args.sound,
@@ -149,6 +140,13 @@ impl From<FromAppArgs> for App {
     }
 }
 
+fn get_app_time() -> AppTime {
+    match OffsetDateTime::now_local() {
+        Ok(t) => AppTime::Local(t),
+        Err(_) => AppTime::Utc(OffsetDateTime::now_utc()),
+    }
+}
+
 impl App {
     pub fn new(args: AppArgs) -> Self {
         let AppArgs {
@@ -167,14 +165,13 @@ impl App {
             with_decis,
             pomodoro_mode,
             pomodoro_round,
-            event,
             notification,
             blink,
             sound_path,
             app_tx,
             footer_toggle_app_time,
         } = args;
-        let app_time = AppTime::new();
+        let app_time = get_app_time();
 
         Self {
             mode: Mode::Running,
@@ -218,12 +215,6 @@ impl App {
                 app_time,
                 app_time_format,
             }),
-            event: EventState::new(EventStateArgs {
-                app_time,
-                event,
-                with_decis,
-                app_tx: app_tx.clone(),
-            }),
             footer: FooterState::new(
                 show_menu,
                 if footer_toggle_app_time == Toggle::On {
@@ -232,7 +223,6 @@ impl App {
                     None
                 },
             ),
-            cursor_position: None,
         }
     }
 
@@ -246,19 +236,10 @@ impl App {
             debug!("Received key {:?}", key.code);
             match key.code {
                 KeyCode::Char('q') => app.mode = Mode::Quit,
-                KeyCode::Char('1') | KeyCode::Char('c') /* TODO: deprecated, remove it in next version */ => app.content = Content::Countdown,
-                KeyCode::Char('2') | KeyCode::Char('t') /* TODO: deprecated, remove it in next version */ => app.content = Content::Timer,
-                KeyCode::Char('3') | KeyCode::Char('p') /* TODO: deprecated, remove it in next version */ => app.content = Content::Pomodoro,
-                KeyCode::Char('4') => app.content = Content::Event,
-                // toogle app time format
-                KeyCode::Char('0') | KeyCode::Char('l') /* TODO: deprecated, remove it in next version */ => app.content = Content::LocalTime,
-                // switch `screens`
-                KeyCode::Right => {
-                    app.content = app.content.next();
-                }
-                KeyCode::Left => {
-                    app.content = app.content.prev();
-                }
+                KeyCode::Char('c') => app.content = Content::Countdown,
+                KeyCode::Char('t') => app.content = Content::Timer,
+                KeyCode::Char('p') => app.content = Content::Pomodoro,
+                KeyCode::Char('l') => app.content = Content::LocalTime,
                 // toogle app time format
                 KeyCode::Char(':') => {
                     if app.content == Content::LocalTime {
@@ -302,7 +283,6 @@ impl App {
                     app.timer.set_with_decis(app.with_decis);
                     app.countdown.set_with_decis(app.with_decis);
                     app.pomodoro.set_with_decis(app.with_decis);
-                    app.event.set_with_decis(app.with_decis);
                 }
                 KeyCode::Up => app.footer.set_show_menu(true),
                 KeyCode::Down => app.footer.set_show_menu(false),
@@ -312,10 +292,9 @@ impl App {
         // Closure to handle `TuiEvent`'s
         let mut handle_tui_events = |app: &mut Self, event: events::TuiEvent| -> Result<()> {
             if matches!(event, events::TuiEvent::Tick) {
-                app.app_time = AppTime::new();
+                app.app_time = get_app_time();
                 app.countdown.set_app_time(app.app_time);
                 app.local_time.set_app_time(app.app_time);
-                app.event.set_app_time(app.app_time);
             }
 
             // Pipe events into subviews and handle only 'unhandled' events afterwards
@@ -323,17 +302,13 @@ impl App {
                 Content::Countdown => app.countdown.update(event.clone()),
                 Content::Timer => app.timer.update(event.clone()),
                 Content::Pomodoro => app.pomodoro.update(event.clone()),
-                Content::Event => app.event.update(event.clone()),
                 Content::LocalTime => app.local_time.update(event.clone()),
             } {
                 match unhandled {
-                    events::TuiEvent::Render
-                    | events::TuiEvent::Crossterm(crossterm::event::Event::Resize(_, _)) => {
+                    events::TuiEvent::Render | events::TuiEvent::Resize => {
                         app.draw(terminal)?;
                     }
-                    events::TuiEvent::Crossterm(CrosstermEvent::Key(key)) => {
-                        handle_key_event(app, key)
-                    }
+                    events::TuiEvent::Key(key) => handle_key_event(app, key),
                     _ => {}
                 }
             }
@@ -373,9 +348,6 @@ impl App {
                         );
                     }
                 }
-                events::AppEvent::SetCursor(position) => {
-                    app.cursor_position = position;
-                }
             }
             Ok(())
         };
@@ -421,13 +393,6 @@ impl App {
                     AppEditMode::None
                 }
             }
-            Content::Event => {
-                if self.event.is_edit_mode() {
-                    AppEditMode::Event
-                } else {
-                    AppEditMode::None
-                }
-            }
             Content::LocalTime => AppEditMode::None,
         }
     }
@@ -437,8 +402,6 @@ impl App {
             Content::Countdown => self.countdown.is_running(),
             Content::Timer => self.timer.get_clock().is_running(),
             Content::Pomodoro => self.pomodoro.get_clock().is_running(),
-            // Event clock runs forever
-            Content::Event => true,
             // `LocalTime` does not use a `Clock`
             Content::LocalTime => false,
         }
@@ -449,7 +412,6 @@ impl App {
             Content::Countdown => Some(self.countdown.get_clock().get_percentage_done()),
             Content::Timer => None,
             Content::Pomodoro => Some(self.pomodoro.get_clock().get_percentage_done()),
-            Content::Event => Some(self.event.get_percentage_done()),
             Content::LocalTime => None,
         }
     }
@@ -457,11 +419,6 @@ impl App {
     fn draw(&mut self, terminal: &mut Terminal) -> Result<()> {
         terminal.draw(|frame| {
             frame.render_stateful_widget(AppWidget, frame.area(), self);
-
-            // Set cursor position if requested
-            if let Some(position) = self.cursor_position {
-                frame.set_cursor_position(position);
-            }
         })?;
         Ok(())
     }
@@ -491,7 +448,6 @@ impl App {
             ),
             elapsed_value_countdown: Duration::from(*self.countdown.get_elapsed_value()),
             current_value_timer: Duration::from(*self.timer.get_clock().get_current_value()),
-            event: self.event.get_event(),
             footer_app_time: self.footer.app_time_format().is_some().into(),
         }
     }
@@ -519,11 +475,6 @@ impl AppWidget {
                 blink: state.blink == Toggle::On,
             }
             .render(area, buf, &mut state.pomodoro),
-            Content::Event => EventWidget {
-                style: state.style,
-                blink: state.blink == Toggle::On,
-            }
-            .render(area, buf, &mut state.event),
             Content::LocalTime => {
                 LocalTimeWidget { style: state.style }.render(area, buf, &mut state.local_time);
             }

src/args.rs

@@ -1,7 +1,6 @@
 use crate::{
     common::{Content, Style, Toggle},
     duration,
-    event::{Event, parse_event},
 };
 #[cfg(feature = "sound")]
 use crate::{sound, sound::SoundError};
@@ -14,29 +13,21 @@ pub const LOG_DIRECTORY_DEFAULT_MISSING_VALUE: &str = " "; // empty string
 #[derive(Parser)]
 #[command(version)]
 pub struct Args {
-    #[arg(long, short, value_parser = duration::parse_long_duration,
-        help = "Countdown time to start from. Formats: 'Yy Dd hh:mm:ss', 'Dd hh:mm:ss', 'Yy mm:ss', 'Dd mm:ss', 'Yy ss', 'Dd ss', 'hh:mm:ss', 'mm:ss', 'ss'. Examples: '1y 5d 10:30:00', '2d 4:00', '1d 10', '5:03'."
+    #[arg(long, short, value_parser = duration::parse_duration,
+        help = "Countdown time to start from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
     )]
     pub countdown: Option<Duration>,
 
     #[arg(long, short, value_parser = duration::parse_duration,
-        help = "Work time to count down from. Formats: 'ss', 'mm:ss', 'hh:mm:ss'"
+        help = "Work time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
     )]
     pub work: Option<Duration>,
 
     #[arg(long, short, value_parser = duration::parse_duration,
-        help = "Pause time to count down from. Formats: 'ss', 'mm:ss', 'hh:mm:ss'"
+        help = "Pause time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
     )]
     pub pause: Option<Duration>,
 
-    #[arg(
-        long,
-        short = 'e',
-        value_parser = parse_event,
-        help = "Event date time and title (optional). Format: 'YYYY-MM-DD HH:MM:SS' or 'time=YYYY-MM-DD HH:MM:SS[,title=...]'. Examples: '2025-10-10 14:30:00' or 'time=2025-10-10 14:30:00,title=My Event'."
-    )]
-    pub event: Option<Event>,
-
     #[arg(long, short = 'd', help = "Show deciseconds.")]
     pub decis: bool,
 
@@ -46,10 +37,10 @@ pub struct Args {
     #[arg(long, short = 's', value_enum, help = "Style to display time with.")]
     pub style: Option<Style>,
 
-    #[arg(long, value_enum, help = "Open menu.")]
+    #[arg(long, value_enum, help = "Open the menu.")]
     pub menu: bool,
 
-    #[arg(long, short = 'r', help = "Reset stored values to defaults.")]
+    #[arg(long, short = 'r', help = "Reset stored values to default values.")]
     pub reset: bool,
 
     #[arg(
@@ -85,7 +76,7 @@ pub struct Args {
         // this value will be checked later in `main`
         // to use another (default) log directory instead
         default_missing_value=LOG_DIRECTORY_DEFAULT_MISSING_VALUE,
-        help = "Directory for log file. If not set, standard application log directory is used (check README for details).",
+        help = "Directory to store log file. If not set, standard application log directory is used (check README for details).",
         value_hint = clap::ValueHint::DirPath,
     )]
     pub log: Option<PathBuf>,

src/common.rs

@@ -15,39 +15,14 @@ pub enum Content {
     Timer,
     #[value(name = "pomodoro", alias = "p")]
     Pomodoro,
-    #[value(name = "event", alias = "e")]
-    Event,
     #[value(name = "localtime", alias = "l")]
     LocalTime,
 }
 
-impl Content {
-    pub fn next(&self) -> Self {
-        match self {
-            Content::Countdown => Content::Timer,
-            Content::Timer => Content::Pomodoro,
-            Content::Pomodoro => Content::Event,
-            Content::Event => Content::LocalTime,
-            Content::LocalTime => Content::Countdown,
-        }
-    }
-
-    pub fn prev(&self) -> Self {
-        match self {
-            Content::Countdown => Content::LocalTime,
-            Content::Timer => Content::Countdown,
-            Content::Pomodoro => Content::Timer,
-            Content::Event => Content::Pomodoro,
-            Content::LocalTime => Content::Event,
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub enum ClockTypeId {
     Countdown,
     Timer,
-    Event,
 }
 
 #[derive(Debug, Copy, Clone, ValueEnum, Default, Serialize, Deserialize)]
@@ -143,14 +118,6 @@ impl From<AppTime> for OffsetDateTime {
 }
 
 impl AppTime {
-    #[allow(clippy::new_without_default)]
-    pub fn new() -> Self {
-        match OffsetDateTime::now_local() {
-            Ok(t) => AppTime::Local(t),
-            Err(_) => AppTime::Utc(OffsetDateTime::now_utc()),
-        }
-    }
-
     pub fn format(&self, app_format: &AppTimeFormat) -> String {
         let parse_str = match app_format {
             AppTimeFormat::HhMmSs => "[hour]:[minute]:[second]",
@@ -168,17 +135,6 @@ impl AppTime {
             .unwrap_or_else(|e| e.to_string())
     }
 
-    pub fn format_date(&self) -> String {
-        format_description::parse("[year]-[month]-[day]")
-            .map_err(|_| "parse error")
-            .and_then(|fd| {
-                OffsetDateTime::from(*self)
-                    .format(&fd)
-                    .map_err(|_| "format error")
-            })
-            .unwrap_or_else(|e| e.to_string())
-    }
-
     pub fn get_period(&self) -> String {
         format_description::parse("[period]")
             .map_err(|_| "parse error")
@@ -209,7 +165,6 @@ pub enum AppEditMode {
     None,
     Clock,
     Time,
-    Event,
 }
 
 #[derive(Debug, Clone, Copy, ValueEnum, PartialEq, Eq, Default, Serialize, Deserialize)]
@@ -277,48 +232,4 @@ mod tests {
             "local"
         );
     }
-
-    #[test]
-    fn test_content_next() {
-        let start = Content::Countdown;
-        let mut current = start;
-
-        // Cycle through: Countdown -> Timer -> Pomodoro -> Event -> LocalTime -> Countdown
-        current = current.next();
-        assert_eq!(current, Content::Timer);
-
-        current = current.next();
-        assert_eq!(current, Content::Pomodoro);
-
-        current = current.next();
-        assert_eq!(current, Content::Event);
-
-        current = current.next();
-        assert_eq!(current, Content::LocalTime);
-
-        current = current.next();
-        assert_eq!(current, start, "Should cycle back to start");
-    }
-
-    #[test]
-    fn test_content_prev() {
-        let start = Content::Countdown;
-        let mut current = start;
-
-        // Cycle backwards: Countdown -> LocalTime -> Event -> Pomodoro -> Timer -> Countdown
-        current = current.prev();
-        assert_eq!(current, Content::LocalTime);
-
-        current = current.prev();
-        assert_eq!(current, Content::Event);
-
-        current = current.prev();
-        assert_eq!(current, Content::Pomodoro);
-
-        current = current.prev();
-        assert_eq!(current, Content::Timer);
-
-        current = current.prev();
-        assert_eq!(current, start, "Should cycle back to start");
-    }
 }

src/duration.rs

@@ -2,10 +2,13 @@ use color_eyre::{
     Report,
     eyre::{ensure, eyre},
 };
-use std::cmp::min;
 use std::fmt;
 use std::time::Duration;
-use time::OffsetDateTime;
+
+pub const ONE_DECI_SECOND: Duration = Duration::from_millis(100);
+pub const ONE_SECOND: Duration = Duration::from_secs(1);
+pub const ONE_MINUTE: Duration = Duration::from_secs(SECS_PER_MINUTE);
+pub const ONE_HOUR: Duration = Duration::from_secs(MINS_PER_HOUR * SECS_PER_MINUTE);
 
 // unstable
 // https://doc.rust-lang.org/src/core/time.rs.html#32
@@ -17,219 +20,9 @@ pub const MINS_PER_HOUR: u64 = 60;
 // https://doc.rust-lang.org/src/core/time.rs.html#36
 const HOURS_PER_DAY: u64 = 24;
 
-pub const ONE_DECI_SECOND: Duration = Duration::from_millis(100);
-pub const ONE_SECOND: Duration = Duration::from_secs(1);
-pub const ONE_MINUTE: Duration = Duration::from_secs(SECS_PER_MINUTE);
-pub const ONE_HOUR: Duration = Duration::from_secs(MINS_PER_HOUR * SECS_PER_MINUTE);
-pub const ONE_DAY: Duration = Duration::from_secs(HOURS_PER_DAY * MINS_PER_HOUR * SECS_PER_MINUTE);
-pub const ONE_YEAR: Duration =
-    Duration::from_secs(DAYS_PER_YEAR * HOURS_PER_DAY * MINS_PER_HOUR * SECS_PER_MINUTE);
-
-// Days per year
-// "There are 365 days in a year in a common year of the Gregorian calendar and 366 days in a leap year.
-// Leap years occur every four years. The average number of days in a year is 365.2425 days."
-// ^ https://www.math.net/days-in-a-year
-const DAYS_PER_YEAR: u64 = 365; // ignore leap year of 366 days
-
-// max. 9999y 364d 23:59:59.9 (10k years - 1 decisecond)
-pub const MAX_DURATION: Duration = ONE_YEAR
-    .saturating_mul(10000)
-    .saturating_sub(ONE_DECI_SECOND);
-
-/// Trait for duration types that can be displayed in clock widgets.
-///
-/// This trait abstracts over different duration calculation strategies:
-/// - `DurationEx`: Uses fixed 365-day years (fast, simple)
-/// - `CalendarDuration`: Uses actual calendar dates (accounts for leap years)
-pub trait ClockDuration {
-    /// Total years
-    fn years(&self) -> u64;
-
-    /// Total days
-    fn days(&self) -> u64;
-
-    /// Days within the current year (0-364 or 0-365 for leap years)
-    fn days_mod(&self) -> u64;
-
-    /// Total hours
-    fn hours(&self) -> u64;
-
-    /// Hours within the current day (0-23)
-    fn hours_mod(&self) -> u64;
-
-    /// Hours as 12-hour clock (1-12)
-    fn hours_mod_12(&self) -> u64;
-
-    /// Total minutes
-    fn minutes(&self) -> u64;
-
-    /// Minutes within the current hour (0-59)
-    fn minutes_mod(&self) -> u64;
-
-    /// Total seconds
-    fn seconds(&self) -> u64;
-
-    /// Seconds within the current minute (0-59)
-    fn seconds_mod(&self) -> u64;
-
-    /// Deciseconds (tenths of a second, 0-9)
-    fn decis(&self) -> u64;
-
-    /// Total milliseconds
-    fn millis(&self) -> u128;
-}
-
-/// Calendar-aware duration that accounts for leap years.
-///
-/// Unlike `DurationEx` which uses fixed 365-day years, this calculates
-/// years and days based on actual calendar dates, properly handling leap years.
-///
-/// All calculations are performed on-demand from the stored dates.
-#[derive(Debug, Clone)]
-pub struct CalendarDuration {
-    earlier: OffsetDateTime,
-    later: OffsetDateTime,
-    direction: CalendarDurationDirection,
-}
-
-#[derive(PartialEq, Debug, Clone, Copy)]
-pub enum CalendarDurationDirection {
-    Since,
-    Until,
-}
-
-impl CalendarDuration {
-    /// Create a new CalendarDuration by given two `OffsetDateTime`.
-    ///
-    /// The order of arguments matters:
-    /// First: `start_time` - `OffsetDateTime` to start from
-    /// Second: `end_time` - `OffsetDateTime` for expected end
-    pub fn from_start_end_times(start_time: OffsetDateTime, end_time: OffsetDateTime) -> Self {
-        // To avoid negative values by calculating differences of `start` and `end` times,
-        // we might switch those values internally by storing it as `earlier` and `later` values
-        // It simplifies all calculations in `ClockDuration` trait later.
-        // And `direction` will still help to still get original `start` and `end` times later.
-        if start_time <= end_time {
-            Self {
-                earlier: start_time,
-                later: end_time,
-                direction: CalendarDurationDirection::Since,
-            }
-        } else {
-            Self {
-                earlier: end_time,
-                later: start_time,
-                direction: CalendarDurationDirection::Until,
-            }
-        }
-    }
-
-    pub fn direction(&self) -> CalendarDurationDirection {
-        self.direction
-    }
-
-    pub fn is_since(&self) -> bool {
-        self.direction == CalendarDurationDirection::Since
-    }
-
-    pub fn start_time(&self) -> &OffsetDateTime {
-        match self.direction {
-            CalendarDurationDirection::Since => &self.earlier,
-            CalendarDurationDirection::Until => &self.later,
-        }
-    }
-
-    pub fn end_time(&self) -> &OffsetDateTime {
-        match self.direction {
-            CalendarDurationDirection::Since => &self.later,
-            CalendarDurationDirection::Until => &self.earlier,
-        }
-    }
-}
-
-impl From<CalendarDuration> for Duration {
-    fn from(cal_duration: CalendarDuration) -> Self {
-        let diff = cal_duration.later - cal_duration.earlier;
-        Duration::from_millis(diff.whole_milliseconds().max(0) as u64)
-    }
-}
-
-impl ClockDuration for CalendarDuration {
-    fn years(&self) -> u64 {
-        let mut years = (self.later.year() - self.earlier.year()) as i64;
-
-        // Check if we've completed a full year by comparing month/day/time
-        let intermediate = self
-            .earlier
-            .replace_year(self.later.year())
-            .unwrap_or(self.earlier);
-
-        if intermediate > self.later {
-            years -= 1;
-        }
-
-        years.max(0) as u64
-    }
-
-    fn days_mod(&self) -> u64 {
-        let year_count = self.years();
-
-        // Calculate intermediate date after adding complete years
-        let target_year = self.earlier.year() + year_count as i32;
-        let intermediate = self
-            .earlier
-            .replace_year(target_year)
-            .unwrap_or(self.earlier);
-
-        let remaining = self.later - intermediate;
-        remaining.whole_days().max(0) as u64
-    }
-
-    fn days(&self) -> u64 {
-        (self.later - self.earlier).whole_days().max(0) as u64
-    }
-
-    fn hours_mod(&self) -> u64 {
-        let total_hours = (self.later - self.earlier).whole_hours();
-        (total_hours % 24).max(0) as u64
-    }
-
-    fn hours(&self) -> u64 {
-        (self.later - self.earlier).whole_hours().max(0) as u64
-    }
-
-    fn hours_mod_12(&self) -> u64 {
-        let hours = self.hours_mod();
-        (hours + 11) % 12 + 1
-    }
-
-    fn minutes_mod(&self) -> u64 {
-        let total_minutes = (self.later - self.earlier).whole_minutes();
-        (total_minutes % 60).max(0) as u64
-    }
-
-    fn minutes(&self) -> u64 {
-        (self.later - self.earlier).whole_minutes().max(0) as u64
-    }
-
-    fn seconds_mod(&self) -> u64 {
-        let total_seconds = (self.later - self.earlier).whole_seconds();
-        (total_seconds % 60).max(0) as u64
-    }
-
-    fn seconds(&self) -> u64 {
-        (self.later - self.earlier).whole_seconds().max(0) as u64
-    }
-
-    fn decis(&self) -> u64 {
-        let total_millis = (self.later - self.earlier).whole_milliseconds();
-        ((total_millis % 1000) / 100).max(0) as u64
-    }
-
-    fn millis(&self) -> u128 {
-        (self.later - self.earlier).whole_milliseconds().max(0) as u128
-    }
-}
+// max. 99:59:59
+pub const MAX_DURATION: Duration =
+    Duration::from_secs(100 * MINS_PER_HOUR * SECS_PER_MINUTE).saturating_sub(ONE_SECOND);
 
 #[derive(Debug, Clone, Copy, PartialOrd)]
 pub struct DurationEx {
@@ -254,60 +47,49 @@ impl From<DurationEx> for Duration {
     }
 }
 
-impl ClockDuration for DurationEx {
-    fn years(&self) -> u64 {
-        self.days() / DAYS_PER_YEAR
+impl DurationEx {
+    pub fn seconds(&self) -> u64 {
+        self.inner.as_secs()
     }
 
-    fn days(&self) -> u64 {
-        self.hours() / HOURS_PER_DAY
+    pub fn seconds_mod(&self) -> u64 {
+        self.seconds() % SECS_PER_MINUTE
     }
 
-    fn days_mod(&self) -> u64 {
-        self.days() % DAYS_PER_YEAR
-    }
-
-    fn hours(&self) -> u64 {
+    pub fn hours(&self) -> u64 {
         self.seconds() / (SECS_PER_MINUTE * MINS_PER_HOUR)
     }
 
-    fn hours_mod(&self) -> u64 {
+    /// Hours as 24-hour clock
+    pub fn hours_mod(&self) -> u64 {
         self.hours() % HOURS_PER_DAY
     }
 
-    fn hours_mod_12(&self) -> u64 {
+    /// Hours as 12-hour clock
+    pub fn hours_mod_12(&self) -> u64 {
         // 0 => 12,
         // 1..=12 => hours,
         // 13..=23 => hours - 12,
         (self.hours_mod() + 11) % 12 + 1
     }
 
-    fn minutes(&self) -> u64 {
+    pub fn minutes(&self) -> u64 {
         self.seconds() / MINS_PER_HOUR
     }
 
-    fn minutes_mod(&self) -> u64 {
+    pub fn minutes_mod(&self) -> u64 {
         self.minutes() % SECS_PER_MINUTE
     }
 
-    fn seconds(&self) -> u64 {
-        self.inner.as_secs()
-    }
-
-    fn seconds_mod(&self) -> u64 {
-        self.seconds() % SECS_PER_MINUTE
-    }
-
-    fn decis(&self) -> u64 {
+    // deciseconds
+    pub fn decis(&self) -> u64 {
         (self.inner.subsec_millis() / 100) as u64
     }
-
-    fn millis(&self) -> u128 {
+    // milliseconds
+    pub fn millis(&self) -> u128 {
         self.inner.as_millis()
     }
-}
 
-impl DurationEx {
     pub fn saturating_add(&self, ex: DurationEx) -> Self {
         let inner = self.inner.saturating_add(ex.inner);
         Self { inner }
@@ -325,27 +107,7 @@ impl DurationEx {
 
 impl fmt::Display for DurationEx {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use ClockDuration as _; // Import trait methods
-        if self.years() >= 1 {
-            write!(
-                f,
-                "{}y {}d {:02}:{:02}:{:02}",
-                self.years(),
-                self.days_mod(),
-                self.hours_mod(),
-                self.minutes_mod(),
-                self.seconds_mod(),
-            )
-        } else if self.hours() >= HOURS_PER_DAY {
-            write!(
-                f,
-                "{}d {:02}:{:02}:{:02}",
-                self.days_mod(),
-                self.hours_mod(),
-                self.minutes_mod(),
-                self.seconds_mod(),
-            )
-        } else if self.hours() >= 10 {
+        if self.hours() >= 10 {
             write!(
                 f,
                 "{:02}:{:02}:{:02}",
@@ -373,159 +135,66 @@ impl fmt::Display for DurationEx {
     }
 }
 
-/// Parse seconds (must be < 60)
-fn parse_seconds(s: &str) -> Result<u8, Report> {
-    let secs = s.parse::<u8>().map_err(|_| eyre!("Invalid seconds"))?;
-    ensure!(secs < 60, "Seconds must be less than 60.");
-    Ok(secs)
-}
-
-/// Parse minutes (must be < 60)
-fn parse_minutes(m: &str) -> Result<u8, Report> {
-    let mins = m.parse::<u8>().map_err(|_| eyre!("Invalid minutes"))?;
-    ensure!(mins < 60, "Minutes must be less than 60.");
-    Ok(mins)
-}
-
-/// Parse hours
-fn parse_hours(h: &str) -> Result<u8, Report> {
-    let hours = h.parse::<u8>().map_err(|_| eyre!("Invalid hours"))?;
-    Ok(hours)
-}
-
 /// Parses  `Duration` from `hh:mm:ss`, `mm:ss` or `ss`
 pub fn parse_duration(arg: &str) -> Result<Duration, Report> {
-    let parts: Vec<&str> = arg.split(':').collect();
+    let parts: Vec<&str> = arg.split(':').rev().collect();
 
-    let (hours, minutes, seconds) = match parts.as_slice() {
-        [ss] => {
-            // Single part: seconds only
-            let s = parse_seconds(ss)?;
-            (0u64, 0u64, s as u64)
-        }
-        [mm, ss] => {
-            // Two parts: MM:SS
-            let m = parse_minutes(mm)?;
-            let s = parse_seconds(ss)?;
-            (0u64, m as u64, s as u64)
-        }
-        [hh, mm, ss] => {
-            // Three parts: HH:MM:SS
-            let h = parse_hours(hh)?;
-            let m = parse_minutes(mm)?;
-            let s = parse_seconds(ss)?;
-            (h as u64, m as u64, s as u64)
-        }
-        _ => {
-            return Err(eyre!(
-                "Invalid time format. Use 'ss', 'mm:ss', or 'hh:mm:ss'"
-            ));
-        }
+    let parse_seconds = |s: &str| -> Result<u64, Report> {
+        let secs = s.parse::<u64>().map_err(|_| eyre!("Invalid seconds"))?;
+        ensure!(secs < 60, "Seconds must be less than 60.");
+        Ok(secs)
     };
 
-    let total_seconds = hours * 3600 + minutes * 60 + seconds;
-    Ok(Duration::from_secs(total_seconds))
-}
+    let parse_minutes = |m: &str| -> Result<u64, Report> {
+        let mins = m.parse::<u64>().map_err(|_| eyre!("Invalid minutes"))?;
+        ensure!(mins < 60, "Minutes must be less than 60.");
+        Ok(mins)
+    };
 
-/// Similar to `parse_duration`, but it parses `years` and `days` in addition
-/// Formats: `Yy Dd`, `Yy` or `Dd` in any combination to other time formats
-/// Examples: `10y 3d 12:10:03`, `2d 10:00`, `101y 33`, `5:30`
-pub fn parse_long_duration(arg: &str) -> Result<Duration, Report> {
-    let arg = arg.trim();
+    let parse_hours = |h: &str| -> Result<u64, Report> {
+        let hours = h.parse::<u64>().map_err(|_| eyre!("Invalid hours"))?;
+        ensure!(hours < 100, "Hours must be less than 100.");
+        Ok(hours)
+    };
 
-    // parts are separated by whitespaces:
-    // 3 parts: years, days, time
-    let parts: Vec<&str> = arg.split_whitespace().collect();
-    ensure!(parts.len() <= 3, "Invalid format. Too many parts.");
-
-    let mut total_duration = Duration::ZERO;
-    let mut time_part: Option<&str> = None;
-
-    for part in parts {
-        // years
-        if let Some(years_str) = part.strip_suffix('y') {
-            let years = years_str
-                .parse::<u64>()
-                .map_err(|_| eyre!("Invalid years value: '{}'", years_str))?;
-            total_duration = total_duration.saturating_add(ONE_YEAR.saturating_mul(years as u32));
-        }
-        // days
-        else if let Some(days_str) = part.strip_suffix('d') {
-            let days = days_str
-                .parse::<u64>()
-                .map_err(|_| eyre!("Invalid days value: '{}'", days_str))?;
-            total_duration = total_duration.saturating_add(ONE_DAY.saturating_mul(days as u32));
-        }
-        // possible time format
-        else {
-            time_part = Some(part);
+    let seconds = match parts.as_slice() {
+        [ss] => parse_seconds(ss)?,
+        [ss, mm] => {
+            let s = parse_seconds(ss)?;
+            let m = parse_minutes(mm)?;
+            m * 60 + s
         }
+        [ss, mm, hh] => {
+            let s = parse_seconds(ss)?;
+            let m = parse_minutes(mm)?;
+            let h = parse_hours(hh)?;
+            h * 60 * 60 + m * 60 + s
         }
+        _ => return Err(eyre!("Invalid time format. Use 'ss', mm:ss, or hh:mm:ss")),
+    };
 
-    // time format
-    if let Some(time) = time_part {
-        let time_duration = parse_duration(time)?;
-        total_duration = total_duration.saturating_add(time_duration);
-    }
-
-    // avoid overflow
-    total_duration = min(MAX_DURATION, total_duration);
-
-    Ok(total_duration)
+    Ok(Duration::from_secs(seconds))
 }
 
 #[cfg(test)]
 mod tests {
 
-    use super::ClockDuration;
     use super::*;
     use std::time::Duration;
 
-    const MINUTE_IN_SECONDS: u64 = ONE_MINUTE.as_secs();
-    const HOUR_IN_SECONDS: u64 = ONE_HOUR.as_secs();
-    const DAY_IN_SECONDS: u64 = ONE_DAY.as_secs();
-    const YEAR_IN_SECONDS: u64 = ONE_YEAR.as_secs();
-
     #[test]
     fn test_fmt() {
-        // 1y Dd hh:mm:ss (single year)
-        let ex: DurationEx =
-            Duration::from_secs(YEAR_IN_SECONDS + 10 * DAY_IN_SECONDS + 36001).into();
-        assert_eq!(format!("{ex}"), "1y 10d 10:00:01");
-        // 5y Dd hh:mm:ss (multiple years)
-        let ex: DurationEx = Duration::from_secs(
-            5 * YEAR_IN_SECONDS + 100 * DAY_IN_SECONDS + 10 * HOUR_IN_SECONDS + 1,
-        )
-        .into();
-        assert_eq!(format!("{ex}"), "5y 100d 10:00:01");
-        // 150y Dd hh:mm:ss (more than 100 years)
-        let ex: DurationEx = Duration::from_secs(
-            150 * YEAR_IN_SECONDS + 200 * DAY_IN_SECONDS + 10 * HOUR_IN_SECONDS + 1,
-        )
-        .into();
-        assert_eq!(format!("{ex}"), "150y 200d 10:00:01");
-        // 366d hh:mm:ss (days more than a year)
-        let ex: DurationEx =
-            Duration::from_secs(366 * DAY_IN_SECONDS + 10 * HOUR_IN_SECONDS + 1).into();
-        assert_eq!(format!("{ex}"), "1y 1d 10:00:01");
-        // 1d hh:mm:ss (single day)
-        let ex: DurationEx = Duration::from_secs(DAY_IN_SECONDS + 10 * HOUR_IN_SECONDS + 1).into();
-        assert_eq!(format!("{ex}"), "1d 10:00:01");
-        // 2d hh:mm:ss (multiple days)
-        let ex: DurationEx =
-            Duration::from_secs(2 * DAY_IN_SECONDS + 10 * HOUR_IN_SECONDS + 1).into();
-        assert_eq!(format!("{ex}"), "2d 10:00:01");
         // hh:mm:ss
-        let ex: DurationEx = Duration::from_secs(10 * HOUR_IN_SECONDS + 1).into();
+        let ex: DurationEx = Duration::from_secs(36001).into();
         assert_eq!(format!("{ex}"), "10:00:01");
         // h:mm:ss
-        let ex: DurationEx = Duration::from_secs(HOUR_IN_SECONDS + 1).into();
+        let ex: DurationEx = Duration::from_secs(3601).into();
         assert_eq!(format!("{ex}"), "1:00:01");
         // mm:ss
-        let ex: DurationEx = Duration::from_secs(MINUTE_IN_SECONDS + 11).into();
+        let ex: DurationEx = Duration::from_secs(71).into();
         assert_eq!(format!("{ex}"), "1:11");
         // m:ss
-        let ex: DurationEx = Duration::from_secs(MINUTE_IN_SECONDS + 1).into();
+        let ex: DurationEx = Duration::from_secs(61).into();
         assert_eq!(format!("{ex}"), "1:01");
         // ss
         let ex: DurationEx = Duration::from_secs(11).into();
@@ -596,257 +265,8 @@ mod tests {
         // errors
         assert!(parse_duration("1:60").is_err()); // invalid seconds
         assert!(parse_duration("60:00").is_err()); // invalid minutes
+        assert!(parse_duration("100:00:00").is_err()); // invalid hours
         assert!(parse_duration("abc").is_err()); // invalid input
         assert!(parse_duration("01:02:03:04").is_err()); // too many parts
     }
-
-    #[test]
-    fn test_parse_long_duration() {
-        // `Yy`
-        assert_eq!(
-            parse_long_duration("10y").unwrap(),
-            Duration::from_secs(10 * YEAR_IN_SECONDS)
-        );
-        assert_eq!(
-            parse_long_duration("101y").unwrap(),
-            Duration::from_secs(101 * YEAR_IN_SECONDS)
-        );
-
-        // `Dd`
-        assert_eq!(
-            parse_long_duration("2d").unwrap(),
-            Duration::from_secs(2 * DAY_IN_SECONDS)
-        );
-
-        // `Yy Dd`
-        assert_eq!(
-            parse_long_duration("10y 3d").unwrap(),
-            Duration::from_secs(10 * YEAR_IN_SECONDS + 3 * DAY_IN_SECONDS)
-        );
-
-        // `Yy Dd hh:mm:ss`
-        assert_eq!(
-            parse_long_duration("10y 3d 12:10:03").unwrap(),
-            Duration::from_secs(
-                10 * YEAR_IN_SECONDS
-                    + 3 * DAY_IN_SECONDS
-                    + 12 * HOUR_IN_SECONDS
-                    + 10 * MINUTE_IN_SECONDS
-                    + 3
-            )
-        );
-
-        // `Dd hh:mm`
-        assert_eq!(
-            parse_long_duration("2d 10:00").unwrap(),
-            Duration::from_secs(2 * DAY_IN_SECONDS + 10 * 60)
-        );
-
-        // `Yy ss`
-        assert_eq!(
-            parse_long_duration("101y 33").unwrap(),
-            Duration::from_secs(101 * YEAR_IN_SECONDS + 33)
-        );
-
-        // time formats (backward compatibility with `parse_duration`)
-        assert_eq!(
-            parse_long_duration("5:30").unwrap(),
-            Duration::from_secs(5 * MINUTE_IN_SECONDS + 30)
-        );
-        assert_eq!(
-            parse_long_duration("01:30:45").unwrap(),
-            Duration::from_secs(HOUR_IN_SECONDS + 30 * MINUTE_IN_SECONDS + 45)
-        );
-        assert_eq!(parse_long_duration("42").unwrap(), Duration::from_secs(42));
-
-        // `Dd ss`
-        assert_eq!(
-            parse_long_duration("5d 30").unwrap(),
-            Duration::from_secs(5 * DAY_IN_SECONDS + 30)
-        );
-
-        // `Yy hh:mm:ss`
-        assert_eq!(
-            parse_long_duration("1y 01:30:00").unwrap(),
-            Duration::from_secs(YEAR_IN_SECONDS + HOUR_IN_SECONDS + 30 * MINUTE_IN_SECONDS)
-        );
-
-        // Whitespace handling
-        assert_eq!(
-            parse_long_duration("  2d   10:00  ").unwrap(),
-            Duration::from_secs(2 * DAY_IN_SECONDS + 10 * MINUTE_IN_SECONDS)
-        );
-
-        // MAX_DURATION clamping
-        assert_eq!(parse_long_duration("10000y").unwrap(), MAX_DURATION);
-        assert_eq!(
-            parse_long_duration("9999y 364d 23:59:59").unwrap(),
-            Duration::from_secs(
-                9999 * YEAR_IN_SECONDS
-                    + 364 * DAY_IN_SECONDS
-                    + 23 * HOUR_IN_SECONDS
-                    + 59 * MINUTE_IN_SECONDS
-                    + 59
-            )
-        );
-
-        // errors
-        assert!(parse_long_duration("10x").is_err()); // invalid unit
-        assert!(parse_long_duration("abc").is_err()); // invalid input
-        assert!(parse_long_duration("10y 60:00").is_err()); // invalid minutes in time part
-        assert!(parse_long_duration("5d 1:60").is_err()); // invalid seconds in time part
-        assert!(parse_long_duration("1y 2d 3d 4:00").is_err()); // too many parts (4 parts)
-        assert!(parse_long_duration("1y 2d 3h 4m 5s").is_err()); // too many parts (5 parts)
-    }
-
-    #[test]
-    fn test_calendar_duration_leap_year() {
-        use time::macros::datetime;
-
-        // 2024 is a leap year (366 days)
-        let start = datetime!(2024-01-01 00:00:00 UTC);
-        let end = datetime!(2025-01-01 00:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 1, "Should be exactly 1 year");
-        assert_eq!(cal_dur.days_mod(), 0, "Should be 0 remaining days");
-        assert_eq!(cal_dur.days(), 366, "2024 has 366 days (leap year)");
-    }
-
-    #[test]
-    fn test_calendar_duration_non_leap_year() {
-        use time::macros::datetime;
-
-        // 2023 is not a leap year (365 days)
-        let start = datetime!(2023-01-01 00:00:00 UTC);
-        let end = datetime!(2024-01-01 00:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 1, "Should be exactly 1 year");
-        assert_eq!(cal_dur.days_mod(), 0, "Should be 0 remaining days");
-        assert_eq!(cal_dur.days(), 365, "2023 has 365 days (non-leap year)");
-    }
-
-    #[test]
-    fn test_calendar_duration_partial_year_with_leap_day() {
-        use time::macros::datetime;
-
-        // Span including Feb 29, 2024
-        let start = datetime!(2024-02-01 00:00:00 UTC);
-        let end = datetime!(2024-03-15 00:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 0, "Should be 0 years");
-        // Feb 2024 has 29 days, so: 29 days (rest of Feb) + 15 days (March) = 44 days
-        assert_eq!(
-            cal_dur.days(),
-            43,
-            "Should be 43 days (29 in Feb + 14 partial March)"
-        );
-    }
-
-    #[test]
-    fn test_calendar_duration_partial_year_without_leap_day() {
-        use time::macros::datetime;
-
-        // Same dates but in 2023 (non-leap year)
-        let start = datetime!(2023-02-01 00:00:00 UTC);
-        let end = datetime!(2023-03-15 00:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 0, "Should be 0 years");
-        // Feb 2023 has 28 days, so: 28 days (rest of Feb) + 15 days (March) = 43 days
-        assert_eq!(
-            cal_dur.days(),
-            42,
-            "Should be 42 days (28 in Feb + 14 partial March)"
-        );
-    }
-
-    #[test]
-    fn test_calendar_duration_multiple_years_spanning_leap_years() {
-        use time::macros::datetime;
-
-        // From 2023 (non-leap) through 2024 (leap) to 2025
-        let start = datetime!(2023-03-01 10:00:00 UTC);
-        let end = datetime!(2025-03-01 10:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 2, "Should be exactly 2 years");
-        assert_eq!(cal_dur.days_mod(), 0, "Should be 0 remaining days");
-        // Total days: 365 (2023 partial + 2024 partial) + 366 (full 2024 year conceptually included)
-        // Actually: From 2023-03-01 to 2025-03-01 = 365 + 366 = 731 days
-        assert_eq!(cal_dur.days(), 731, "Should be 731 total days");
-    }
-
-    #[test]
-    fn test_calendar_duration_year_boundary() {
-        use time::macros::datetime;
-
-        // Test incomplete year - just before year boundary
-        let start = datetime!(2024-01-01 00:00:00 UTC);
-        let end = datetime!(2024-12-31 23:59:59 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 0, "Should be 0 years (not complete)");
-        assert_eq!(cal_dur.days(), 365, "Should be 365 days");
-    }
-
-    #[test]
-    fn test_calendar_duration_hours_minutes_seconds() {
-        use time::macros::datetime;
-
-        let start = datetime!(2024-01-01 10:30:45 UTC);
-        let end = datetime!(2024-01-02 14:25:50 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(cal_dur.years(), 0);
-        assert_eq!(cal_dur.days(), 1);
-        assert_eq!(cal_dur.hours_mod(), 3, "Should be 3 hours past midnight");
-        assert_eq!(cal_dur.minutes_mod(), 55, "Should be 55 minutes");
-        assert_eq!(cal_dur.seconds_mod(), 5, "Should be 5 seconds");
-    }
-
-    #[test]
-    fn test_calendar_duration_reversed_dates() {
-        use time::macros::datetime;
-
-        // CalendarDuration::between should handle reversed order
-        let later = datetime!(2025-01-01 00:00:00 UTC);
-        let earlier = datetime!(2024-01-01 00:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(later, earlier);
-
-        assert_eq!(cal_dur.years(), 1, "Should still calculate 1 year");
-        assert_eq!(cal_dur.days(), 366, "Should still be 366 days");
-    }
-
-    #[test]
-    fn test_calendar_duration_same_date() {
-        use time::macros::datetime;
-
-        let date = datetime!(2024-06-15 12:00:00 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(date, date);
-
-        assert_eq!(cal_dur.years(), 0);
-        assert_eq!(cal_dur.days(), 0);
-        assert_eq!(cal_dur.hours(), 0);
-        assert_eq!(cal_dur.minutes(), 0);
-        assert_eq!(cal_dur.seconds(), 0);
-    }
-
-    #[test]
-    fn test_calendar_duration_deciseconds() {
-        use time::macros::datetime;
-
-        let start = datetime!(2024-01-01 00:00:00.000 UTC);
-        let end = datetime!(2024-01-01 00:00:00.750 UTC);
-        let cal_dur = CalendarDuration::from_start_end_times(start, end);
-
-        assert_eq!(
-            cal_dur.decis(),
-            7,
-            "Should be 7 deciseconds (750ms = 7.5 decis, truncated to 7)"
-        );
-        assert_eq!(cal_dur.millis(), 750, "Should be 750 milliseconds");
-    }
 }

src/event.rs

@@ -1,169 +0,0 @@
-use serde::{Deserialize, Serialize};
-use time::macros::{datetime, format_description};
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct Event {
-    pub date_time: time::PrimitiveDateTime,
-    pub title: Option<String>,
-}
-
-impl Default for Event {
-    fn default() -> Self {
-        Self {
-            // Mario Bros. "...entered mass production in Japan on June 21" 1983
-            // https://en.wikipedia.org/wiki/Mario_Bros.#Release
-            date_time: datetime!(1983-06-21 00:00),
-            title: Some("Release date of Mario Bros. in Japan".into()),
-        }
-    }
-}
-
-/// Parses an `Event`
-/// Supports two formats:
-/// (1) "YYYY-MM-DD HH:MM:SS"
-/// (2) "time=YYYY-MM-DD HH:MM:SS,title=my event"
-pub fn parse_event(s: &str) -> Result<Event, String> {
-    let s = s.trim();
-
-    // check + parse (2)
-    if s.contains('=') {
-        parse_event_key_value(s)
-    } else {
-        // parse (1)
-        parse_event_date_time(s)
-    }
-}
-
-/// Parses an `Event` based on "YYYY-MM-DD HH:MM:SS" format
-fn parse_event_date_time(s: &str) -> Result<Event, String> {
-    let time = time::PrimitiveDateTime::parse(
-        s,
-        format_description!("[year]-[month]-[day] [hour]:[minute]:[second]"),
-    )
-    .map_err(|e| {
-        format!(
-            "Failed to parse event date_time '{}': {}. Expected format: 'YYYY-MM-DD HH:MM:SS'",
-            s, e
-        )
-    })?;
-
-    Ok(Event {
-        date_time: time,
-        title: None,
-    })
-}
-
-/// Parses an `Event` defined by a `key=value` pair.
-/// Valid keys: `time` and `title`.
-/// Format: "time=YYYY-MM-DD HH:MM:SS,title=my event"
-fn parse_event_key_value(s: &str) -> Result<Event, String> {
-    let mut time_str = None;
-    let mut title_str = None;
-
-    // k/v pairs are splitted by commas
-    for part in s.split(',') {
-        let part = part.trim();
-        if let Some((key, value)) = part.split_once('=') {
-            match key.trim() {
-                "time" => time_str = Some(value.trim()),
-                "title" => title_str = Some(value.trim()),
-                unknown => {
-                    return Err(format!(
-                        "Unknown key '{}'. Valid keys: 'time', 'title'",
-                        unknown
-                    ));
-                }
-            }
-        } else {
-            return Err(format!(
-                "Invalid key=value pair: '{}'. Expected format: 'key=value'",
-                part
-            ));
-        }
-    }
-
-    let time_str = time_str.ok_or(
-        "Missing required 'time' field. Expected format: 'time=YYYY-MM-DD HH:MM:SS[,title=...]'",
-    )?;
-    let time = time::PrimitiveDateTime::parse(
-        time_str,
-        format_description!("[year]-[month]-[day] [hour]:[minute]:[second]"),
-    )
-    .map_err(|e| {
-        format!(
-            "Failed to parse event time '{}': {}. Expected format: 'YYYY-MM-DD HH:MM:SS'",
-            time_str, e
-        )
-    })?;
-
-    let title = title_str.filter(|t| !t.is_empty()).map(|t| t.to_string());
-
-    Ok(Event {
-        date_time: time,
-        title,
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use time::macros::datetime;
-
-    #[test]
-    fn test_parse_event() {
-        // Simple format: time only
-        let result = parse_event("2024-01-01 14:30:00").unwrap();
-        assert_eq!(result.date_time, datetime!(2024-01-01 14:30:00));
-        assert_eq!(result.title, None);
-
-        // Simple format: with leading/trailing whitespace (outer trim works)
-        let result = parse_event("  2025-12-25 12:30:00  ").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-12-25 12:30:00));
-        assert_eq!(result.title, None);
-
-        // Key=value format: time only
-        let result = parse_event("time=2025-10-10 14:30:00").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 14:30:00));
-        assert_eq!(result.title, None);
-
-        // Key=value format: time and title
-        let result = parse_event("time=2025-10-10 14:30:00,title=Team Meeting").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 14:30:00));
-        assert_eq!(result.title, Some("Team Meeting".to_string()));
-
-        // Key=value format: order independent
-        let result = parse_event("title=Stand-up,time=2025-10-10 09:00:00").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 09:00:00));
-        assert_eq!(result.title, Some("Stand-up".to_string()));
-
-        // Key=value format: title with spaces and special chars
-        let result =
-            parse_event("time=2025-10-10 14:30:00,title=Sprint Planning: Q1 Review").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 14:30:00));
-        assert_eq!(result.title, Some("Sprint Planning: Q1 Review".to_string()));
-
-        // Key=value format: empty title treated as None
-        let result = parse_event("time=2025-10-10 14:30:00,title=").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 14:30:00));
-        assert_eq!(result.title, None);
-
-        // Key=value format: whitespace handling
-        let result = parse_event(" time = 2025-10-10 14:30:00 , title = My Event ").unwrap();
-        assert_eq!(result.date_time, datetime!(2025-10-10 14:30:00));
-        assert_eq!(result.title, Some("My Event".to_string()));
-
-        // Error cases: invalid time format
-        assert!(parse_event("2025-13-01 00:00:00").is_err());
-        assert!(parse_event("invalid").is_err());
-        assert!(parse_event("2025/10/10 14:30:00").is_err());
-
-        // Error cases: missing time in key=value format
-        assert!(parse_event("title=My Event").is_err());
-
-        // Error cases: unknown key
-        assert!(parse_event("time=2025-10-10 14:30:00,foo=bar").is_err());
-
-        // Error cases: malformed key=value pair
-        assert!(parse_event("time=2025-10-10 14:30:00,notapair").is_err());
-    }
-}

src/events.rs

@@ -1,6 +1,5 @@
-use crossterm::event::{Event as CrosstermEvent, EventStream, KeyEventKind};
+use crossterm::event::{Event as CrosstermEvent, EventStream, KeyEvent, KeyEventKind};
 use futures::{Stream, StreamExt};
-use ratatui::layout::Position;
 use std::{pin::Pin, time::Duration};
 use tokio::sync::mpsc;
 use tokio::time::interval;
@@ -21,13 +20,13 @@ pub enum TuiEvent {
     Error,
     Tick,
     Render,
-    Crossterm(CrosstermEvent),
+    Key(KeyEvent),
+    Resize,
 }
 
 #[derive(Clone, Debug)]
 pub enum AppEvent {
     ClockDone(ClockTypeId, String),
-    SetCursor(Option<Position>),
 }
 
 pub type AppEventTx = mpsc::UnboundedSender<AppEvent>;
@@ -90,13 +89,14 @@ fn crossterm_stream() -> Pin<Box<dyn Stream<Item = TuiEvent>>> {
         EventStream::new()
             .fuse()
             // we are not interested in all events
-            .filter_map(|result| async move {
-                match result {
-                    // filter `KeyEventKind::Press` out to ignore all the other `CrosstermEvent::Key` events
-                    Ok(CrosstermEvent::Key(key)) => (key.kind == KeyEventKind::Press)
-                        .then_some(TuiEvent::Crossterm(CrosstermEvent::Key(key))),
-                    Ok(other) => Some(TuiEvent::Crossterm(other)),
+            .filter_map(|event| async move {
+                match event {
+                    Ok(CrosstermEvent::Key(key)) if key.kind == KeyEventKind::Press => {
+                        Some(TuiEvent::Key(key))
+                    }
+                    Ok(CrosstermEvent::Resize(_, _)) => Some(TuiEvent::Resize),
                     Err(_) => Some(TuiEvent::Error),
+                    _ => None,
                 }
             }),
     )

src/main.rs

@@ -2,7 +2,6 @@ mod app;
 mod common;
 mod config;
 mod constants;
-mod event;
 mod events;
 mod logging;
 

src/storage.rs

@@ -1,6 +1,5 @@
 use crate::{
     common::{AppTimeFormat, Content, Style, Toggle},
-    event::Event,
     widgets::pomodoro::Mode as PomodoroMode,
 };
 use color_eyre::eyre::Result;
@@ -45,8 +44,6 @@ pub struct AppStorage {
     pub elapsed_value_countdown: Duration,
     // timer
     pub current_value_timer: Duration,
-    // event
-    pub event: Event,
     // footer
     pub footer_app_time: Toggle,
 }
@@ -78,8 +75,6 @@ impl Default for AppStorage {
             elapsed_value_countdown: Duration::ZERO,
             // timer
             current_value_timer: Duration::ZERO,
-            // event
-            event: Event::default(),
             // footer
             footer_app_time: Toggle::Off,
         }

src/widgets.rs

@@ -6,7 +6,6 @@ pub mod clock_elements_test;
 pub mod clock_test;
 pub mod countdown;
 pub mod edit_time;
-pub mod event;
 pub mod footer;
 pub mod header;
 pub mod local_time;

src/widgets/clock_elements.rs

@@ -7,13 +7,9 @@ use ratatui::{
 pub const DIGIT_SIZE: usize = 5;
 pub const DIGIT_WIDTH: u16 = DIGIT_SIZE as u16;
 pub const DIGIT_HEIGHT: u16 = DIGIT_SIZE as u16 + 1 /* border height */;
-pub const TWO_DIGITS_WIDTH: u16 = DIGIT_WIDTH + DIGIT_SPACE_WIDTH + DIGIT_WIDTH; // digit-space-digit
-pub const THREE_DIGITS_WIDTH: u16 = TWO_DIGITS_WIDTH + DIGIT_SPACE_WIDTH + DIGIT_WIDTH; // digit-space-digit-space-digit
-pub const FOUR_DIGITS_WIDTH: u16 = THREE_DIGITS_WIDTH + DIGIT_SPACE_WIDTH + DIGIT_WIDTH; // digit-space-digit-space-digit-space-digit
 pub const COLON_WIDTH: u16 = 4; // incl. padding left + padding right
 pub const DOT_WIDTH: u16 = 4; // incl. padding left + padding right
 pub const DIGIT_SPACE_WIDTH: u16 = 1; // space between digits
-pub const DIGIT_LABEL_WIDTH: u16 = 3; // label (single char) incl. padding left + padding right
 
 #[rustfmt::skip]
 const DIGIT_0: [u8; DIGIT_SIZE * DIGIT_SIZE] = [

src/widgets/clock_test.rs

@@ -1,9 +1,6 @@
 use crate::{
     common::ClockTypeId,
-    duration::{
-        DurationEx, MAX_DURATION, ONE_DAY, ONE_DECI_SECOND, ONE_HOUR, ONE_MINUTE, ONE_SECOND,
-        ONE_YEAR,
-    },
+    duration::{ONE_DECI_SECOND, ONE_HOUR, ONE_MINUTE, ONE_SECOND},
     widgets::clock::*,
 };
 use std::time::Duration;
@@ -26,284 +23,6 @@ fn test_type_id() {
     assert!(matches!(c.get_type_id(), ClockTypeId::Countdown));
 }
 
-#[test]
-fn test_get_format_seconds() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_SECOND * 5,
-        current_value: ONE_SECOND * 5,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-    // S
-    assert_eq!(c.get_format(), &Format::S);
-    // Ss
-    c.set_current_value(Duration::from_secs(15).into());
-    assert_eq!(c.get_format(), &Format::Ss);
-}
-
-#[test]
-fn test_get_format_minutes() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_MINUTE,
-        current_value: ONE_MINUTE,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-    // MSs
-    assert_eq!(c.get_format(), &Format::MSs);
-    // MmSs
-    c.set_current_value((ONE_MINUTE * 11).into()); // 10+ minutes
-    assert_eq!(c.get_format(), &Format::MmSs);
-}
-
-#[test]
-fn test_get_format_hours() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_HOUR,
-        current_value: ONE_HOUR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-    // HMmSS
-    assert_eq!(c.get_format(), &Format::HMmSs);
-    // HhMmSs
-    c.set_current_value((10 * ONE_HOUR).into());
-    assert_eq!(c.get_format(), &Format::HhMmSs);
-}
-
-#[test]
-fn test_format_by_duration_boundaries() {
-    // S
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_SECOND * 9).into()),
-        Format::S
-    );
-    // Ss
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_SECOND).into()),
-        Format::Ss
-    );
-    // Ss
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(59 * ONE_SECOND).into()),
-        Format::Ss
-    );
-    // MSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&ONE_MINUTE.into()),
-        Format::MSs
-    );
-    // HhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_DAY.saturating_sub(ONE_SECOND)).into()),
-        Format::HhMmSs
-    );
-    // DHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&ONE_DAY.into()),
-        Format::DHhMmSs
-    );
-    // DHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&((10 * ONE_DAY).saturating_sub(ONE_SECOND)).into()),
-        Format::DHhMmSs
-    );
-    // DdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_DAY).into()),
-        Format::DdHhMmSs
-    );
-    // DdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&((100 * ONE_DAY).saturating_sub(ONE_SECOND)).into()),
-        Format::DdHhMmSs
-    );
-    // DddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_DAY).into()),
-        Format::DddHhMmSs
-    );
-    // DddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_YEAR.saturating_sub(ONE_SECOND).into())),
-        Format::DddHhMmSs
-    );
-    // YDHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&ONE_YEAR.into()),
-        Format::YDHhMmSs
-    );
-    // YDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(
-            &(ONE_YEAR + (100 * ONE_DAY).saturating_sub(ONE_SECOND)).into()
-        ),
-        Format::YDdHhMmSs
-    );
-    // YDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YDddHhMmSs
-    );
-    // YDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&((10 * ONE_YEAR).saturating_sub(ONE_SECOND)).into()),
-        Format::YDddHhMmSs
-    );
-    // YyDHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR).into()),
-        Format::YyDHhMmSs
-    );
-    // YyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YyDdHhMmSs
-    );
-    // YyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(
-            &(10 * ONE_YEAR + (100 * ONE_DAY).saturating_sub(ONE_SECOND)).into()
-        ),
-        Format::YyDdHhMmSs
-    );
-    // YyDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YyDddHhMmSs
-    );
-    // YyDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&((100 * ONE_YEAR).saturating_sub(ONE_SECOND)).into()),
-        Format::YyDddHhMmSs
-    );
-    // YyyDHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR).into()),
-        Format::YyyDHhMmSs
-    );
-    // YyyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YyyDdHhMmSs
-    );
-    // YyyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(
-            &(100 * ONE_YEAR + (100 * ONE_DAY).saturating_sub(ONE_SECOND)).into()
-        ),
-        Format::YyyDdHhMmSs
-    );
-    // YyyDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YyyDddHhMmSs
-    );
-
-    // YyyyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(1000 * ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YyyyDdHhMmSs
-    );
-    // YyyyDdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(
-            &(1000 * ONE_YEAR + (100 * ONE_DAY).saturating_sub(ONE_SECOND)).into()
-        ),
-        Format::YyyyDdHhMmSs
-    );
-    // YyyyDddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(1000 * ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YyyyDddHhMmSs
-    );
-}
-
-#[test]
-fn test_format_by_duration_days() {
-    // DHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&ONE_DAY.into()),
-        Format::DHhMmSs
-    );
-    // DdHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_DAY).into()),
-        Format::DdHhMmSs
-    );
-    // DddHhMmSs
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(101 * ONE_DAY).into()),
-        Format::DddHhMmSs
-    );
-}
-
-#[test]
-fn test_format_by_duration_years() {
-    // YDHhMmSs (1 year, 0 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&ONE_YEAR.into()),
-        Format::YDHhMmSs
-    );
-
-    // YDHhMmSs (1 year, 1 day)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_YEAR + ONE_DAY).into()),
-        Format::YDHhMmSs
-    );
-
-    // YDdHhMmSs (1 year, 10 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YDdHhMmSs
-    );
-
-    // YDddHhMmSs (1 year, 100 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YDddHhMmSs
-    );
-
-    // YyDHhMmSs (10 years)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR).into()),
-        Format::YyDHhMmSs
-    );
-
-    // YyDdHhMmSs (10 years, 10 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YyDdHhMmSs
-    );
-
-    // YyDddHhMmSs (10 years, 100 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(10 * ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YyDddHhMmSs
-    );
-
-    // YyyDHhMmSs (100 years)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR).into()),
-        Format::YyyDHhMmSs
-    );
-
-    // YyyDdHhMmSs (100 years, 10 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR + 10 * ONE_DAY).into()),
-        Format::YyyDdHhMmSs
-    );
-
-    // YyyDddHhMmSs (100 years, 100 days)
-    assert_eq!(
-        format_by_duration::<DurationEx>(&(100 * ONE_YEAR + 100 * ONE_DAY).into()),
-        Format::YyyDddHhMmSs
-    );
-}
-
 #[test]
 fn test_default_edit_mode_hhmmss() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {
@@ -344,278 +63,6 @@ fn test_default_edit_mode_ss() {
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
 }
 
-#[test]
-fn test_edit_up_stays_in_seconds() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_MINUTE - ONE_SECOND,
-        current_value: ONE_MINUTE - ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_up();
-    // Edit mode should stay on seconds
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
-#[test]
-fn test_edit_up_stays_in_minutes() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_HOUR - ONE_SECOND,
-        current_value: ONE_HOUR - ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-    c.edit_up();
-    // Edit mode should stay on minutes
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_up_stays_in_hours() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_DAY - ONE_SECOND,
-        current_value: ONE_DAY - ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_up();
-    // Edit mode should stay on hours
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-}
-
-#[test]
-fn test_edit_up_stays_in_days() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR - ONE_DAY,
-        current_value: ONE_YEAR - ONE_DAY,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Hours
-    c.edit_next(); // Days
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_up();
-    // Edit mode should stay on days
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-}
-
-#[test]
-fn test_edit_up_overflow_protection() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: MAX_DURATION.saturating_sub(ONE_SECOND),
-        current_value: MAX_DURATION.saturating_sub(ONE_SECOND),
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Hours
-    c.edit_next(); // Days
-    c.edit_next(); // Years
-    c.edit_up(); // +1y
-    assert!(Duration::from(*c.get_current_value()) <= MAX_DURATION);
-    c.edit_prev(); // Days
-    c.edit_up(); // +1d
-    assert!(Duration::from(*c.get_current_value()) <= MAX_DURATION);
-    c.edit_prev(); // Hours
-    c.edit_up(); // +1h
-    assert!(Duration::from(*c.get_current_value()) <= MAX_DURATION);
-    c.edit_prev(); // Minutes
-    c.edit_up(); // +1m
-    assert!(Duration::from(*c.get_current_value()) <= MAX_DURATION);
-    c.edit_prev(); // Sec.
-    c.edit_up(); // +1s
-    c.edit_up(); // +1s
-    c.edit_up(); // +1s
-    assert!(Duration::from(*c.get_current_value()) <= MAX_DURATION);
-}
-
-#[test]
-fn test_edit_down_years_to_days() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR + ONE_DAY,
-        current_value: ONE_YEAR + ONE_DAY,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Hours
-    c.edit_next(); // Days
-    c.edit_next(); // Years
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_down();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-}
-
-#[test]
-fn test_edit_down_days_to_hours() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_DAY + ONE_HOUR,
-        current_value: ONE_DAY + ONE_HOUR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Hours
-    c.edit_next(); // Days
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_down();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-}
-
-#[test]
-fn test_edit_down_hours_to_minutes() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_HOUR + ONE_MINUTE,
-        current_value: ONE_HOUR + ONE_MINUTE,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Hours
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_down();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_down_minutes_to_seconds() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_MINUTE,
-        current_value: ONE_MINUTE,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-    c.edit_down();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
-#[test]
-fn test_edit_next_ydddhhmmssd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR,
-        current_value: ONE_YEAR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes
-    c.toggle_edit();
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_hours_in_dhhmmss_format() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_DAY + ONE_HOUR,
-        current_value: ONE_DAY + ONE_HOUR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    c.toggle_edit();
-    c.edit_next(); // Move to Hours
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-
-    // Increment hours - should stay in Hours edit mode
-    c.edit_up();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    assert_eq!(
-        Duration::from(*c.get_current_value()),
-        ONE_DAY + 2 * ONE_HOUR
-    );
-}
-
-#[test]
-fn test_edit_next_ydddhhmmss() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR,
-        current_value: ONE_YEAR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes
-    c.toggle_edit();
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_next_dhhmmssd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_DAY,
-        current_value: ONE_DAY,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes (following existing pattern)
-    c.toggle_edit();
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
 #[test]
 fn test_edit_next_hhmmssd() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {
@@ -631,10 +78,6 @@ fn test_edit_next_hhmmssd() {
     c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
     c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
     c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
@@ -657,10 +100,6 @@ fn test_edit_next_hhmmss() {
     c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
     c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
     c.edit_next();
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
@@ -720,25 +159,6 @@ fn test_edit_next_ssd() {
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
 }
 
-#[test]
-fn test_edit_next_sd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_SECOND,
-        current_value: ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
 #[test]
 fn test_edit_next_ss() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {
@@ -752,103 +172,10 @@ fn test_edit_next_ss() {
     // toggle on
     c.toggle_edit();
     c.edit_next();
+    println!("mode -> {:?}", c.get_mode());
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
 }
 
-#[test]
-fn test_edit_next_s() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_SECOND,
-        current_value: ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    // toggle on
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_next();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
-#[test]
-fn test_edit_prev_ydddhhmmssd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR,
-        current_value: ONE_YEAR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_prev_ydddhhmmss() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_YEAR,
-        current_value: ONE_YEAR,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Years, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
-#[test]
-fn test_edit_prev_dhhmmssd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_DAY,
-        current_value: ONE_DAY,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on - should start at Minutes
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Days, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Hours, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Minutes, _)));
-}
-
 #[test]
 fn test_edit_prev_hhmmssd() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {
@@ -948,25 +275,6 @@ fn test_edit_prev_ssd() {
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
 }
 
-#[test]
-fn test_edit_prev_sd() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_SECOND,
-        current_value: ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: true,
-        app_tx: None,
-    });
-
-    // toggle on
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Decis, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
 #[test]
 fn test_edit_prev_ss() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {
@@ -984,23 +292,6 @@ fn test_edit_prev_ss() {
     assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
 }
 
-#[test]
-fn test_edit_prev_s() {
-    let mut c = ClockState::<Timer>::new(ClockStateArgs {
-        initial_value: ONE_SECOND,
-        current_value: ONE_SECOND,
-        tick_value: ONE_DECI_SECOND,
-        with_decis: false,
-        app_tx: None,
-    });
-
-    // toggle on
-    c.toggle_edit();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-    c.edit_prev();
-    assert!(matches!(c.get_mode(), Mode::Editable(Time::Seconds, _)));
-}
-
 #[test]
 fn test_edit_up_ss() {
     let mut c = ClockState::<Timer>::new(ClockStateArgs {

src/widgets/countdown.rs

@@ -9,7 +9,7 @@ use crate::{
         edit_time::{EditTimeState, EditTimeStateArgs, EditTimeWidget},
     },
 };
-use crossterm::event::{Event as CrosstermEvent, KeyModifiers};
+use crossterm::event::KeyModifiers;
 use ratatui::{
     buffer::Buffer,
     crossterm::event::KeyCode,
@@ -163,8 +163,7 @@ impl TuiEventHandler for CountdownState {
                 }
             }
             // EDIT CLOCK mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) if self.is_clock_edit_mode() => {
-                match key.code {
+            TuiEvent::Key(key) if self.is_clock_edit_mode() => match key.code {
                 // skip editing
                 KeyCode::Esc => {
                     // Important: set current value first
@@ -195,24 +194,16 @@ impl TuiEventHandler for CountdownState {
                 KeyCode::Left => {
                     self.clock.edit_next();
                 }
-                    KeyCode::Up if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                        self.clock.edit_jump_up();
-                    }
                 KeyCode::Up => {
                     self.clock.edit_up();
                 }
-                    KeyCode::Down if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                        self.clock.edit_jump_down();
-                    }
                 KeyCode::Down => {
                     self.clock.edit_down();
                 }
                 _ => return Some(event),
-                }
-            }
+            },
             // EDIT LOCAL TIME mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) if self.is_time_edit_mode() => {
-                match key.code {
+            TuiEvent::Key(key) if self.is_time_edit_mode() => match key.code {
                 // skip editing
                 KeyCode::Esc => {
                     self.edit_time = None;
@@ -259,10 +250,9 @@ impl TuiEventHandler for CountdownState {
                     self.edit_time.as_mut().unwrap().down();
                 }
                 _ => return Some(event),
-                }
-            }
+            },
             // default mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) => match key.code {
+            TuiEvent::Key(key) => match key.code {
                 KeyCode::Char('r') => {
                     // reset both clocks to use intial values
                     self.clock.reset();
@@ -382,11 +372,10 @@ impl StatefulWidget for Countdown {
                 .to_uppercase(),
             );
             let widget = ClockWidget::new(self.style, self.blink);
-
             let area = center(
                 area,
                 Constraint::Length(max(
-                    widget.get_width(state.clock.get_format(), state.clock.with_decis),
+                    widget.get_width(&state.clock.get_format(), state.clock.with_decis),
                     label.width() as u16,
                 )),
                 Constraint::Length(widget.get_height() + 1 /* height of label */),

src/widgets/event.rs

@@ -1,589 +0,0 @@
-use color_eyre::{Report, eyre::eyre};
-use crossterm::event::{Event as CrosstermEvent, KeyCode, KeyModifiers};
-use ratatui::{
-    buffer::Buffer,
-    layout::{Constraint, Layout, Position, Rect},
-    style::{Color, Modifier, Style},
-    text::Line,
-    widgets::{Paragraph, StatefulWidget, Widget},
-};
-use time::{OffsetDateTime, PrimitiveDateTime, macros::format_description};
-use tui_input::Input;
-use tui_input::backend::crossterm::EventHandler;
-
-use crate::{
-    common::{AppTime, ClockTypeId, Style as DigitStyle},
-    duration::CalendarDuration,
-    event::Event,
-    events::{AppEvent, AppEventTx, TuiEvent, TuiEventHandler},
-    utils::center,
-    widgets::{clock, clock_elements::DIGIT_HEIGHT},
-};
-use std::{cmp::max, time::Duration};
-
-#[derive(Clone, Copy, Default)]
-enum Editable {
-    #[default]
-    DateTime,
-    Title,
-}
-
-impl Editable {
-    pub fn next(&self) -> Self {
-        match self {
-            Editable::DateTime => Editable::Title,
-            Editable::Title => Editable::DateTime,
-        }
-    }
-
-    pub fn prev(&self) -> Self {
-        match self {
-            Editable::DateTime => Editable::Title,
-            Editable::Title => Editable::DateTime,
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-enum EditMode {
-    None,
-    Editing(Editable),
-}
-
-impl EditMode {
-    fn is_editable(&self) -> bool {
-        match self {
-            EditMode::None => false,
-            EditMode::Editing(_) => true,
-        }
-    }
-}
-
-/// State for `EventWidget`
-pub struct EventState {
-    title: Option<String>,
-    event_time: OffsetDateTime,
-    app_time: OffsetDateTime,
-    start_time: OffsetDateTime,
-    with_decis: bool,
-    /// counter to simulate `DONE` state
-    /// Default value: `None`
-    done_count: Option<u64>,
-    app_tx: AppEventTx,
-    // inputs
-    input_datetime: Input,
-    input_datetime_error: Option<Report>,
-    input_title: Input,
-    input_title_error: Option<Report>,
-    edit_mode: EditMode,
-    last_editable: Editable,
-}
-
-pub struct EventStateArgs {
-    pub app_time: AppTime,
-    pub event: Event,
-    pub with_decis: bool,
-    pub app_tx: AppEventTx,
-}
-
-impl EventState {
-    pub fn new(args: EventStateArgs) -> Self {
-        let EventStateArgs {
-            app_time,
-            event,
-            with_decis,
-            app_tx,
-        } = args;
-
-        let app_datetime = OffsetDateTime::from(app_time);
-        // assume event has as same `offset` as `app_time`
-        let event_offset = event.date_time.assume_offset(app_datetime.offset());
-        let input_datetime_value = format_offsetdatetime(&event_offset);
-        let input_title_value = event.title.clone().unwrap_or("".into());
-
-        Self {
-            title: event.title.clone(),
-            event_time: event_offset,
-            app_time: app_datetime,
-            start_time: app_datetime,
-            with_decis,
-            done_count: None,
-            app_tx,
-            input_datetime: Input::default().with_value(input_datetime_value),
-            input_datetime_error: None,
-            input_title: Input::default().with_value(input_title_value),
-            input_title_error: None,
-            edit_mode: EditMode::None,
-            last_editable: Editable::default(),
-        }
-    }
-
-    // Sets `app_time`
-    pub fn set_app_time(&mut self, app_time: AppTime) {
-        let app_datetime = OffsetDateTime::from(app_time);
-        self.app_time = app_datetime;
-
-        // Since updating `app_time` is like a `Tick`, we check `done` state here
-        self.check_done();
-    }
-
-    pub fn set_with_decis(&mut self, with_decis: bool) {
-        self.with_decis = with_decis;
-    }
-
-    pub fn get_event(&self) -> Event {
-        Event {
-            title: self.title.clone(),
-            date_time: time::PrimitiveDateTime::new(self.event_time.date(), self.event_time.time()),
-        }
-    }
-
-    pub fn get_percentage_done(&self) -> u16 {
-        get_percentage(self.start_time, self.event_time, self.app_time)
-    }
-
-    pub fn get_duration(&mut self) -> CalendarDuration {
-        CalendarDuration::from_start_end_times(self.event_time, self.app_time)
-    }
-
-    fn check_done(&mut self) {
-        let clock_duration = self.get_duration();
-        if clock_duration.is_since() {
-            let duration: Duration = clock_duration.into();
-            // give some offset to make sure we are around `Duration::ZERO`
-            // Without that we might miss it, because the app runs on its own FPS
-            if duration < Duration::from_millis(100) {
-                // reset `done_count`
-                self.done_count = Some(clock::MAX_DONE_COUNT);
-                // send notification
-                _ = self.app_tx.send(AppEvent::ClockDone(
-                    ClockTypeId::Event,
-                    self.title.clone().unwrap_or("".into()),
-                ));
-            }
-            // count (possible) `done`
-            self.done_count = clock::count_clock_done(self.done_count);
-        }
-    }
-
-    fn reset_cursor(&mut self) {
-        _ = self.app_tx.send(AppEvent::SetCursor(None));
-    }
-
-    pub fn is_edit_mode(&self) -> bool {
-        self.edit_mode.is_editable()
-    }
-
-    fn reset_edit_mode(&mut self) {
-        self.edit_mode = EditMode::None;
-    }
-
-    fn reset_input_datetime(&mut self) {
-        self.input_datetime = Input::default().with_value(format_offsetdatetime(&self.event_time));
-        self.input_datetime_error = None;
-    }
-
-    fn reset_input_title(&mut self) {
-        self.input_title = Input::default().with_value(self.title.clone().unwrap_or_default());
-        self.input_title_error = None;
-    }
-
-    fn save_event_time(&mut self, date_time: PrimitiveDateTime) {
-        self.event_time =
-            // apply offset to be in sync with `AppTime`
-            date_time.assume_offset(self.app_time.offset());
-    }
-
-    fn save_title(&mut self, value: &str) {
-        self.title = if value.is_empty() {
-            None
-        } else {
-            Some(value.into())
-        };
-    }
-
-    fn prepare_switch_input(&mut self, editable: Editable) {
-        // before switching store valid values or reset inputs in case of errors
-        match editable {
-            Editable::DateTime => {
-                // accept valid values only
-                match validate_datetime(self.input_datetime.value()) {
-                    Ok(dt) => self.save_event_time(dt),
-                    Err(_) => self.reset_input_datetime(),
-                }
-            }
-            Editable::Title => match validate_title(self.input_title.clone().value()) {
-                Ok(title) => self.save_title(title),
-                Err(_) => self.reset_input_title(),
-            },
-        }
-    }
-
-    fn switch_input(&mut self, editable: Editable) {
-        self.edit_mode = EditMode::Editing(editable);
-        self.last_editable = editable;
-    }
-}
-
-fn validate_datetime(value: &str) -> Result<time::PrimitiveDateTime, Report> {
-    time::PrimitiveDateTime::parse(
-        value,
-        format_description!("[year]-[month]-[day] [hour]:[minute]:[second]"),
-    )
-    .map_err(|_| eyre!("Expected format 'YYYY-MM-DD HH:MM:SS'"))
-}
-
-const MAX_LABEL_WIDTH: usize = 60;
-
-fn validate_title(value: &str) -> Result<&str, Report> {
-    if value.len() > MAX_LABEL_WIDTH {
-        return Err(eyre!("Max. {} chars", MAX_LABEL_WIDTH));
-    }
-    Ok(value)
-}
-
-impl TuiEventHandler for EventState {
-    fn update(&mut self, event: TuiEvent) -> Option<TuiEvent> {
-        let editable = self.edit_mode.is_editable();
-        match event {
-            // EDIT mode
-            TuiEvent::Crossterm(crossterm_event @ CrosstermEvent::Key(key)) if editable => {
-                match key.code {
-                    // Skip changes
-                    KeyCode::Esc => {
-                        // reset inputs
-                        self.reset_input_datetime();
-                        self.reset_input_title();
-
-                        self.reset_edit_mode();
-                        self.reset_cursor();
-                    }
-                    // switch to prev. input
-                    KeyCode::Tab if key.modifiers.contains(KeyModifiers::SHIFT) => {
-                        if let EditMode::Editing(editable) = self.edit_mode {
-                            self.prepare_switch_input(editable);
-                            self.switch_input(editable.prev());
-                        }
-                    }
-                    // switch to next input
-                    KeyCode::Tab => {
-                        if let EditMode::Editing(editable) = self.edit_mode {
-                            self.prepare_switch_input(editable);
-                            self.switch_input(editable.next());
-                        }
-                    }
-                    KeyCode::Enter => match self.edit_mode {
-                        EditMode::Editing(Editable::DateTime) => {
-                            // accept valid values only
-                            match validate_datetime(self.input_datetime.value()) {
-                                Ok(dt) => {
-                                    self.save_event_time(dt);
-                                    self.reset_edit_mode();
-                                    self.reset_cursor();
-                                }
-                                Err(e) => self.input_datetime_error = Some(e),
-                            }
-                        }
-                        EditMode::Editing(Editable::Title) => {
-                            // accept valid values only
-                            match validate_title(self.input_title.clone().value()) {
-                                Ok(title) => {
-                                    self.save_title(title);
-                                    self.reset_edit_mode();
-                                    self.reset_cursor();
-                                }
-                                Err(e) => self.input_title_error = Some(e),
-                            }
-                        }
-                        EditMode::None => {}
-                    },
-                    _ => match self.edit_mode {
-                        EditMode::Editing(Editable::DateTime) => {
-                            // push `CrosstermEvent` down to input
-                            self.input_datetime.handle_event(&crossterm_event);
-
-                            let value = self.input_datetime.value();
-
-                            match self.input_datetime_error {
-                                // To relax errors while typing:
-                                // (A) Do a "full" validation of `datetime` in case of a previous error only
-                                Some(_) => {
-                                    if let Err(e) = validate_datetime(value) {
-                                        self.input_datetime_error = Some(e);
-                                    } else {
-                                        self.input_datetime_error = None;
-                                    }
-                                }
-                                // (B) do a "light" validation of `datetime` in case of no previous error
-                                None => {
-                                    // check length of expected format
-                                    if value.len() > 19 {
-                                        self.input_datetime_error =
-                                            Some(eyre!("Expected format 'YYYY-MM-DD HH:MM:SS'"))
-                                    } else {
-                                        self.input_datetime_error = None;
-                                    }
-                                }
-                            }
-                        }
-                        EditMode::Editing(Editable::Title) => {
-                            // push `CrosstermEvent` down to input
-                            self.input_title.handle_event(&crossterm_event);
-                            // do always a validation while typing
-                            if let Err(e) = validate_title(self.input_title.value()) {
-                                self.input_title_error = Some(e);
-                            } else {
-                                self.input_title_error = None;
-                            }
-                        }
-                        EditMode::None => {}
-                    },
-                }
-            }
-            // NORMAL mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) => match key.code {
-                // Enter edit mode
-                KeyCode::Char('e') => {
-                    self.edit_mode = EditMode::Editing(self.last_editable);
-                }
-                _ => return Some(event),
-            },
-            _ => return Some(event),
-        }
-
-        None
-    }
-}
-
-fn get_percentage(start: OffsetDateTime, end: OffsetDateTime, current: OffsetDateTime) -> u16 {
-    let total_millis = (end - start).whole_milliseconds();
-
-    if total_millis <= 0 {
-        return 100;
-    }
-
-    let elapsed_millis = (current - start).whole_milliseconds();
-
-    if elapsed_millis <= 0 {
-        return 0;
-    }
-
-    let percentage = (elapsed_millis * 100 / total_millis).min(100);
-    percentage as u16
-}
-
-fn format_offsetdatetime(dt: &OffsetDateTime) -> String {
-    dt.format(&format_description!(
-        "[year]-[month]-[day] [hour]:[minute]:[second]"
-    ))
-    .unwrap_or_else(|e| format!("time format error: {}", e))
-}
-
-#[derive(Debug)]
-pub struct EventWidget {
-    pub style: DigitStyle,
-    pub blink: bool,
-}
-
-impl StatefulWidget for EventWidget {
-    type State = EventState;
-    fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
-        let with_decis = state.with_decis;
-        let clock_duration = state.get_duration();
-        let clock_format = clock::format_by_duration(&clock_duration);
-        let clock_widths = clock::clock_horizontal_lengths(&clock_format, with_decis);
-        let clock_width = clock_widths.iter().sum();
-
-        let area = center(
-            area,
-            Constraint::Length(max(clock_width, MAX_LABEL_WIDTH as u16)),
-            Constraint::Length(
-                DIGIT_HEIGHT + 7, /* height of all labels + empty lines */
-            ),
-        );
-        let [_, v1, v2, v3, _, v4] = Layout::vertical(Constraint::from_lengths([
-            3, // empty (offset) to keep everything centered vertically comparing to "clock" widgets with one label only
-            DIGIT_HEIGHT,
-            1, // label: event date
-            1, // label: event title
-            1, // empty
-            1, // label: error
-        ]))
-        .areas(area);
-
-        // To simulate a blink effect, just use an "empty" symbol (string)
-        // It's "empty" all digits and creates an "empty" render area
-        let symbol = if self.blink && clock::should_blink(state.done_count) {
-            " "
-        } else {
-            self.style.get_digit_symbol()
-        };
-
-        let render_clock_state = clock::RenderClockState {
-            with_decis,
-            duration: clock_duration.clone(),
-            editable_time: None,
-            format: clock_format,
-            symbol,
-            widths: clock_widths,
-        };
-
-        clock::render_clock(v1, buf, render_clock_state);
-
-        // Helper to calculate centered area, cursor x position, and scroll
-        let calc_editable_input_positions = |input: &Input, area: Rect| -> (Rect, u16, usize) {
-            // Calculate scroll position to keep cursor visible
-            let input_scroll = input.visual_scroll(area.width as usize);
-
-            // Get correct visual width (handles unicode properly)
-            let text_width = Line::raw(input.value()).width() as u16;
-
-            // Calculate visible text width after scrolling
-            let visible_text_width = text_width
-                .saturating_sub(input_scroll as u16)
-                .min(area.width);
-
-            // Center the visible portion
-            let offset_x = (area.width.saturating_sub(visible_text_width)) / 2;
-
-            let centered_area = Rect {
-                x: area.x + offset_x,
-                y: area.y,
-                width: visible_text_width,
-                height: area.height,
-            };
-
-            // Cursor position relative to the visible scrolled text
-            let cursor_offset = input.visual_cursor().saturating_sub(input_scroll);
-            let cursor_x = area.x + offset_x + cursor_offset as u16;
-
-            (centered_area, cursor_x, input_scroll)
-        };
-
-        fn input_edit_style(with_error: bool) -> Style {
-            if with_error {
-                Style::default()
-                    .add_modifier(Modifier::UNDERLINED)
-                    .fg(Color::Red)
-            } else {
-                Style::default().add_modifier(Modifier::UNDERLINED)
-            }
-        }
-
-        // Render date time input
-        match state.edit_mode {
-            // EDIT
-            EditMode::Editing(Editable::DateTime) => {
-                let (datetime_area, datetime_cursor_x, datetime_scroll) =
-                    calc_editable_input_positions(&state.input_datetime, v2);
-
-                Paragraph::new(state.input_datetime.value())
-                    .style(input_edit_style(state.input_datetime_error.is_some()))
-                    .scroll((0, datetime_scroll as u16))
-                    .render(datetime_area, buf);
-
-                // Update cursor
-                let cp = Position::new(datetime_cursor_x, v2.y);
-                let _ = state.app_tx.send(AppEvent::SetCursor(Some(cp)));
-            }
-            // NORMAL
-            _ => {
-                let mut prefix = "Until";
-
-                if clock_duration.is_since() {
-                    let duration: Duration = clock_duration.clone().into();
-                    // Show `done` for a short of time (1 sec)
-                    prefix = if duration < Duration::from_secs(1) {
-                        "Done"
-                    } else {
-                        "Since"
-                    };
-                };
-
-                Paragraph::new(format!(
-                    "{} {}",
-                    prefix.to_uppercase(),
-                    state.input_datetime.value()
-                ))
-                .centered()
-                .render(v2, buf);
-            }
-        };
-
-        // Render title input
-        match state.edit_mode {
-            // EDIT
-            EditMode::Editing(Editable::Title) => {
-                let (title_area, title_cursor_x, title_scroll) =
-                    calc_editable_input_positions(&state.input_title, v3);
-
-                Paragraph::new(state.input_title.value().to_uppercase())
-                    .style(input_edit_style(state.input_title_error.is_some()))
-                    .scroll((0, title_scroll as u16))
-                    .render(title_area, buf);
-                // Update cursor
-                let cp = Position::new(title_cursor_x, v3.y);
-                let _ = state.app_tx.send(AppEvent::SetCursor(Some(cp)));
-            }
-            // NORMAL
-            _ => {
-                Paragraph::new(state.input_title.value().to_uppercase())
-                    .centered()
-                    .render(v3, buf);
-            }
-        };
-
-        // Render error
-        let error_txt: String = match (&state.input_datetime_error, &state.input_title_error) {
-            (Some(e), _) => e.to_string(),
-            (_, Some(e)) => e.to_string(),
-            _ => "".into(),
-        };
-        Paragraph::new(error_txt.to_lowercase())
-            .style(Style::default().add_modifier(Modifier::ITALIC))
-            .centered()
-            .render(v4, buf);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use time::macros::datetime;
-
-    #[test]
-    fn test_get_percentage() {
-        let start = datetime!(2024-01-01 10:00:00 UTC);
-        let end = datetime!(2024-01-01 20:00:00 UTC);
-
-        // current == start: 0%
-        assert_eq!(get_percentage(start, end, start), 0);
-
-        // current == end: 100%
-        assert_eq!(get_percentage(start, end, end), 100);
-
-        // current halfway: 50%
-        let halfway = datetime!(2024-01-01 15:00:00 UTC);
-        assert_eq!(get_percentage(start, end, halfway), 50);
-
-        // current 25%
-        let quarter = datetime!(2024-01-01 12:30:00 UTC);
-        assert_eq!(get_percentage(start, end, quarter), 25);
-
-        // current 75%
-        let three_quarters = datetime!(2024-01-01 17:30:00 UTC);
-        assert_eq!(get_percentage(start, end, three_quarters), 75);
-
-        // current > end: clamped to 100%
-        let after = datetime!(2024-01-01 22:00:00 UTC);
-        assert_eq!(get_percentage(start, end, after), 100);
-
-        // current < start: 0%
-        let before = datetime!(2024-01-01 08:00:00 UTC);
-        assert_eq!(get_percentage(start, end, before), 0);
-
-        // end <= start: 100%
-        assert_eq!(get_percentage(end, start, halfway), 100);
-        assert_eq!(get_percentage(start, start, start), 100);
-    }
-}

src/widgets/footer.rs

@@ -53,11 +53,10 @@ impl StatefulWidget for Footer {
     type State = FooterState;
     fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
         let content_labels: BTreeMap<Content, &str> = BTreeMap::from([
-            (Content::Countdown, "[1]countdown"),
-            (Content::Timer, "[2]timer"),
-            (Content::Pomodoro, "[3]pomodoro"),
-            (Content::Event, "[4]event"),
-            (Content::LocalTime, "[0]local time"),
+            (Content::Countdown, "[c]ountdown"),
+            (Content::Timer, "[t]imer"),
+            (Content::Pomodoro, "[p]omodoro"),
+            (Content::LocalTime, "[l]ocal time"),
         ]);
 
         let [_, area] =
@@ -85,7 +84,7 @@ impl StatefulWidget for Footer {
             .render(border_area, buf);
         // show menu
         if state.show_menu {
-            let mut content_labels: Vec<Span> = content_labels
+            let content_labels: Vec<Span> = content_labels
                 .iter()
                 .enumerate()
                 .map(|(index, (content, label))| {
@@ -103,13 +102,6 @@ impl StatefulWidget for Footer {
                 })
                 .collect();
 
-            content_labels.extend_from_slice(&[
-                Span::from(SPACE),
-                Span::from("[→]next"),
-                Span::from(SPACE),
-                Span::from("[←]prev."),
-            ]);
-
             const SPACE: &str = "  "; // 2 empty spaces
             let widths = [Constraint::Length(12), Constraint::Percentage(100)];
             let mut table_rows = vec![
@@ -143,7 +135,6 @@ impl StatefulWidget for Footer {
                 ]),
             ];
 
-            // Controls (except for `localtime`)
             if self.selected_content != Content::LocalTime {
                 table_rows.extend_from_slice(&[
                     // controls - 1. row
@@ -154,7 +145,7 @@ impl StatefulWidget for Footer {
                         )),
                         Cell::from(Line::from({
                             match self.app_edit_mode {
-                                AppEditMode::None if self.selected_content != Content::Event => {
+                                AppEditMode::None => {
                                     let mut spans = vec![Span::from(if self.running_clock {
                                         "[s]top"
                                     } else {
@@ -182,16 +173,8 @@ impl StatefulWidget for Footer {
                                     }
                                     spans
                                 }
-                                AppEditMode::None if self.selected_content == Content::Event => {
-                                    vec![Span::from("[e]dit")]
-                                }
-                                AppEditMode::Clock | AppEditMode::Time | AppEditMode::Event => {
+                                _ => {
                                     let mut spans = vec![Span::from("[s]ave changes")];
-
-                                    if self.selected_content == Content::Event {
-                                        spans[0] = Span::from("[enter]save changes")
-                                    };
-
                                     if self.selected_content == Content::Countdown
                                         || self.selected_content == Content::Pomodoro
                                     {
@@ -204,24 +187,13 @@ impl StatefulWidget for Footer {
                                         Span::from(SPACE),
                                         Span::from("[esc]skip changes"),
                                     ]);
-
-                                    if self.selected_content == Content::Event {
-                                        spans.extend_from_slice(&[
-                                            Span::from(SPACE),
-                                            Span::from("[tab]switch input"),
-                                        ]);
-                                    }
                                     spans
                                 }
-                                _ => vec![],
                             }
                         })),
                     ]),
                     // controls - 2. row
-                    Row::new(if self.selected_content == Content::Event {
-                        vec![]
-                    } else {
-                        vec![
+                    Row::new(vec![
                         Cell::from(Line::from("")),
                         Cell::from(Line::from({
                             match self.app_edit_mode {
@@ -229,7 +201,7 @@ impl StatefulWidget for Footer {
                                     let mut spans = vec![];
                                     if self.selected_content == Content::Pomodoro {
                                         spans.extend_from_slice(&[Span::from(
-                                                "[^←] or [^→] switch work/pause",
+                                            "[← →]switch work/pause",
                                         )]);
                                     }
                                     spans
@@ -248,28 +220,15 @@ impl StatefulWidget for Footer {
                                         scrollbar::VERTICAL.begin
                                     )),
                                     Span::from(SPACE),
-                                        Span::from(format!(
-                                            // ctrl + ↑
-                                            "[^{}]edit up 10x",
-                                            scrollbar::VERTICAL.begin
-                                        )),
-                                        Span::from(SPACE),
                                     Span::from(format!(
                                         // ↓
                                         "[{}]edit up",
                                         scrollbar::VERTICAL.end
                                     )),
-                                        Span::from(SPACE),
-                                        Span::from(format!(
-                                            // ctrl + ↓
-                                            "[^{}]edit up 10x",
-                                            scrollbar::VERTICAL.end
-                                        )),
                                 ],
                             }
                         })),
-                        ]
-                    }),
+                    ]),
                 ])
             }
 

src/widgets/local_time.rs

@@ -8,7 +8,7 @@ use ratatui::{
 
 use crate::{
     common::{AppTime, AppTimeFormat, Style as DigitStyle},
-    duration::{ClockDuration, DurationEx},
+    duration::DurationEx,
     events::{TuiEvent, TuiEventHandler},
     utils::center,
     widgets::clock_elements::{
@@ -115,8 +115,6 @@ impl StatefulWidget for LocalTimeWidget {
         let symbol = self.style.get_digit_symbol();
 
         let label = Line::raw("Local Time".to_uppercase());
-        let label_date = Line::raw(state.time.format_date().to_uppercase());
-        let mut content_width = max(label.width(), label_date.width()) as u16;
 
         let format = state.format;
         let widths = self.get_horizontal_lengths(&format);
@@ -129,21 +127,14 @@ impl StatefulWidget for LocalTimeWidget {
             widths[2] = 0; // `space`
         }
 
-        content_width = max(widths.iter().sum(), content_width);
-        let v_heights = [
-            1, // empty (offset) to keep everything centered vertically comparing to "clock" widgets with one label only
-            DIGIT_HEIGHT, // local time
-            1, // label
-            1, // date
-        ];
-
+        let width = widths.iter().sum();
         let area = center(
             area,
-            Constraint::Length(content_width),
-            Constraint::Length(v_heights.iter().sum()),
+            Constraint::Length(max(width, label.width() as u16)),
+            Constraint::Length(DIGIT_HEIGHT + 1 /* height of label */),
         );
 
-        let [_, v1, v2, v3] = Layout::vertical(Constraint::from_lengths(v_heights)).areas(area);
+        let [v1, v2] = Layout::vertical(Constraint::from_lengths([DIGIT_HEIGHT, 1])).areas(area);
 
         match state.format {
             AppTimeFormat::HhMmSs => {
@@ -190,6 +181,5 @@ impl StatefulWidget for LocalTimeWidget {
             }
         }
         label.centered().render(v2, buf);
-        label_date.centered().render(v3, buf);
     }
 }

src/widgets/pomodoro.rs

@@ -5,7 +5,7 @@ use crate::{
     utils::center,
     widgets::clock::{ClockState, ClockStateArgs, ClockWidget, Countdown},
 };
-use crossterm::event::{Event as CrosstermEvent, KeyCode, KeyModifiers};
+use crossterm::event::{KeyCode, KeyModifiers};
 use ratatui::{
     buffer::Buffer,
     layout::{Constraint, Layout, Rect},
@@ -149,7 +149,7 @@ impl TuiEventHandler for PomodoroState {
                 self.get_clock_mut().update_done_count();
             }
             // EDIT mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) if edit_mode => match key.code {
+            TuiEvent::Key(key) if edit_mode => match key.code {
                 // Skip changes
                 KeyCode::Esc => {
                     let clock = self.get_clock_mut();
@@ -188,7 +188,7 @@ impl TuiEventHandler for PomodoroState {
                 _ => return Some(event),
             },
             // default mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) => match key.code {
+            TuiEvent::Key(key) => match key.code {
                 // Toggle run/pause
                 KeyCode::Char('s') => {
                     self.get_clock_mut().toggle_pause();
@@ -198,12 +198,12 @@ impl TuiEventHandler for PomodoroState {
                     self.get_clock_mut().toggle_edit();
                 }
                 // toggle WORK/PAUSE
-                KeyCode::Left if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                KeyCode::Left => {
                     // `next` is acting as same as a "prev" function we don't have
                     self.next();
                 }
                 // toggle WORK/PAUSE
-                KeyCode::Right if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                KeyCode::Right => {
                     self.next();
                 }
                 // reset rounds AND clocks
@@ -250,8 +250,10 @@ impl StatefulWidget for PomodoroWidget {
         let area = center(
             area,
             Constraint::Length(max(
-                clock_widget
-                    .get_width(state.get_clock().get_format(), state.get_clock().with_decis),
+                clock_widget.get_width(
+                    &state.get_clock().get_format(),
+                    state.get_clock().with_decis,
+                ),
                 label.width() as u16,
             )),
             Constraint::Length(

src/widgets/timer.rs

@@ -4,7 +4,6 @@ use crate::{
     utils::center,
     widgets::clock::{self, ClockState, ClockWidget},
 };
-use crossterm::event::{Event as CrosstermEvent, KeyModifiers};
 use ratatui::{
     buffer::Buffer,
     crossterm::event::KeyCode,
@@ -41,7 +40,7 @@ impl TuiEventHandler for TimerState {
                 self.clock.update_done_count();
             }
             // EDIT mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) if edit_mode => match key.code {
+            TuiEvent::Key(key) if edit_mode => match key.code {
                 // Skip changes
                 KeyCode::Esc => {
                     // Important: set current value first
@@ -61,24 +60,18 @@ impl TuiEventHandler for TimerState {
                 KeyCode::Right => {
                     self.clock.edit_prev();
                 }
-                KeyCode::Up if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                    self.clock.edit_jump_up();
-                }
                 // change value up
                 KeyCode::Up => {
                     self.clock.edit_up();
                 }
                 // change value down
-                KeyCode::Down if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                    self.clock.edit_jump_down();
-                }
                 KeyCode::Down => {
                     self.clock.edit_down();
                 }
                 _ => return Some(event),
             },
             // default mode
-            TuiEvent::Crossterm(CrosstermEvent::Key(key)) => match key.code {
+            TuiEvent::Key(key) => match key.code {
                 // Toggle run/pause
                 KeyCode::Char('s') => {
                     self.clock.toggle_pause();
@@ -114,7 +107,7 @@ impl StatefulWidget for Timer {
         let area = center(
             area,
             Constraint::Length(max(
-                clock_widget.get_width(clock.get_format(), clock.with_decis),
+                clock_widget.get_width(&clock.get_format(), clock.with_decis),
                 label.width() as u16,
             )),
             Constraint::Length(clock_widget.get_height() + 1 /* height of label */),