sin_serhao/timr-tui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editable timer (#17)

Browse Source
This commit is contained in:
Jens K. 2024-12-18 08:49:57 +01:00 committed by GitHub
parent 3e278d63c5
commit 3c9ae881c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widgets/clock.rs
View File

@ -57,8 +57,8 @@ const MINS_PER_HOUR: u64 = 60;
const HOURS_PER_DAY: u64 = 24; const HOURS_PER_DAY: u64 = 24;
// max. 99:59:59 // max. 99:59:59
const MAX_EDITABLE_DURATION: Duration = const MAX_DURATION: Duration =
Duration::from_secs(100 * MINS_PER_HOUR * SECS_PER_MINUTE - 1); Duration::from_secs(100 * MINS_PER_HOUR * SECS_PER_MINUTE).saturating_sub(ONE_SECOND);
const ONE_SECOND: Duration = Duration::from_secs(1); const ONE_SECOND: Duration = Duration::from_secs(1);
const ONE_MINUTE: Duration = Duration::from_secs(SECS_PER_MINUTE); const ONE_MINUTE: Duration = Duration::from_secs(SECS_PER_MINUTE);
@ -127,7 +127,7 @@ impl<T> Clock<T> {
if self if self
.current_value .current_value
// < 99:59:58 // < 99:59:58
.le(&MAX_EDITABLE_DURATION.saturating_sub(ONE_SECOND)) .le(&MAX_DURATION.saturating_sub(ONE_SECOND))
{ {
self.current_value.saturating_add(ONE_SECOND) self.current_value.saturating_add(ONE_SECOND)
} else { } else {
@ -138,7 +138,7 @@ impl<T> Clock<T> {
if self if self
.current_value .current_value
// < 99:58:59 // < 99:58:59
.le(&MAX_EDITABLE_DURATION.saturating_sub(ONE_MINUTE)) .le(&MAX_DURATION.saturating_sub(ONE_MINUTE))
{ {
self.current_value.saturating_add(ONE_MINUTE) self.current_value.saturating_add(ONE_MINUTE)
} else { } else {
@ -149,7 +149,7 @@ impl<T> Clock<T> {
if self if self
.current_value .current_value
// < 98:59:59 // < 98:59:59
.lt(&MAX_EDITABLE_DURATION.saturating_sub(ONE_HOUR)) .lt(&MAX_DURATION.saturating_sub(ONE_HOUR))
{ {
self.current_value.saturating_add(ONE_HOUR) self.current_value.saturating_add(ONE_HOUR)
} else { } else {
@ -229,6 +229,7 @@ impl<T> Clock<T> {
pub fn reset(&mut self) { pub fn reset(&mut self) {
self.mode = Mode::Initial; self.mode = Mode::Initial;
self.current_value = self.initial_value; self.current_value = self.initial_value;
self.update_format();
} }
fn current_hours(&self) -> u64 { fn current_hours(&self) -> u64 {
@ -381,10 +382,26 @@ impl Clock<Timer> {
} }
fn check_done(&mut self) { fn check_done(&mut self) {
if self.current_value == self.initial_value { if self.current_value >= MAX_DURATION {
self.mode = Mode::Done; self.mode = Mode::Done;
} }
} }
pub fn edit_next(&mut self) {
self.edit_mode_next();
}
pub fn edit_prev(&mut self) {
self.edit_mode_prev();
}
pub fn edit_up(&mut self) {
self.edit_current_up();
}
pub fn edit_down(&mut self) {
self.edit_current_down();
}
} }
const DIGIT_SYMBOL: &str = "█"; const DIGIT_SYMBOL: &str = "█";

23
src/widgets/timer.rs
View File

@ -25,16 +25,35 @@ impl Timer {
impl EventHandler for Timer { impl EventHandler for Timer {
fn update(&mut self, event: Event) -> Option<Event> { fn update(&mut self, event: Event) -> Option<Event> {
let edit_mode = self.clock.is_edit_mode();
match event { match event {
Event::Tick => { Event::Tick => {
self.clock.tick(); self.clock.tick();
} }
Event::Key(key) if key.code == KeyCode::Char('s') => { Event::Key(key) => match key.code {
KeyCode::Char('s') => {
self.clock.toggle_pause(); self.clock.toggle_pause();
} }
Event::Key(key) if key.code == KeyCode::Char('r') => { KeyCode::Char('r') => {
self.clock.reset(); self.clock.reset();
} }
KeyCode::Char('e') => {
self.clock.toggle_edit();
}
KeyCode::Left if edit_mode => {
self.clock.edit_next();
}
KeyCode::Right if edit_mode => {
self.clock.edit_prev();
}
KeyCode::Up if edit_mode => {
self.clock.edit_up();
}
KeyCode::Down if edit_mode => {
self.clock.edit_down();
}
_ => return Some(event),
},
_ => return Some(event), _ => return Some(event),
} }
None None