JosephFerano/kanban-tui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of some clones. Return Oks from all arm branches

Browse Source
This commit is contained in:
Joseph Ferano 2023-06-16 10:18:29 +07:00
parent a479b72a29
commit a98b82f3e4
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/input.rs
View File

@ -30,8 +30,12 @@ pub fn handle_task_edit(state: &mut State<'_>, key: event::KeyEvent) -> Result<(
Some(task) Some(task)
}, },
(KeyCode::Enter, TaskEditFocus::ConfirmBtn) => { (KeyCode::Enter, TaskEditFocus::ConfirmBtn) => {
let title = task.title.clone().into_lines().join("\n"); // The structure of this function is so we avoid an
let description = task.description.clone().into_lines().join("\n"); // unncessary clone() here. We can just transfer
// ownership of these strings right into the task
// that's going to be created/updated
let title = task.title.into_lines().join("\n");
let description = task.description.into_lines().join("\n");
if task.is_edit { if task.is_edit {
state.edit_task(title, description)?; state.edit_task(title, description)?;
} else { } else {
@ -61,23 +65,22 @@ pub fn handle_task_edit(state: &mut State<'_>, key: event::KeyEvent) -> Result<(
pub fn handle_main(state: &mut State<'_>, key: event::KeyEvent) -> Result<(), Error> { pub fn handle_main(state: &mut State<'_>, key: event::KeyEvent) -> Result<(), Error> {
match key.code { match key.code {
KeyCode::Char('q') => state.quit = true, KeyCode::Char('q') => Ok(state.quit = true),
KeyCode::Char('h') | KeyCode::Left => state.select_previous_column()?, KeyCode::Char('h') | KeyCode::Left => state.select_previous_column(),
KeyCode::Char('j') | KeyCode::Down => state.select_next_task()?, KeyCode::Char('j') | KeyCode::Down => state.select_next_task(),
KeyCode::Char('k') | KeyCode::Up => state.select_previous_task()?, KeyCode::Char('k') | KeyCode::Up => state.select_previous_task(),
KeyCode::Char('l') | KeyCode::Right => state.select_next_column()?, KeyCode::Char('l') | KeyCode::Right => state.select_next_column(),
KeyCode::Char('g') => state.select_first_task()?, KeyCode::Char('g') => state.select_first_task(),
KeyCode::Char('G') => state.select_last_task()?, KeyCode::Char('G') => state.select_last_task(),
KeyCode::Char('H') => state.move_task_previous_column()?, KeyCode::Char('H') => state.move_task_previous_column(),
KeyCode::Char('L') => state.move_task_next_column()?, KeyCode::Char('L') => state.move_task_next_column(),
KeyCode::Char('J') => state.move_task_down()?, KeyCode::Char('J') => state.move_task_down(),
KeyCode::Char('K') => state.move_task_up()?, KeyCode::Char('K') => state.move_task_up(),
KeyCode::Char('n') => state.task_edit_state = Some(TaskState::default()), KeyCode::Char('n') => Ok(state.task_edit_state = Some(TaskState::default())),
KeyCode::Char('e') => state.task_edit_state = state.get_task_state_from_current(), KeyCode::Char('e') => Ok(state.task_edit_state = state.get_task_state_from_current()),
KeyCode::Char('D') => state.delete_task()?, KeyCode::Char('D') => state.delete_task(),
_ => {} _ => Ok(())
} }
Ok(())
} }
/// # Errors /// # Errors

15
src/ui.rs
View File

@ -27,16 +27,15 @@ fn draw_tasks<B: Backend>(f: &mut Frame<'_, B>, area: Rect, state: &State<'_>) {
let mut style = Style::default(); let mut style = Style::default();
let col_idx = state.selected_column_idx; let col_idx = state.selected_column_idx;
let task_idx = state.get_selected_column().selected_task_idx; let task_idx = state.get_selected_column().selected_task_idx;
let item_txt; let mut span;
if i == col_idx && j == task_idx { if i == col_idx && j == task_idx {
style = style.add_modifier(Modifier::BOLD | Modifier::UNDERLINED); style = style.add_modifier(Modifier::BOLD | Modifier::UNDERLINED);
item_txt = format!("{} 👈", task.title); span = Span::raw(format!("{} 👈", task.title));
} else { } else {
item_txt = task.title.clone(); span = Span::raw(&task.title);
} }
let mut s = Span::raw(item_txt); span.style = style;
s.style = style; ListItem::new(vec![Spans::from(span)])
ListItem::new(vec![Spans::from(s)])
}) })
.collect(); .collect();
let mut style = Style::default(); let mut style = Style::default();
@ -102,10 +101,10 @@ pub fn draw_task_popup<B: Backend>(f: &mut Frame<'_, B>, state: &mut State<'_>,
.title(popup_title) .title(popup_title)
.title_alignment(Alignment::Center) .title_alignment(Alignment::Center)
.borders(Borders::ALL); .borders(Borders::ALL);
let block_inner = block.inner(area);
f.render_widget(Clear, area); f.render_widget(Clear, area);
f.render_widget(Paragraph::new("").block(block.clone()), area); f.render_widget(Paragraph::new("").block(block), area);
if let Some(task) = &mut state.task_edit_state { if let Some(task) = &mut state.task_edit_state {
let block_inner = block.inner(area);
let layout = Layout::default() let layout = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints( .constraints(