Skip to content

Refacto #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vimlinuz merged 14 commits into from
Feb 18, 2026
Merged

Refacto #32

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8cf63b0
dry
vimlinuz Feb 17, 2026
99f6cbd
mod
vimlinuz Feb 17, 2026
d196e52
removed redundent option as it as there by default
vimlinuz Feb 17, 2026
605baf6
update docs
vimlinuz Feb 17, 2026
045a30d
fix: typo
vimlinuz Feb 17, 2026
6f2d489
disconnection status returned
vimlinuz Feb 17, 2026
cd1b2d9
refacto: delete handling mappings
vimlinuz Feb 18, 2026
e02f6b8
refacto: handle delete confirmation key mappings
vimlinuz Feb 18, 2026
b706285
refacto: help handler key maps
vimlinuz Feb 18, 2026
0de8576
refacto: update the keys for saved connection handler
vimlinuz Feb 18, 2026
513e02b
refacto: update password handler key maps
vimlinuz Feb 18, 2026
3e14fe5
refacto: update ssid handler keymaps
vimlinuz Feb 18, 2026
7fe30d9
refacto: update status handler keymap
vimlinuz Feb 18, 2026
1a04e6c
fix: typo
vimlinuz Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/apps/core/delete_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use super::App;
use crate::utils::delete_connection::delete_connection;
use crate::utils::scan::scan_networks;

use crossterm::event::KeyEventKind::Press;
use crossterm::event::{self, Event, KeyCode, KeyEvent, poll};
use std::io;
use std::time::Duration;
Expand Down Expand Up @@ -31,57 +30,49 @@ impl App {
match event::read()? {
Event::Key(KeyEvent {
code: KeyCode::Enter,
kind: Press,
..
}) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('Y'),
kind: Press,
..
}) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('y'),
kind: Press,
..
}) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('N'),
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('n'),
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('c'),
kind: Press,

modifiers: event::KeyModifiers::CONTROL,
..
}) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Esc,
kind: Press,
..
code: KeyCode::Esc, ..
}) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('q'),
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
Expand Down
21 changes: 2 additions & 19 deletions src/apps/core/event_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use super::App;
use crate::utils::scan::scan_networks;

use crossterm::event::KeyEventKind::Press;
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers, poll};
use std::io;
use std::time::Duration;
Expand Down Expand Up @@ -31,88 +30,74 @@ impl App {
match event::read()? {
Event::Key(KeyEvent {
code: KeyCode::Char('h'),
kind: Press,
..
}) => {
self.flags.show_help = true;
}

Event::Key(KeyEvent {
code: KeyCode::Char('?'),
kind: Press,
..
}) => {
self.flags.show_help = true;
}
Event::Key(KeyEvent {
code: KeyCode::Esc,
kind: Press,
..
code: KeyCode::Esc, ..
}) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Char('c'),
modifiers: KeyModifiers::CONTROL,
kind: Press,
..
}) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Char('r'),
modifiers: KeyModifiers::CONTROL,
kind: Press,
..
}) => {
scan_networks(self.wifi_list.clone(), self.flags.is_scanning.clone());
}
Event::Key(KeyEvent {
code: KeyCode::Enter,
kind: Press,
..
}) => {
self.prepare_to_connect();
}
Event::Key(KeyEvent {
code: KeyCode::Char('o'),
kind: Press,
..
}) => {
self.prepare_to_connect();
}
Event::Key(KeyEvent {
code: KeyCode::Up,
kind: Press,
..
code: KeyCode::Up, ..
}) => {
self.update_selected_network(-1);
}
Event::Key(KeyEvent {
code: KeyCode::Down,
kind: Press,
..
}) => {
self.update_selected_network(1);
}
// vim style
Event::Key(KeyEvent {
code: KeyCode::Char('k'),
kind: Press,
..
}) => {
self.update_selected_network(-1);
}
Event::Key(KeyEvent {
code: KeyCode::Char('j'),
kind: Press,
..
}) => {
self.update_selected_network(1);
}
Event::Key(KeyEvent {
code: KeyCode::Char('d'),
kind: Press,
..
}) => {
if self
Expand All @@ -126,14 +111,12 @@ impl App {
}
Event::Key(KeyEvent {
code: KeyCode::Char('s'),
kind: Press,
..
}) => {
self.open_saved_list();
}
Event::Key(KeyEvent {
code: KeyCode::Char('x'),
kind: Press,
..
}) => {
self.disconnect();
Expand Down
5 changes: 1 addition & 4 deletions src/apps/core/help_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,25 @@ impl App {
match event::read()? {
Event::Key(KeyEvent {
code: event::KeyCode::Esc,
kind: event::KeyEventKind::Press,
..
}) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Enter,
kind: event::KeyEventKind::Press,
..
}) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('q'),
kind: event::KeyEventKind::Press,
..
}) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('c'),
kind: event::KeyEventKind::Press,

