0f31228 tui: Introduce subscription module — radicle-tui

Radicle terminal user interface

tui: Introduce subscription module

Erik Kundt committed 3 years ago

commit 0f31228dadbd7685bef6f78e8c5a11dcb098a4a0
parent a1d29ba7946593ddf9480e2c5c71f42ed26e8eda

3 files changed +42 -26

modified radicle-tui/src/app.rs

@@ -5,13 +5,10 @@ use anyhow::Result;

 use tui_realm_stdlib::Phantom;
 use tuirealm::application::PollStrategy;
 use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection};
 use tuirealm::event::{Event, Key, KeyEvent, KeyModifiers};
 use tuirealm::event::{Event, Key, KeyEvent};
 use tuirealm::props::{AttrValue, Attribute};
 use tuirealm::tui::layout::{Constraint, Direction, Layout};
 use tuirealm::{
     Application, Component, Frame, MockComponent, NoUserEvent, State, StateValue, Sub, SubClause,
     SubEventClause,
 };
 use tuirealm::{Application, Component, Frame, MockComponent, NoUserEvent, State, StateValue};
 use radicle_tui::cob::patch::{self};

@@ -23,6 +20,8 @@ use radicle_tui::ui::components::workspace::Browser;

 use radicle_tui::ui::theme;
 use radicle_tui::ui::widget::Widget;
 use radicle_tui::subs;
 use radicle_tui::Tui;
 use radicle::cob::patch::{Patch, PatchId};

@@ -83,6 +82,8 @@ impl Tui<ComponentId, Message> for App {

         let issue_browser = Box::<Phantom>::default();
         let patch_browser = ui::patch_browser(&theme, &self.patches, &self.profile).to_boxed();
         let global_listener = ui::global_listener().to_boxed();
         let shortcuts = ui::shortcuts(
             &theme,
             vec![

@@ -95,19 +96,7 @@ impl Tui<ComponentId, Message> for App {

         app.mount(
             ComponentId::Navigation,
             navigation,
             vec![Sub::new(
                 SubEventClause::Keyboard(KeyEvent {
                     code: Key::Tab,
                     modifiers: KeyModifiers::NONE,
                 }),
                 SubClause::and(
                     SubClause::IsMounted(ComponentId::Dashboard),
                     SubClause::and(
                         SubClause::IsMounted(ComponentId::IssueBrowser),
                         SubClause::IsMounted(ComponentId::PatchBrowser),
                     ),
                 ),
             )],
             vec![subs::navigation()],
         )?;
         app.mount(ComponentId::Dashboard, dashboard, vec![])?;

@@ -119,14 +108,8 @@ impl Tui<ComponentId, Message> for App {

         // Add global key listener and subscribe to key events
         app.mount(
             ComponentId::GlobalListener,
             ui::global_listener().to_boxed(),
             vec![Sub::new(
                 SubEventClause::Keyboard(KeyEvent {
                     code: Key::Char('q'),
                     modifiers: KeyModifiers::NONE,
                 }),
                 SubClause::Always,
             )],
             global_listener,
             vec![subs::global()],
         )?;
         // We need to give focus to a component then

modified radicle-tui/src/lib.rs

@@ -8,6 +8,7 @@ use tuirealm::Frame;

 use tuirealm::{Application, EventListenerCfg, NoUserEvent};
 pub mod cob;
 pub mod subs;
 pub mod ui;
 /// Trait that must be implemented by client applications in order to be run

added radicle-tui/src/subs.rs

@@ -0,0 +1,32 @@

 use std::hash::Hash;
 use tuirealm::event::{Key, KeyEvent, KeyModifiers};
 use tuirealm::{Sub, SubClause, SubEventClause};
 pub fn navigation<Id, UserEvent>() -> Sub<Id, UserEvent>
 where
     Id: Clone + Hash + Eq + PartialEq,
     UserEvent: Clone + Eq + PartialEq + PartialOrd,
 {
     Sub::new(
         SubEventClause::Keyboard(KeyEvent {
             code: Key::Tab,
             modifiers: KeyModifiers::NONE,
         }),
         SubClause::Always,
     )
 }
 pub fn global<Id, UserEvent>() -> Sub<Id, UserEvent>
 where
     Id: Clone + Hash + Eq + PartialEq,
     UserEvent: Clone + Eq + PartialEq + PartialOrd,
 {
     Sub::new(
         SubEventClause::Keyboard(KeyEvent {
             code: Key::Char('q'),
             modifiers: KeyModifiers::NONE,
         }),
         SubClause::Always,
     )
 }