diff --git a/bin/commands/inbox/select.rs b/bin/commands/inbox/select.rs index 899a2470..5c8d2f12 100644 --- a/bin/commands/inbox/select.rs +++ b/bin/commands/inbox/select.rs @@ -17,9 +17,11 @@ use radicle_tui as tui; use tui::cob::inbox::{self}; use tui::store; use tui::store::StateValue; -use tui::task::{self, Interrupted}; +use tui::task; +use tui::task::Interrupted; use tui::ui::items::{Filter, NotificationItem, NotificationItemFilter}; -use tui::ui::widget::{Properties, Widget, Window, WindowProps}; +use tui::ui::widget::window::{Window, WindowProps}; +use tui::ui::widget::{Properties, Widget}; use tui::ui::Frontend; use tui::Exit; diff --git a/bin/commands/inbox/select/ui.rs b/bin/commands/inbox/select/ui.rs index d0c81141..6625dcd6 100644 --- a/bin/commands/inbox/select/ui.rs +++ b/bin/commands/inbox/select/ui.rs @@ -16,13 +16,15 @@ use tui::ui::items::{NotificationItem, NotificationItemFilter, NotificationState use tui::ui::span; use tui::ui::widget; use tui::ui::widget::container::{ - Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, SectionGroup, + SectionGroupProps, }; use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState}; -use tui::ui::widget::page::{SectionGroup, SectionGroupProps}; +use tui::ui::widget::list::{Table, TableProps, TableUtils}; use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState}; -use tui::ui::widget::{BaseView, RenderProps, TableUtils, WidgetState}; -use tui::ui::widget::{Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, Widget}; +use tui::ui::widget::window::{Shortcuts, ShortcutsProps}; +use tui::ui::widget::{BaseView, Properties, RenderProps, Widget, WidgetState}; + use tui::Selection; use crate::tui_inbox::common::{InboxOperation, Mode, RepositoryMode, SelectionMode}; diff --git a/bin/commands/issue/select.rs b/bin/commands/issue/select.rs index bac97dc9..4bb9e371 100644 --- a/bin/commands/issue/select.rs +++ b/bin/commands/issue/select.rs @@ -16,7 +16,8 @@ use tui::store::StateValue; use tui::task; use tui::task::Interrupted; use tui::ui::items::{Filter, IssueItem, IssueItemFilter}; -use tui::ui::widget::{Properties, Widget, Window, WindowProps}; +use tui::ui::widget::window::{Window, WindowProps}; +use tui::ui::widget::{Properties, Widget}; use tui::ui::Frontend; use tui::Exit; use tui::{store, PageStack}; diff --git a/bin/commands/issue/select/ui.rs b/bin/commands/issue/select/ui.rs index 7aa82d40..838a3ec0 100644 --- a/bin/commands/issue/select/ui.rs +++ b/bin/commands/issue/select/ui.rs @@ -16,15 +16,16 @@ use radicle_tui as tui; use tui::ui::items::{IssueItem, IssueItemFilter}; use tui::ui::span; +use tui::ui::widget; use tui::ui::widget::container::{ - Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, }; use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState}; +use tui::ui::widget::list::{Table, TableProps, TableUtils}; use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState}; -use tui::ui::widget::{self, BaseView, RenderProps, WidgetState}; -use tui::ui::widget::{ - Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, TableUtils, Widget, -}; +use tui::ui::widget::window::{Shortcuts, ShortcutsProps}; +use tui::ui::widget::{BaseView, Properties, RenderProps, Widget, WidgetState}; + use tui::Selection; use crate::tui_issue::common::IssueOperation; diff --git a/bin/commands/patch/select.rs b/bin/commands/patch/select.rs index 6bfa56ef..a403c618 100644 --- a/bin/commands/patch/select.rs +++ b/bin/commands/patch/select.rs @@ -16,10 +16,8 @@ use tui::store; use tui::task; use tui::task::Interrupted; use tui::ui::items::{Filter, PatchItem, PatchItemFilter}; -use tui::ui::widget::Properties; -use tui::ui::widget::Widget; -use tui::ui::widget::Window; -use tui::ui::widget::WindowProps; +use tui::ui::widget::window::{Window, WindowProps}; +use tui::ui::widget::{Properties, Widget}; use tui::ui::Frontend; use tui::Exit; diff --git a/bin/commands/patch/select/ui.rs b/bin/commands/patch/select/ui.rs index adfc7107..961f5796 100644 --- a/bin/commands/patch/select/ui.rs +++ b/bin/commands/patch/select/ui.rs @@ -17,14 +17,16 @@ use radicle_tui as tui; use tui::ui::items::{PatchItem, PatchItemFilter}; use tui::ui::span; +use tui::ui::widget; use tui::ui::widget::container::{ - Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, }; use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState}; +use tui::ui::widget::list::{Table, TableProps, TableUtils}; use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState}; -use tui::ui::widget::{self, BaseView, RenderProps}; -use tui::ui::widget::{Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, Widget}; -use tui::ui::widget::{TableUtils, WidgetState}; +use tui::ui::widget::window::{Shortcuts, ShortcutsProps}; +use tui::ui::widget::{BaseView, Properties, RenderProps, Widget, WidgetState}; + use tui::Selection; use crate::tui_patch::common::Mode;