modifiers: event::KeyModifiers::CONTROL,
..
}) => {
Expand Down
13 changes: 2 additions & 11 deletions src/apps/core/saved_connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,29 +87,26 @@ impl App {
match event::read()? {
Event::Key(KeyEvent {
code: event::KeyCode::Char('q'),
kind: event::KeyEventKind::Press,
..
}) => {
self.close_saved_list();
}
Event::Key(KeyEvent {
code: event::KeyCode::Esc,
kind: event::KeyEventKind::Press,
..
}) => {
self.close_saved_list();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('c'),
kind: event::KeyEventKind::Press,

modifiers: event::KeyModifiers::CONTROL,
..
}) => {
self.exit();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('d'),
kind: event::KeyEventKind::Press,
..
}) => {
// this will evaluate to run the delete confirmation dialog from the core ui
Expand All @@ -118,49 +115,43 @@ impl App {

Event::Key(KeyEvent {
code: event::KeyCode::Char('j'),
kind: event::KeyEventKind::Press,
..
}) => {
self.update_selected_saved_network(1);
}
Event::Key(KeyEvent {
code: event::KeyCode::Down,
kind: event::KeyEventKind::Press,
..
}) => {
self.update_selected_saved_network(1);
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('k'),
kind: event::KeyEventKind::Press,
..
}) => {
self.update_selected_saved_network(-1);
}
Event::Key(KeyEvent {
code: event::KeyCode::Up,
kind: event::KeyEventKind::Press,
..
}) => {
self.update_selected_saved_network(-1);
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('h'),
kind: event::KeyEventKind::Press,
..
}) => {
self.flags.show_help = true;
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('?'),
kind: event::KeyEventKind::Press,
..
}) => {
self.flags.show_help = true;
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('r'),
kind: event::KeyEventKind::Press,

modifiers: event::KeyModifiers::CONTROL,
..
}) => {
Expand Down
11 changes: 2 additions & 9 deletions src/apps/handlers/password_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::WifiInputState;
use super::utils::{delete_char, enter_char, move_cursor_right};
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind::Press, poll};
use crossterm::event::{self, Event, KeyCode, KeyEvent, poll};
use std::io;
use std::time::Duration;

Expand All @@ -10,22 +10,18 @@ impl WifiInputState {
match event::read()? {
Event::Key(KeyEvent {
code: KeyCode::Left,
kind: Press,
..
}) => {
self.move_cursor_left();
}
Event::Key(KeyEvent {
code: KeyCode::Right,
kind: Press,
..
}) => {
move_cursor_right(&self.password, &mut self.cursor_pos);
}
Event::Key(KeyEvent {
code: KeyCode::Esc,
kind: Press,
..
code: KeyCode::Esc, ..
}) => {
// if we go back from password input, we should show the ssid popup again
// with the cursor at the end of the ssid
Expand All @@ -37,23 +33,20 @@ impl WifiInputState {
}
Event::Key(KeyEvent {
code: KeyCode::Char(c),
kind: Press,
..
}) => {
enter_char(&mut self.password, c, &self.cursor_pos);
move_cursor_right(&self.password, &mut self.cursor_pos);
}
Event::Key(KeyEvent {
code: KeyCode::Backspace,
kind: Press,
..
}) => {
delete_char(&mut self.password, &mut self.cursor_pos);
self.move_cursor_left()
}
Event::Key(KeyEvent {
code: KeyCode::Enter,
kind: Press,
..
}) => {
if self.password.is_empty() || self.password.chars().count() >= 8 {
Expand Down
Loading
Loading