From d0c362a08f69df59406ce06efc25db2c22cd9def Mon Sep 17 00:00:00 2001 From: Tobias Sandmann Date: Tue, 16 Apr 2024 21:00:03 +0200 Subject: [PATCH] Change keymaps --- src/main.rs | 17 ++++++++--------- src/thok.rs | 1 - src/ui.rs | 9 ++------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/main.rs b/src/main.rs index b2d5eaa..49bcbe6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,6 @@ use tui::{ backend::{Backend, CrosstermBackend}, Frame, Terminal, }; -use webbrowser::Browser; const TICK_RATE_MS: u64 = 100; @@ -198,7 +197,9 @@ fn start_tui( ThokEvent::Key(key) => { match key.code { KeyCode::Esc => { - break; + if !app.thok.has_finished() { + break; + } } KeyCode::Backspace => { if !app.thok.has_finished() { @@ -229,18 +230,16 @@ fn start_tui( } } true => match key.code { - KeyCode::Char('t') => { - if Browser::is_available() { - webbrowser::open(&format!("https://twitter.com/intent/tweet?text={}%20wpm%20%2F%20{}%25%20acc%20%2F%20{:.2}%20sd%0A%0Ahttps%3A%2F%2Fgithub.com%thatvegandev%2Fthokr", app.thok.wpm, app.thok.accuracy, app.thok.std_dev)) - .unwrap_or_default(); - } + KeyCode::Char('n') => { + exit_type = ExitType::New; + break; } KeyCode::Char('r') => { exit_type = ExitType::Restart; break; } - KeyCode::Char('n') => { - exit_type = ExitType::New; + KeyCode::Char('q') => { + exit_type = ExitType::Quit; break; } _ => {} diff --git a/src/thok.rs b/src/thok.rs index c7ec39e..08939ab 100644 --- a/src/thok.rs +++ b/src/thok.rs @@ -204,7 +204,6 @@ impl Thok { let needs_header = !log_path.exists(); let mut log_file = OpenOptions::new() - .write(true) .append(true) .create(true) .open(log_path)?; diff --git a/src/ui.rs b/src/ui.rs index bdac4a7..be7604d 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -6,7 +6,6 @@ use tui::{ widgets::{Axis, Chart, Dataset, GraphType, Paragraph, Widget, Wrap}, }; use unicode_width::UnicodeWidthStr; -use webbrowser::Browser; use crate::thok::{Outcome, Thok}; @@ -135,7 +134,7 @@ impl Widget for &Thok { for ts in &self.wpm_coords { if ts.1 > highest_wpm { - highest_wpm = ts.1 as f64; + highest_wpm = ts.1; } } @@ -190,11 +189,7 @@ impl Widget for &Thok { stats.render(chunks[1], buf); let legend = Paragraph::new(Span::styled( - String::from(if Browser::is_available() { - "(r)etry / (n)ew / (t)weet / (esc)ape" - } else { - "(r)etry / (n)ew / (esc)ape" - }), + String::from("(n)ew / (r)etry / (q)uit"), italic_style, ));