1bd7ad3 issue: Adjust to single widget trait — radicle-tui

Radicle terminal user interface

issue: Adjust to single widget trait

Erik Kundt committed 2 years ago

commit 1bd7ad34c53147d6938aa65540994282d6b38d15
parent 7bcd739d6d9c24c520914de7aaf6f7447e9abed6

2 files changed +111 -117

modified bin/commands/issue/select.rs

@@ -16,7 +16,7 @@ use tui::store::StateValue;

 use tui::task;
 use tui::task::Interrupted;
 use tui::ui::items::{Filter, IssueItem, IssueItemFilter};
 use tui::ui::widget::{Properties, View, Window, WindowProps};
 use tui::ui::widget::{Properties, Widget, Window, WindowProps};
 use tui::ui::Frontend;
 use tui::Exit;
 use tui::{store, PageStack};

modified bin/commands/issue/select/ui.rs

@@ -24,7 +24,7 @@ use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState};

 use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState};
 use tui::ui::widget::{self, BaseView};
 use tui::ui::widget::{
     Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, TableUtils, View, Widget,
     Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, TableUtils, Widget,
 };
 use tui::Selection;

@@ -132,7 +132,84 @@ pub struct BrowsePage<'a> {

     shortcuts: BoxedWidget,
 }
 impl<'a: 'static> View for BrowsePage<'a> {
 impl<'a> BrowsePage<'a> {
     fn build_footer(props: &BrowsePageProps<'a>, selected: Option<usize>) -> Vec<Column<'a>> {
         let search = Line::from(vec![
             span::default(" Search ").cyan().dim().reversed(),
             span::default(" "),
             span::default(&props.search).gray().dim(),
         ]);
         let open = Line::from(vec![
             span::positive(&props.stats.get("Open").unwrap_or(&0).to_string()).dim(),
             span::default(" Open").dim(),
         ]);
         let solved = Line::from(vec![
             span::default(&props.stats.get("Solved").unwrap_or(&0).to_string())
                 .magenta()
                 .dim(),
             span::default(" Solved").dim(),
         ]);
         let closed = Line::from(vec![
             span::default(&props.stats.get("Closed").unwrap_or(&0).to_string())
                 .magenta()
                 .dim(),
             span::default(" Closed").dim(),
         ]);
         let sum = Line::from(vec![
             span::default("Σ ").dim(),
             span::default(&props.issues.len().to_string()).dim(),
         ]);
         let progress = selected
             .map(|selected| TableUtils::progress(selected, props.issues.len(), props.page_size))
             .unwrap_or_default();
         let progress = span::default(&format!("{}%", progress)).dim();
         match IssueItemFilter::from_str(&props.search)
             .unwrap_or_default()
             .state()
         {
             Some(state) => {
                 let block = match state {
                     issue::State::Open => open,
                     issue::State::Closed {
                         reason: issue::CloseReason::Other,
                     } => closed,
                     issue::State::Closed {
                         reason: issue::CloseReason::Solved,
                     } => solved,
                 };
                 [
                     Column::new(Text::from(search), Constraint::Fill(1)),
                     Column::new(
                         Text::from(block.clone()),
                         Constraint::Min(block.width() as u16),
                     ),
                     Column::new(Text::from(progress), Constraint::Min(4)),
                 ]
                 .to_vec()
             }
             None => [
                 Column::new(Text::from(search), Constraint::Fill(1)),
                 Column::new(
                     Text::from(open.clone()),
                     Constraint::Min(open.width() as u16),
                 ),
                 Column::new(
                     Text::from(closed.clone()),
                     Constraint::Min(closed.width() as u16),
                 ),
                 Column::new(Text::from(sum.clone()), Constraint::Min(sum.width() as u16)),
                 Column::new(Text::from(progress), Constraint::Min(4)),
             ]
             .to_vec(),
         }
     }
 }
 impl<'a: 'static> Widget for BrowsePage<'a> {
     type Action = Action;
     type State = State;

@@ -194,19 +271,6 @@ impl<'a: 'static> View for BrowsePage<'a> {

         }
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
     fn update(&mut self, state: &State) {
         self.props = BrowsePageProps::from_callback(self.base.on_update, state)
             .unwrap_or(BrowsePageProps::from(state));
         self.issues.update(state);
         self.search.update(state);
         self.shortcuts.update(state);
     }
     fn handle_event(&mut self, key: Key) {
         if self.props.show_search {
             self.search.handle_event(key);

@@ -266,86 +330,16 @@ impl<'a: 'static> View for BrowsePage<'a> {

             }
         }
     }
 }
 impl<'a> BrowsePage<'a> {
     fn build_footer(props: &BrowsePageProps<'a>, selected: Option<usize>) -> Vec<Column<'a>> {
         let search = Line::from(vec![
             span::default(" Search ").cyan().dim().reversed(),
             span::default(" "),
             span::default(&props.search).gray().dim(),
         ]);
         let open = Line::from(vec![
             span::positive(&props.stats.get("Open").unwrap_or(&0).to_string()).dim(),
             span::default(" Open").dim(),
         ]);
         let solved = Line::from(vec![
             span::default(&props.stats.get("Solved").unwrap_or(&0).to_string())
                 .magenta()
                 .dim(),
             span::default(" Solved").dim(),
         ]);
         let closed = Line::from(vec![
             span::default(&props.stats.get("Closed").unwrap_or(&0).to_string())
                 .magenta()
                 .dim(),
             span::default(" Closed").dim(),
         ]);
         let sum = Line::from(vec![
             span::default("Σ ").dim(),
             span::default(&props.issues.len().to_string()).dim(),
         ]);
         let progress = selected
             .map(|selected| TableUtils::progress(selected, props.issues.len(), props.page_size))
             .unwrap_or_default();
         let progress = span::default(&format!("{}%", progress)).dim();
         match IssueItemFilter::from_str(&props.search)
             .unwrap_or_default()
             .state()
         {
             Some(state) => {
                 let block = match state {
                     issue::State::Open => open,
                     issue::State::Closed {
                         reason: issue::CloseReason::Other,
                     } => closed,
                     issue::State::Closed {
                         reason: issue::CloseReason::Solved,
                     } => solved,
                 };
     fn update(&mut self, state: &State) {
         self.props = BrowsePageProps::from_callback(self.base.on_update, state)
             .unwrap_or(BrowsePageProps::from(state));
                 [
                     Column::new(Text::from(search), Constraint::Fill(1)),
                     Column::new(
                         Text::from(block.clone()),
                         Constraint::Min(block.width() as u16),
                     ),
                     Column::new(Text::from(progress), Constraint::Min(4)),
                 ]
                 .to_vec()
             }
             None => [
                 Column::new(Text::from(search), Constraint::Fill(1)),
                 Column::new(
                     Text::from(open.clone()),
                     Constraint::Min(open.width() as u16),
                 ),
                 Column::new(
                     Text::from(closed.clone()),
                     Constraint::Min(closed.width() as u16),
                 ),
                 Column::new(Text::from(sum.clone()), Constraint::Min(sum.width() as u16)),
                 Column::new(Text::from(progress), Constraint::Min(4)),
             ]
             .to_vec(),
         }
         self.issues.update(state);
         self.search.update(state);
         self.shortcuts.update(state);
     }
 }
 impl<'a: 'static> Widget for BrowsePage<'a> {
     fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<Box<dyn Any>>) {
         let props = props
             .and_then(BrowsePageProps::from_boxed_any)

@@ -396,6 +390,10 @@ impl<'a: 'static> Widget for BrowsePage<'a> {

             let _ = self.base.action_tx.send(Action::BrowserPageSize(page_size));
         }
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
 }
 pub struct SearchProps {}

