feat: add hints to blocks and update colors

This commit is contained in:
itsscb 2025-07-25 15:51:01 +02:00
parent fcd4a4258d
commit 05f885f38d

View File

@ -91,8 +91,30 @@ impl App {
fn draw(&mut self, frame: &mut Frame) { fn draw(&mut self, frame: &mut Frame) {
self.render(frame.area(), frame.buffer_mut()); self.render(frame.area(), frame.buffer_mut());
if let Some(ref item) = self.edit { if let Some(ref item) = self.edit {
let block = Block::bordered().title("Details"); let block = Block::bordered()
let area = popup_area(frame.area(), 80, 80); .title(Span::styled(
"Details",
Style::default().bold().fg(COLOR_SECONDARY),
))
.title_bottom(Line::from(vec![
Span::raw(" Save "),
Span::styled(
"<CTRL-Enter> | <CTRL-O>",
Style::default()
.fg(COLOR_SECONDARY)
.add_modifier(Modifier::BOLD),
),
Span::raw(" Cancel "),
Span::styled(
"<CTRL-C> | <ESC>",
Style::default()
.fg(COLOR_SECONDARY)
.add_modifier(Modifier::BOLD),
),
]))
.title_style(Style::default().bold().fg(Color::White));
let area = popup_area(frame.area(), 90, 90);
frame.render_widget(Clear, area); frame.render_widget(Clear, area);
@ -112,6 +134,7 @@ impl App {
"modified at {}", "modified at {}",
item.modified().format("%Y-%m-%d %H:%M:%S").to_string() item.modified().format("%Y-%m-%d %H:%M:%S").to_string()
)) ))
.style(Style::default().fg(COLOR_SECONDARY).bold())
.right_aligned(), .right_aligned(),
) )
.right_aligned(), .right_aligned(),
@ -119,10 +142,13 @@ impl App {
); );
frame.render_widget( frame.render_widget(
Paragraph::new(Text::from(format!( Paragraph::new(
"created at {}", Text::from(format!(
item.created().format("%Y-%m-%d %H:%M:%S").to_string() "created at {}",
))), item.created().format("%Y-%m-%d %H:%M:%S").to_string()
))
.style(Style::default().fg(COLOR_SECONDARY).bold()),
),
inner[0], inner[0],
); );
@ -161,6 +187,7 @@ impl App {
self.update(item.id(), item.content()); self.update(item.id(), item.content());
} else { } else {
self.logs.push(item.clone()); self.logs.push(item.clone());
self.logs.sort_by(|a, b| b.created().cmp(&a.created()));
} }
self.edit = None; self.edit = None;
self.save()?; self.save()?;
@ -319,35 +346,49 @@ impl Widget for &mut App {
let instructions = Line::from(vec![ let instructions = Line::from(vec![
Span::raw(" New "), Span::raw(" New "),
Span::styled( Span::styled(
"<O>", "<o>",
Style::default() Style::default()
.fg(COLOR_PRIMARY) .fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
Span::raw(" Select "), Span::raw(" Select "),
Span::styled( Span::styled(
"<Space>", "<e> | <Enter> | <Space>",
Style::default() Style::default()
.fg(COLOR_PRIMARY) .fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
Span::raw(" Down "), Span::raw(" Down "),
Span::styled( Span::styled(
"<J>", "<j>",
Style::default() Style::default()
.fg(COLOR_PRIMARY) .fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
Span::raw(" Up "), Span::raw(" Up "),
Span::styled( Span::styled(
"<K>", "<k>",
Style::default()
.fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD),
),
Span::raw(" Bottom "),
Span::styled(
"<G>",
Style::default()
.fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD),
),
Span::raw(" Top "),
Span::styled(
"<g>",
Style::default() Style::default()
.fg(COLOR_PRIMARY) .fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
Span::raw(" Quit "), Span::raw(" Quit "),
Span::styled( Span::styled(
"<Q> | <ESC>", "<q> | <ESC>",
Style::default() Style::default()
.fg(COLOR_PRIMARY) .fg(COLOR_PRIMARY)
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
@ -400,7 +441,7 @@ impl Widget for &mut App {
}) })
.collect::<Row>() .collect::<Row>()
.style(Style::new().fg(Color::White)) .style(Style::new().fg(Color::White))
.height(4) .height(2)
}) })
.collect(); .collect();