Merge pull request #1 from Sellsword9/patch-1

I added color customization

Author: ckaznable

Makefile

@@ -9,6 +9,6 @@ uninstall:
 	rm /usr/local/bin/tenki
 
 clean:
-	rm -rf target
+	cargo clean -q
 
 all: build install clean

README.md

@@ -31,6 +31,7 @@ Usage: tenki [OPTIONS]
 Options:
       --mode <MODE>    [default: rain] [possible values: rain, snow]
       --fps <FPS>      [default: 30] 1-60
+      --color <COLOR>  [default: white] [red, green, blue, yellow, cyan, magenta, white, black]
   -l, --level <LEVEL>  effect level, The lower, the stronger [4-1000] [default: 50]
   -h, --help           Print help
   -V, --version        Print version

src/app.rs

@@ -10,7 +10,7 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use rand::{rngs::SmallRng, RngCore, SeedableRng};
-use ratatui::{backend::CrosstermBackend, layout::Rect, Terminal};
+use ratatui::{backend::CrosstermBackend, layout::Rect, style::Color, Terminal};
 use tinyvec::ArrayVec;
 
 use crate::{tui::{Tui, Event}, ui::ui, cli::Args};
@@ -71,6 +71,7 @@ pub struct Timer {
     pub hours: u8,
     pub minutes: u8,
     pub seconds: u8,
+    pub color: Color,
 }
 
 impl Timer {
@@ -103,15 +104,18 @@ pub struct State {
 }
 
 impl State {
-    pub fn new(size: Rect, mode: Mode, threshold: u64) -> Self {
+    pub fn new(size: Rect, mode: Mode, threshold: u64, timer_color: Color) -> Self {
         let (buf, buf_line) = Self::init_buf(size);
 
         State {
             buf,
             buf_line,
             rng: SmallRng::from_entropy(),
             ticks: 0u8,
-            timer: Timer::default(),
+            timer: Timer {
+                color: timer_color,
+                ..Default::default()
+            },
             threshold,
             mode,
             wind: Wind::None,
@@ -324,7 +328,11 @@ impl App {
 
         let backend = CrosstermBackend::new(stdout);
         let terminal = Terminal::new(backend)?;
-        let state = State::new(terminal.size()?, args.mode, args.level as u64);
+        let state = State::new(
+            terminal.size()?, 
+            args.mode, 
+            args.level as u64, 
+            args.timer_color);
 
         Ok(Self {
             terminal,

src/cli.rs

@@ -1,6 +1,8 @@
+use std::str::FromStr;
+
 use clap::Parser;
 use clap_num::number_range;
-
+use ratatui::style::Color;
 use crate::app::Mode;
 
 #[derive(Parser)]
@@ -15,6 +17,10 @@ pub struct Args {
     /// effect level, The lower, the stronger [4-1000]
     #[arg(short, long, value_parser = level_range, default_value_t = 50)]
     pub level: u16,
+
+    /// color of the effect. [red, green, blue, yellow, cyan, magenta, white, black]
+    #[arg(long, value_parser = Color::from_str, default_value = "white")]
+    pub timer_color: Color,
 }
 
 fn fps_range(s: &str) -> Result<u8, String> {

src/widget/timer.rs

@@ -87,21 +87,21 @@ static ASCII_9: [u8; 25] = [
 pub struct Timer(pub crate::app::Timer);
 
 impl Timer {
-    fn render_colon(area: Rect, buf: &mut Buffer) {
+    fn render_colon(area: Rect, color: Color, buf: &mut Buffer) {
         let left = area.left();
         let top = area.top();
 
-        buf.get_mut(left + 1, top + 1).set_char(COLON_CHAR).set_fg(Color::Reset);
-        buf.get_mut(left + 1, top + 3).set_char(COLON_CHAR).set_fg(Color::Reset);
+        buf.get_mut(left + 1, top + 1).set_char(COLON_CHAR).set_fg(color);
+        buf.get_mut(left + 1, top + 3).set_char(COLON_CHAR).set_fg(color);
     }
 
-    fn render_decimal(d: u8, area: Rect, buf: &mut Buffer) {
+    fn render_decimal(d: u8, area: Rect, color: Color, buf: &mut Buffer) {
         let layout = Layout::new(Direction::Horizontal, Constraint::from_lengths([5, 1, 5])).split(area);
-        Self::render_number(d / 10, layout[0], buf);
-        Self::render_number(d % 10, layout[2], buf);
+        Self::render_number(d / 10, layout[0], buf, color);
+        Self::render_number(d % 10, layout[2], buf, color);
     }
 
-    fn render_number(number: u8, area: Rect, buf: &mut Buffer) {
+    fn render_number(number: u8, area: Rect, buf: &mut Buffer, color: Color) {
         let left = area.left();
         let top = area.top();
 
@@ -130,7 +130,7 @@ impl Timer {
                         if *c > 0 {
                             buf .get_mut(left + x as u16, top + y as u16)
                                 .set_char(TIMER_CHAR)
-                                .set_fg(Color::Reset);
+                                .set_fg(color);
                         }
                     })
             });
@@ -160,11 +160,11 @@ impl Widget for Timer {
         )
         .split(center_area);
 
-        Self::render_decimal(self.0.hours, layout[0], buf);
-        Self::render_colon(layout[1], buf);
-        Self::render_decimal(self.0.minutes, layout[2], buf);
-        Self::render_colon(layout[3], buf);
-        Self::render_decimal(self.0.seconds, layout[4], buf);
+        Self::render_decimal(self.0.hours, layout[0], self.0.color, buf);
+        Self::render_colon(layout[1], self.0.color, buf);
+        Self::render_decimal(self.0.minutes, layout[2], self.0.color, buf);
+        Self::render_colon(layout[3], self.0.color, buf);
+        Self::render_decimal(self.0.seconds, layout[4], self.0.color , buf);
     }
 }