diff --git a/src/app.rs b/src/app.rs index eaeab9e..f120869 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,6 +1,6 @@ use crate::{ args::Args, - common::Style, + common::{Content, Style}, constants::TICK_VALUE_MS, events::{Event, EventHandler, Events}, storage::AppStorage, @@ -14,7 +14,6 @@ use crate::{ timer::{Timer, TimerWidget}, }, }; -use clap::ValueEnum; use color_eyre::Result; use ratatui::{ buffer::Buffer, @@ -22,23 +21,9 @@ use ratatui::{ layout::{Constraint, Layout, Rect}, widgets::{StatefulWidget, Widget}, }; -use serde::{Deserialize, Serialize}; use std::time::Duration; use tracing::debug; -#[derive( - Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Default, Serialize, Deserialize, -)] -pub enum Content { - #[default] - #[value(name = "countdown", alias = "c")] - Countdown, - #[value(name = "timer", alias = "t")] - Timer, - #[value(name = "pomodoro", alias = "p")] - Pomodoro, -} - #[derive(Debug, Clone, Copy, PartialEq, Eq)] enum Mode { Running, diff --git a/src/args.rs b/src/args.rs index d246bd9..10d051e 100644 --- a/src/args.rs +++ b/src/args.rs @@ -5,7 +5,7 @@ use color_eyre::{ }; use std::time::Duration; -use crate::{app::Content, common::Style}; +use crate::common::{Content, Style}; #[derive(Parser)] pub struct Args { diff --git a/src/common.rs b/src/common.rs index d8ac792..e3f4449 100644 --- a/src/common.rs +++ b/src/common.rs @@ -2,6 +2,19 @@ use clap::ValueEnum; use ratatui::symbols::shade; use serde::{Deserialize, Serialize}; +#[derive( + Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Default, Serialize, Deserialize, +)] +pub enum Content { + #[default] + #[value(name = "countdown", alias = "c")] + Countdown, + #[value(name = "timer", alias = "t")] + Timer, + #[value(name = "pomodoro", alias = "p")] + Pomodoro, +} + #[derive(Debug, Copy, Clone, ValueEnum, Default, Serialize, Deserialize)] pub enum Style { #[default] diff --git a/src/storage.rs b/src/storage.rs index a7e197b..b91dfc8 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -1,5 +1,7 @@ use crate::{ - app::Content, common::Style, constants::APP_NAME, widgets::pomodoro::Mode as PomodoroMode, + common::{Content, Style}, + constants::APP_NAME, + widgets::pomodoro::Mode as PomodoroMode, }; use color_eyre::eyre::Result; use serde::{Deserialize, Serialize}; diff --git a/src/widgets/footer.rs b/src/widgets/footer.rs index 225eb69..c623dc0 100644 --- a/src/widgets/footer.rs +++ b/src/widgets/footer.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use crate::app::Content; +use crate::common::Content; use ratatui::{ buffer::Buffer, layout::{Constraint, Layout, Rect},