diff --git a/src/app/widget.rs b/src/app/widget.rs index cdbf039..1c700bb 100644 --- a/src/app/widget.rs +++ b/src/app/widget.rs @@ -1,5 +1,5 @@ use ratatui::{layout::Rect, style::{Color, Stylize}, text::{Line, Span}, widgets::Widget}; -use crate::{app::App, buffer::Buffer, custom_greys::CustomGreys}; +use crate::{app::App, buffer::Buffer, utilities::CustomGreys}; impl Widget for &App { fn render(self, area: Rect, buf: &mut ratatui::buffer::Buffer) { diff --git a/src/buffer/widget/character_panel.rs b/src/buffer/widget/character_panel.rs index a29cc0b..5682f26 100644 --- a/src/buffer/widget/character_panel.rs +++ b/src/buffer/widget/character_panel.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, iter, mem}; use ratatui::{style::{Color, Style, Stylize}, text::Span}; -use crate::{buffer::Buffer, cardinality::HasCardinality, cursor::InCursor, custom_greys::CustomGreys, empty_span::empty_span}; +use crate::{buffer::Buffer, utilities::{CustomGreys, empty_span, HasCardinality}, cursor::InCursor}; impl Buffer { pub fn render_character_panel( diff --git a/src/buffer/widget/hex.rs b/src/buffer/widget/hex.rs index 5e561cc..a3b68c5 100644 --- a/src/buffer/widget/hex.rs +++ b/src/buffer/widget/hex.rs @@ -2,7 +2,7 @@ use std::{borrow::Cow, iter::{self, repeat_n}, mem}; use itertools::Itertools; use ratatui::{style::{Color, Style, Stylize}, text::Span}; -use crate::{BYTES_PER_CHUNK, BYTES_PER_LINE, CHUNKS_PER_LINE, buffer::{Buffer, Mode, PartialAction}, cardinality::HasCardinality, cursor::InCursor, custom_greys::CustomGreys, empty_span::empty_span}; +use crate::{BYTES_PER_CHUNK, BYTES_PER_LINE, CHUNKS_PER_LINE, buffer::{Buffer, Mode, PartialAction}, utilities::{CustomGreys, empty_span, HasCardinality}, cursor::InCursor}; impl Buffer { pub fn render_chunks( @@ -132,7 +132,7 @@ impl Buffer { if let Some(place_in_cursor) = self.primary_cursor.contains(address) { let head_color = match self.mode { Mode::Select => Color::Yellow, - _ => Color::Gray + Mode::Normal => Color::Gray }; match place_in_cursor { diff --git a/src/buffer/widget/status_line.rs b/src/buffer/widget/status_line.rs index e0bfe63..6143035 100644 --- a/src/buffer/widget/status_line.rs +++ b/src/buffer/widget/status_line.rs @@ -1,4 +1,4 @@ -use crate::{buffer::{Buffer, Mode}, custom_greys::CustomGreys}; +use crate::{buffer::{Buffer, Mode}, utilities::CustomGreys}; use ratatui::{style::{Color, Stylize}, text::{Line, Span, Text}}; impl Buffer { diff --git a/src/main.rs b/src/main.rs index d1bdb75..4920915 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,9 +23,7 @@ mod edit_action; mod arguments; mod window_size; -mod cardinality; -mod empty_span; -mod custom_greys; +mod utilities; const BYTES_PER_LINE: usize = 0x10; const BYTES_PER_CHUNK: usize = 4; diff --git a/src/utilities.rs b/src/utilities.rs new file mode 100644 index 0000000..97190b6 --- /dev/null +++ b/src/utilities.rs @@ -0,0 +1,7 @@ +mod cardinality; +mod empty_span; +mod custom_greys; + +pub use cardinality::HasCardinality; +pub use empty_span::empty_span; +pub use custom_greys::CustomGreys; diff --git a/src/cardinality.rs b/src/utilities/cardinality.rs similarity index 100% rename from src/cardinality.rs rename to src/utilities/cardinality.rs diff --git a/src/custom_greys.rs b/src/utilities/custom_greys.rs similarity index 100% rename from src/custom_greys.rs rename to src/utilities/custom_greys.rs diff --git a/src/empty_span.rs b/src/utilities/empty_span.rs similarity index 71% rename from src/empty_span.rs rename to src/utilities/empty_span.rs index 0f4acfc..a01557b 100644 --- a/src/empty_span.rs +++ b/src/utilities/empty_span.rs @@ -1,6 +1,7 @@ use std::borrow::Cow; use ratatui::{style::Style, text::Span}; +// this can't just use Span::default() because it needs to be const pub const fn empty_span() -> Span<'static> { Span { style: Style::new(),