Radish alpha
r
Radicle terminal user interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
bin: Remove legacy tui-realm framework
Erik Kundt committed 2 years ago
commit 96a86880b99cd454d34cd8fc2c6e98eb2b89cd83
parent 8e752468d11c1045a896c57515392e5343405a4c
9 files changed +43 -49
modified bin/commands/inbox.rs
@@ -9,7 +9,7 @@ use anyhow::anyhow;

use radicle_tui as tui;

-
use tui::common::cob::inbox::{self};
+
use tui::cob::inbox::{self};

use crate::terminal;
use crate::terminal::args::{Args, Error, Help};
@@ -141,7 +141,7 @@ impl Args for Options {
#[tokio::main]
pub async fn run(options: Options, _ctx: impl terminal::Context) -> anyhow::Result<()> {
    use radicle::storage::ReadStorage;
-
    use tui::common::log;
+
    use tui::log;

    let (_, rid) = radicle::rad::cwd()
        .map_err(|_| anyhow!("this command must be run in the context of a project"))?;
modified bin/commands/inbox/select.rs
@@ -12,12 +12,12 @@ use radicle::storage::git::Repository;
use radicle::Profile;
use radicle_tui as tui;

-
use tui::common::cob::inbox::{self};
-
use tui::flux::store;
-
use tui::flux::store::StateValue;
-
use tui::flux::task::{self, Interrupted};
-
use tui::flux::ui::items::NotificationItem;
-
use tui::flux::ui::Frontend;
+
use tui::cob::inbox::{self};
+
use tui::store;
+
use tui::store::StateValue;
+
use tui::task::{self, Interrupted};
+
use tui::ui::items::NotificationItem;
+
use tui::ui::Frontend;
use tui::Exit;

use ui::ListPage;
modified bin/commands/inbox/select/ui.rs
@@ -14,14 +14,12 @@ use radicle::identity::Project;

use radicle_tui as tui;

-
use tui::flux::ui::items::{NotificationItem, NotificationItemFilter, NotificationState};
-
use tui::flux::ui::span;
-
use tui::flux::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
-
use tui::flux::ui::widget::input::{TextField, TextFieldProps};
-
use tui::flux::ui::widget::text::{Paragraph, ParagraphProps};
-
use tui::flux::ui::widget::{
-
    Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget,
-
};
+
use tui::ui::items::{NotificationItem, NotificationItemFilter, NotificationState};
+
use tui::ui::span;
+
use tui::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
+
use tui::ui::widget::input::{TextField, TextFieldProps};
+
use tui::ui::widget::text::{Paragraph, ParagraphProps};
+
use tui::ui::widget::{Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget};
use tui::Selection;

use crate::tui_inbox::common::{InboxOperation, Mode, RepositoryMode, SelectionMode};
@@ -122,7 +120,7 @@ impl<'a> Widget<State, Action> for ListPage<'a> {
impl<'a> Render<()> for ListPage<'a> {
    fn render<B: Backend>(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) {
        let area = frame.size();
-
        let layout = tui::flux::ui::layout::default_page(area, 0u16, 1u16);
+
        let layout = tui::ui::layout::default_page(area, 0u16, 1u16);

        let shortcuts = if self.props.show_search {
            vec![
modified bin/commands/issue.rs
@@ -12,8 +12,8 @@ use radicle::issue;
use radicle::identity::RepoId;
use radicle_tui as tui;

-
use tui::common::cob;
-
use tui::common::log;
+
use tui::cob;
+
use tui::log;

use crate::terminal;
use crate::terminal::args::{Args, Error, Help};
modified bin/commands/issue/select.rs
@@ -9,11 +9,11 @@ use radicle::Profile;

use radicle_tui as tui;

-
use tui::common::cob::issue::{self, Filter};
-
use tui::flux::store::{self, StateValue};
-
use tui::flux::task::{self, Interrupted};
-
use tui::flux::ui::items::IssueItem;
-
use tui::flux::ui::Frontend;
+
use tui::cob::issue::{self, Filter};
+
use tui::store::{self, StateValue};
+
use tui::task::{self, Interrupted};
+
use tui::ui::items::IssueItem;
+
use tui::ui::Frontend;
use tui::Exit;

use ui::ListPage;
modified bin/commands/issue/select/ui.rs
@@ -14,14 +14,12 @@ use ratatui::text::{Line, Span, Text};

use radicle_tui as tui;

-
use tui::flux::ui::items::{IssueItem, IssueItemFilter};
-
use tui::flux::ui::span;
-
use tui::flux::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
-
use tui::flux::ui::widget::input::{TextField, TextFieldProps};
-
use tui::flux::ui::widget::text::{Paragraph, ParagraphProps};
-
use tui::flux::ui::widget::{
-
    Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget,
-
};
+
use tui::ui::items::{IssueItem, IssueItemFilter};
+
use tui::ui::span;
+
use tui::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
+
use tui::ui::widget::input::{TextField, TextFieldProps};
+
use tui::ui::widget::text::{Paragraph, ParagraphProps};
+
use tui::ui::widget::{Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget};
use tui::Selection;

use crate::tui_issue::common::IssueOperation;
@@ -120,7 +118,7 @@ impl<'a> Widget<State, Action> for ListPage<'a> {
impl<'a> Render<()> for ListPage<'a> {
    fn render<B: Backend>(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) {
        let area = frame.size();
-
        let layout = tui::flux::ui::layout::default_page(area, 0u16, 1u16);
+
        let layout = tui::ui::layout::default_page(area, 0u16, 1u16);

        let shortcuts = if self.props.show_search {
            vec![
modified bin/commands/patch.rs
@@ -11,8 +11,8 @@ use radicle::identity::RepoId;
use radicle::patch::Status;
use radicle_tui as tui;

-
use tui::common::cob::patch::{self, Filter};
-
use tui::common::log;
+
use tui::cob::patch::{self, Filter};
+
use tui::log;

use crate::terminal;
use crate::terminal::args::{Args, Error, Help};
modified bin/commands/patch/select.rs
@@ -9,11 +9,11 @@ use radicle::Profile;

use radicle_tui as tui;

-
use tui::common::cob::patch::{self, Filter};
-
use tui::flux::store;
-
use tui::flux::task::{self, Interrupted};
-
use tui::flux::ui::items::PatchItem;
-
use tui::flux::ui::Frontend;
+
use tui::cob::patch::{self, Filter};
+
use tui::store;
+
use tui::task::{self, Interrupted};
+
use tui::ui::items::PatchItem;
+
use tui::ui::Frontend;
use tui::Exit;

use ui::ListPage;
modified bin/commands/patch/select/ui.rs
@@ -15,14 +15,12 @@ use radicle::patch::{self, Status};

use radicle_tui as tui;

-
use tui::flux::ui::items::{PatchItem, PatchItemFilter};
-
use tui::flux::ui::span;
-
use tui::flux::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
-
use tui::flux::ui::widget::input::{TextField, TextFieldProps};
-
use tui::flux::ui::widget::text::{Paragraph, ParagraphProps};
-
use tui::flux::ui::widget::{
-
    Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget,
-
};
+
use tui::ui::items::{PatchItem, PatchItemFilter};
+
use tui::ui::span;
+
use tui::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};
+
use tui::ui::widget::input::{TextField, TextFieldProps};
+
use tui::ui::widget::text::{Paragraph, ParagraphProps};
+
use tui::ui::widget::{Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget};
use tui::Selection;

use crate::tui_patch::common::Mode;
@@ -122,7 +120,7 @@ impl<'a> Widget<State, Action> for ListPage<'a> {
impl<'a> Render<()> for ListPage<'a> {
    fn render<B: Backend>(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) {
        let area = frame.size();
-
        let layout = tui::flux::ui::layout::default_page(area, 0u16, 1u16);
+
        let layout = tui::ui::layout::default_page(area, 0u16, 1u16);

        let shortcuts = if self.props.show_search {
            vec![