extract Content into common

This commit is contained in:
jk 2024-12-28 13:18:43 +01:00
parent 9bfe4e528b
commit 7206714f96
No known key found for this signature in database
5 changed files with 19 additions and 19 deletions

View File

@ -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,

View File

@ -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 {

View File

@ -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]

View File

@ -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};

View File

@ -1,6 +1,6 @@
use std::collections::BTreeMap;
use crate::app::Content;
use crate::common::Content;
use ratatui::{
buffer::Buffer,
layout::{Constraint, Layout, Rect},