extract Content into common
This commit is contained in:
parent
9bfe4e528b
commit
7206714f96
17
src/app.rs
17
src/app.rs
@ -1,6 +1,6 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
args::Args,
|
args::Args,
|
||||||
common::Style,
|
common::{Content, Style},
|
||||||
constants::TICK_VALUE_MS,
|
constants::TICK_VALUE_MS,
|
||||||
events::{Event, EventHandler, Events},
|
events::{Event, EventHandler, Events},
|
||||||
storage::AppStorage,
|
storage::AppStorage,
|
||||||
@ -14,7 +14,6 @@ use crate::{
|
|||||||
timer::{Timer, TimerWidget},
|
timer::{Timer, TimerWidget},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use clap::ValueEnum;
|
|
||||||
use color_eyre::Result;
|
use color_eyre::Result;
|
||||||
use ratatui::{
|
use ratatui::{
|
||||||
buffer::Buffer,
|
buffer::Buffer,
|
||||||
@ -22,23 +21,9 @@ use ratatui::{
|
|||||||
layout::{Constraint, Layout, Rect},
|
layout::{Constraint, Layout, Rect},
|
||||||
widgets::{StatefulWidget, Widget},
|
widgets::{StatefulWidget, Widget},
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tracing::debug;
|
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)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
enum Mode {
|
enum Mode {
|
||||||
Running,
|
Running,
|
||||||
|
|||||||
@ -5,7 +5,7 @@ use color_eyre::{
|
|||||||
};
|
};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use crate::{app::Content, common::Style};
|
use crate::common::{Content, Style};
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
pub struct Args {
|
pub struct Args {
|
||||||
|
|||||||
@ -2,6 +2,19 @@ use clap::ValueEnum;
|
|||||||
use ratatui::symbols::shade;
|
use ratatui::symbols::shade;
|
||||||
use serde::{Deserialize, Serialize};
|
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)]
|
#[derive(Debug, Copy, Clone, ValueEnum, Default, Serialize, Deserialize)]
|
||||||
pub enum Style {
|
pub enum Style {
|
||||||
#[default]
|
#[default]
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
use crate::{
|
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 color_eyre::eyre::Result;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
use crate::app::Content;
|
use crate::common::Content;
|
||||||
use ratatui::{
|
use ratatui::{
|
||||||
buffer::Buffer,
|
buffer::Buffer,
|
||||||
layout::{Constraint, Layout, Rect},
|
layout::{Constraint, Layout, Rect},
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user