remove help popup

Author: pythops

src/access_point.rs renamed to src/ap.rs

@@ -18,7 +18,7 @@ use async_channel::{Receiver, Sender};
 use futures::FutureExt;
 use iwdrs::{agent::Agent, modes::Mode, session::Session};
 
-use crate::{adapter::Adapter, event::Event, help::Help, notification::Notification};
+use crate::{adapter::Adapter, event::Event, notification::Notification};
 
 pub type AppResult<T> = std::result::Result<T, Box<dyn Error>>;
 
@@ -29,7 +29,6 @@ pub enum FocusedBlock {
     AccessPoint,
     KnownNetworks,
     NewNetworks,
-    Help,
     AuthKey,
     AdapterInfos,
     AccessPointInput,
@@ -46,7 +45,6 @@ pub enum ColorMode {
 pub struct App {
     pub running: bool,
     pub focused_block: FocusedBlock,
-    pub help: Help,
     pub color_mode: ColorMode,
     pub notifications: Vec<Notification>,
     pub session: Arc<Session>,
@@ -91,7 +89,7 @@ pub async fn request_confirmation(
 }
 
 impl App {
-    pub async fn new(help: Help, mode: Mode, sender: UnboundedSender<Event>) -> AppResult<Self> {
+    pub async fn new(mode: Mode, sender: UnboundedSender<Event>) -> AppResult<Self> {
         let session = {
             match iwdrs::session::Session::new().await {
                 Ok(session) => Arc::new(session),
@@ -144,7 +142,6 @@ impl App {
         Ok(Self {
             running: true,
             focused_block: FocusedBlock::Device,
-            help,
             color_mode,
             notifications: Vec::new(),
             session,

src/app.rs

@@ -5,8 +5,7 @@ use iwdrs::{device::Device as iwdDevice, modes::Mode, session::Session};
 use tokio::sync::mpsc::UnboundedSender;
 
 use crate::{
-    access_point::AccessPoint, app::AppResult, event::Event, notification::Notification,
-    station::Station,
+    ap::AccessPoint, app::AppResult, event::Event, notification::Notification, station::Station,
 };
 
 #[derive(Debug, Clone)]

src/device.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::access_point::APFocusedSection;
+use crate::ap::APFocusedSection;
 use crate::app::{App, AppResult, FocusedBlock};
 use crate::config::Config;
 use crate::event::Event;
@@ -119,23 +119,16 @@ pub async fn handle_key_events(
                     }
                 }
 
-                // Show help
-                KeyCode::Char('?') => {
-                    app.focused_block = FocusedBlock::Help;
-                }
-
                 // Switch mode
                 KeyCode::Char(c)
                     if c == config.switch && key_event.modifiers == KeyModifiers::CONTROL =>
                 {
                     app.reset_mode = true;
                 }
 
-                // Discard help popup
+                // Discard  popup
                 KeyCode::Esc => {
-                    if app.focused_block == FocusedBlock::Help
-                        || app.focused_block == FocusedBlock::AdapterInfos
-                    {
+                    if app.focused_block == FocusedBlock::AdapterInfos {
                         app.focused_block = FocusedBlock::Device;
                     }
                 }
@@ -645,9 +638,6 @@ pub async fn handle_key_events(
                                                     }
                                                 }
 
-                                                FocusedBlock::Help => {
-                                                    app.help.scroll_down();
-                                                }
                                                 _ => {}
                                             }
                                         }
@@ -718,9 +708,6 @@ pub async fn handle_key_events(
                                                         .select(Some(i));
                                                 }
                                             }
-                                            FocusedBlock::Help => {
-                                                app.help.scroll_up();
-                                            }
                                             _ => {}
                                         },
                                         _ => {}
@@ -741,19 +728,6 @@ pub async fn handle_key_events(
                                         }
                                     }
 
-                                    // Scroll down
-                                    KeyCode::Char('j') | KeyCode::Down => {
-                                        if app.focused_block == FocusedBlock::Help {
-                                            app.help.scroll_down();
-                                        }
-                                    }
-
-                                    KeyCode::Char('k') | KeyCode::Up => {
-                                        if app.focused_block == FocusedBlock::Help {
-                                            app.help.scroll_up();
-                                        }
-                                    }
-
                                     _ => {}
                                 },
                                 _ => {}

src/handler.rs

@@ -12,8 +12,6 @@ pub mod config;
 
 pub mod notification;
 
-pub mod help;
-
 pub mod device;
 
 pub mod station;
@@ -26,7 +24,7 @@ pub mod auth;
 
 pub mod adapter;
 
-pub mod access_point;
+pub mod ap;
 
 pub mod cli;
 

src/help.rs

@@ -2,7 +2,6 @@ use impala::app::{App, AppResult};
 use impala::config::Config;
 use impala::event::{Event, EventHandler};
 use impala::handler::handle_key_events;
-use impala::help::Help;
 use impala::tui::Tui;
 use impala::{cli, rfkill};
 use iwdrs::modes::Mode;
@@ -19,8 +18,6 @@ async fn main() -> AppResult<()> {
 
     let config = Arc::new(Config::new());
 
-    let help = Help::new(&config.clone());
-
     let backend = CrosstermBackend::new(io::stdout());
     let terminal = Terminal::new(backend)?;
     let events = EventHandler::new(2_000);
@@ -39,7 +36,7 @@ async fn main() -> AppResult<()> {
         tui.exit()?;
     }
 
-    let mut app = App::new(help.clone(), mode, tui.events.sender.clone()).await?;
+    let mut app = App::new(mode, tui.events.sender.clone()).await?;
 
     while app.running {
         tui.draw(&mut app)?;
@@ -64,7 +61,7 @@ async fn main() -> AppResult<()> {
                 {
                     tui.exit()?;
                 }
-                app = App::new(help.clone(), mode, tui.events.sender.clone()).await?;
+                app = App::new(mode, tui.events.sender.clone()).await?;
             }
             _ => {}
         }

src/lib.rs

@@ -32,11 +32,6 @@ pub fn render(app: &mut App, frame: &mut Frame) {
             ap.render_input(frame);
         }
 
-        // Help
-        if let FocusedBlock::Help = app.focused_block {
-            app.help.render(frame, app.color_mode);
-        }
-
         // Notifications
         for (index, notification) in app.notifications.iter().enumerate() {
             notification.render(index, frame);