From 362693e45aba5130f6191f05693de4bcb163cdc2 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 5 Sep 2024 10:56:38 +0200 Subject: [PATCH] bin: Adjust modules --- bin/commands/inbox/select.rs | 7 +++---- bin/commands/inbox/select/ui.rs | 3 ++- bin/commands/issue/select.rs | 3 ++- bin/commands/issue/select/ui.rs | 3 ++- bin/commands/patch/select.rs | 3 ++- bin/commands/patch/select/imui.rs | 5 ++--- bin/commands/patch/select/rmui.rs | 3 ++- bin/ui/im.rs | 3 +-- bin/ui/items.rs | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/bin/commands/inbox/select.rs b/bin/commands/inbox/select.rs index bb283696..0fe12efd 100644 --- a/bin/commands/inbox/select.rs +++ b/bin/commands/inbox/select.rs @@ -22,15 +22,14 @@ use radicle_tui as tui; use tui::store; use tui::store::StateValue; -use tui::ui::rm::widget::container::{Column, Container, Footer, FooterProps, Header, HeaderProps}; -use tui::ui::rm::widget::input::TextView; -use tui::ui::rm::widget::input::TextViewProps; -use tui::ui::rm::widget::input::TextViewState; +use tui::ui::rm::widget::container::{Container, Footer, FooterProps, Header, HeaderProps}; +use tui::ui::rm::widget::input::{TextView, TextViewProps, TextViewState}; use tui::ui::rm::widget::window::{ Page, PageProps, Shortcuts, ShortcutsProps, Window, WindowProps, }; use tui::ui::rm::widget::{ToWidget, Widget}; use tui::ui::span; +use tui::ui::Column; use tui::{BoxedAny, Channel, Exit, PageStack}; use crate::cob::inbox; diff --git a/bin/commands/inbox/select/ui.rs b/bin/commands/inbox/select/ui.rs index 41f8b52c..91ababf9 100644 --- a/bin/commands/inbox/select/ui.rs +++ b/bin/commands/inbox/select/ui.rs @@ -13,13 +13,14 @@ use ratatui::text::{Line, Text}; use radicle_tui as tui; use tui::ui::rm::widget::container::{ - Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, }; use tui::ui::rm::widget::input::{TextField, TextFieldProps}; use tui::ui::rm::widget::list::{Table, TableProps}; use tui::ui::rm::widget::{self, ViewProps}; use tui::ui::rm::widget::{RenderProps, ToWidget, View}; use tui::ui::span; +use tui::ui::Column; use tui::{BoxedAny, Selection}; diff --git a/bin/commands/issue/select.rs b/bin/commands/issue/select.rs index ae78c1bd..9f2415b1 100644 --- a/bin/commands/issue/select.rs +++ b/bin/commands/issue/select.rs @@ -23,7 +23,7 @@ use radicle_tui as tui; use tui::store; use tui::store::StateValue; use tui::ui::rm::widget::container::{ - Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, SectionGroup, + Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, SectionGroup, SectionGroupProps, SplitContainer, SplitContainerFocus, SplitContainerProps, }; use tui::ui::rm::widget::input::{TextView, TextViewProps, TextViewState}; @@ -34,6 +34,7 @@ use tui::ui::rm::widget::window::{ use tui::ui::rm::widget::{PredefinedLayout, ToWidget, Widget}; use tui::ui::span; use tui::ui::theme::Theme; +use tui::ui::Column; use tui::{BoxedAny, Channel, Exit, PageStack}; use crate::cob::issue; diff --git a/bin/commands/issue/select/ui.rs b/bin/commands/issue/select/ui.rs index cb2c2204..d85dd854 100644 --- a/bin/commands/issue/select/ui.rs +++ b/bin/commands/issue/select/ui.rs @@ -16,13 +16,14 @@ use radicle_tui as tui; use tui::ui::rm::widget; use tui::ui::rm::widget::container::{ - Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, }; use tui::ui::rm::widget::input::{TextField, TextFieldProps}; use tui::ui::rm::widget::list::{Table, TableProps}; use tui::ui::rm::widget::ViewProps; use tui::ui::rm::widget::{RenderProps, ToWidget, View}; use tui::ui::span; +use tui::ui::Column; use tui::BoxedAny; diff --git a/bin/commands/patch/select.rs b/bin/commands/patch/select.rs index 6809102f..9a8f402e 100644 --- a/bin/commands/patch/select.rs +++ b/bin/commands/patch/select.rs @@ -16,13 +16,14 @@ use ratatui::style::Stylize; use ratatui::text::Text; use tui::store; -use tui::ui::rm::widget::container::{Column, Container, Footer, FooterProps, Header, HeaderProps}; +use tui::ui::rm::widget::container::{Container, Footer, FooterProps, Header, HeaderProps}; use tui::ui::rm::widget::input::{TextView, TextViewProps, TextViewState}; use tui::ui::rm::widget::window::{ Page, PageProps, Shortcuts, ShortcutsProps, Window, WindowProps, }; use tui::ui::rm::widget::{ToWidget, Widget}; use tui::ui::span; +use tui::ui::Column; use tui::{BoxedAny, Channel, Exit, PageStack}; diff --git a/bin/commands/patch/select/imui.rs b/bin/commands/patch/select/imui.rs index b41b847a..ec220dd8 100644 --- a/bin/commands/patch/select/imui.rs +++ b/bin/commands/patch/select/imui.rs @@ -13,12 +13,11 @@ use ratatui::Frame; use radicle_tui as tui; -use tui::ui::rm::widget::container::Column; -use tui::{store, Exit}; - use tui::ui::im; use tui::ui::im::widget::{GroupState, TableState, TextEditState, TextViewState, Window}; use tui::ui::im::{Borders, BufferedValue}; +use tui::ui::Column; +use tui::{store, Exit}; use crate::cob::patch; use crate::tui_patch::common::{Mode, PatchOperation}; diff --git a/bin/commands/patch/select/rmui.rs b/bin/commands/patch/select/rmui.rs index 45302109..459226c2 100644 --- a/bin/commands/patch/select/rmui.rs +++ b/bin/commands/patch/select/rmui.rs @@ -18,13 +18,14 @@ use radicle_tui as tui; use tui::ui::rm::widget; use tui::ui::rm::widget::container::{ - Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, + Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, }; use tui::ui::rm::widget::input::{TextField, TextFieldProps}; use tui::ui::rm::widget::list::{Table, TableProps}; use tui::ui::rm::widget::ViewProps; use tui::ui::rm::widget::{RenderProps, ToWidget, View}; use tui::ui::span; +use tui::ui::Column; use tui::BoxedAny; diff --git a/bin/ui/im.rs b/bin/ui/im.rs index ada28e9c..adb8fcbe 100644 --- a/bin/ui/im.rs +++ b/bin/ui/im.rs @@ -7,8 +7,7 @@ use radicle_tui as tui; use tui::ui::im::widget::{TableState, TextEditState, Widget}; use tui::ui::im::{Borders, BufferedValue, Response, Ui}; -use tui::ui::rm::widget::container::Column; -use tui::ui::rm::widget::list::ToRow; +use tui::ui::{Column, ToRow}; pub struct UiExt<'a>(&'a mut Ui); diff --git a/bin/ui/items.rs b/bin/ui/items.rs index c92025f0..91224a77 100644 --- a/bin/ui/items.rs +++ b/bin/ui/items.rs @@ -28,9 +28,9 @@ use tui_tree_widget::TreeItem; use radicle_tui as tui; -use tui::ui::rm::widget::list::{ToRow, ToTree}; use tui::ui::span; use tui::ui::theme::style; +use tui::ui::{ToRow, ToTree}; use super::super::git; use super::format;