Radish alpha
r
radicle-tui
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
Patches › 0d35500e
all: Improve selection footer
Merged did:key:z6MkgFq6...nBGz opened 2 years ago

patch: Remove filter icon and faint stats divider

issue: Remove filter icon and faint stats divider

Activity Changes +20 -28
2 files changed +20 -28 6cbca940 → 187586c5
modified bin/commands/issue/flux/select/ui.rs
@@ -16,6 +16,7 @@ use radicle_tui as tui;
use tui::common::cob::issue::Filter;

use tui::flux::ui::cob::IssueItem;

use tui::flux::ui::span;
+ 
use tui::flux::ui::theme::style;

use tui::flux::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};

use tui::flux::ui::widget::{

    Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget,
@@ -301,24 +302,19 @@ impl Render<()> for Issues {
            Constraint::Length(16),

        ];
- 
        let filter = if !self.props.filter.to_string().is_empty() {
- 
            Line::from(
- 
                [
- 
                    span::badge("▼".to_string()),
- 
                    span::default(" ".to_string()),
- 
                    span::default(self.props.filter.to_string()).magenta().dim(),
- 
                ]
- 
                .to_vec(),
- 
            )
- 
        } else {
- 
            Line::from([span::blank()].to_vec())
- 
        };
+ 
        let filter = Line::from(
+ 
            [
+ 
                span::default(" ".to_string()),
+ 
                span::default(self.props.filter.to_string()).magenta().dim(),
+ 
            ]
+ 
            .to_vec(),
+ 
        );



        let stats = Line::from(

            [

                span::positive(self.props.stats.get("Open").unwrap_or(&0).to_string()).dim(),

                span::default(" Open".to_string()).dim(),
- 
                span::default(" | ".to_string()).dim(),
+ 
                span::default(" | ".to_string()).style(style::border(false)),

                span::default(self.props.stats.get("Closed").unwrap_or(&0).to_string())

                    .magenta()

                    .dim(),
modified bin/commands/patch/flux/select/ui.rs
@@ -18,6 +18,7 @@ use radicle_tui as tui;
use tui::common::cob::patch::Filter;

use tui::flux::ui::cob::PatchItem;

use tui::flux::ui::span;
+ 
use tui::flux::ui::theme::style;

use tui::flux::ui::widget::container::{Footer, FooterProps, Header, HeaderProps};

use tui::flux::ui::widget::{

    Render, Shortcut, Shortcuts, ShortcutsProps, Table, TableProps, Widget,
@@ -369,32 +370,27 @@ impl Render<()> for Patches {
            },

        );
- 
        let filter = if !self.props.filter.to_string().is_empty() {
- 
            Line::from(
- 
                [
- 
                    span::badge("▼".to_string()),
- 
                    span::default(" ".to_string()),
- 
                    span::default(self.props.filter.to_string()).magenta().dim(),
- 
                ]
- 
                .to_vec(),
- 
            )
- 
        } else {
- 
            Line::from([span::blank()].to_vec())
- 
        };
+ 
        let filter = Line::from(
+ 
            [
+ 
                span::default(" ".to_string()),
+ 
                span::default(self.props.filter.to_string()).magenta().dim(),
+ 
            ]
+ 
            .to_vec(),
+ 
        );



        let stats = Line::from(

            [

                span::default(self.props.stats.get("Draft").unwrap_or(&0).to_string()).dim(),

                span::default(" Draft".to_string()).dim(),
- 
                span::default(" | ".to_string()).dim(),
+ 
                span::default(" | ".to_string()).style(style::border(false)),

                span::positive(self.props.stats.get("Open").unwrap_or(&0).to_string()).dim(),

                span::default(" Open".to_string()).dim(),
- 
                span::default(" | ".to_string()).dim(),
+ 
                span::default(" | ".to_string()).style(style::border(false)),

                span::default(self.props.stats.get("Merged").unwrap_or(&0).to_string())

                    .magenta()

                    .dim(),

                span::default(" Merged".to_string()).dim(),
- 
                span::default(" | ".to_string()).dim(),
+ 
                span::default(" | ".to_string()).style(style::border(false)),

                span::default(self.props.stats.get("Archived").unwrap_or(&0).to_string())

                    .yellow()

                    .dim(),