@@ -411,7 +409,7 @@ pub struct Search {

     input: BoxedWidget,
 }
 impl View for Search {
 impl Widget for Search {
     type Action = Action;
     type State = State;

@@ -448,14 +446,6 @@ impl View for Search {

         }
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
     fn update(&mut self, state: &State) {
         self.input.update(state);
     }
     fn handle_event(&mut self, key: termion::event::Key) {
         match key {
             Key::Esc => {

@@ -469,9 +459,11 @@ impl View for Search {

             }
         }
     }
 }
 impl Widget for Search {
     fn update(&mut self, state: &State) {
         self.input.update(state);
     }
     fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: Option<Box<dyn Any>>) {
         let layout = Layout::horizontal(Constraint::from_mins([0]))
             .horizontal_margin(1)

@@ -479,6 +471,10 @@ impl Widget for Search {

         self.input.render(frame, layout[0], None);
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
 }
 #[derive(Clone)]

@@ -513,7 +509,7 @@ pub struct HelpPage<'a> {

     shortcuts: BoxedWidget,
 }
 impl<'a: 'static> View for HelpPage<'a> {
 impl<'a: 'static> Widget for HelpPage<'a> {
     type Action = Action;
     type State = State;

@@ -590,17 +586,6 @@ impl<'a: 'static> View for HelpPage<'a> {

         }
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
     fn update(&mut self, state: &State) {
         self.props = HelpPageProps::from_callback(self.base.on_update, state)
             .unwrap_or(HelpPageProps::from(state));
         self.content.update(state);
     }
     fn handle_event(&mut self, key: termion::event::Key) {
         match key {
             Key::Esc | Key::Ctrl('c') => {

@@ -614,9 +599,14 @@ impl<'a: 'static> View for HelpPage<'a> {

             }
         }
     }
 }
 impl<'a: 'static> Widget for HelpPage<'a> {
     fn update(&mut self, state: &State) {
         self.props = HelpPageProps::from_callback(self.base.on_update, state)
             .unwrap_or(HelpPageProps::from(state));
         self.content.update(state);
     }
     fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<Box<dyn Any>>) {
         let props = props
             .and_then(HelpPageProps::from_boxed_any)

@@ -642,6 +632,10 @@ impl<'a: 'static> Widget for HelpPage<'a> {

             let _ = self.base.action_tx.send(Action::HelpPageSize(page_size));
         }
     }
     fn base_mut(&mut self) -> &mut BaseView<State, Action> {
         &mut self.base
     }
 }
 fn help_text() -> Text<'static> {