ad info popup (not showing)

oryx-tui/src/lib.rs

@@ -31,6 +31,7 @@ pub mod export;
 pub mod bandwidth;
 
 pub mod packets {
+    pub mod info;
     pub mod link;
     pub mod network;
     pub mod packet;

oryx-tui/src/packets/info.rs

@@ -0,0 +1,67 @@
+use crossterm::event::{KeyCode, KeyEvent};
+use ratatui::{
+    layout::{Alignment, Constraint, Direction, Layout},
+    style::{Style, Stylize},
+    widgets::{Block, BorderType, Borders, Clear},
+    Frame,
+};
+
+use crate::app::App;
+
+use super::packet::AppPacket;
+
+pub struct PacketInfo {}
+impl PacketInfo {
+    pub fn render(frame: &mut Frame, app: &mut App) {
+        let layout = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Fill(1),
+                Constraint::Length(36),
+                Constraint::Fill(1),
+            ])
+            .flex(ratatui::layout::Flex::SpaceBetween)
+            .split(frame.area());
+
+        let block = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([
+                Constraint::Fill(1),
+                Constraint::Max(80),
+                Constraint::Fill(1),
+            ])
+            .flex(ratatui::layout::Flex::SpaceBetween)
+            .split(layout[1])[1];
+
+        let fuzzy = app.fuzzy.lock().unwrap();
+        let packets = app.packets.lock().unwrap();
+
+        let packet = if fuzzy.is_enabled() {
+            fuzzy.packets[app.packet_index.unwrap()]
+        } else {
+            packets[app.packet_index.unwrap()]
+        };
+
+        frame.render_widget(Clear, block);
+        frame.render_widget(
+            Block::new()
+                .title(" Packet Infos 󰋼  ")
+                .title_style(Style::new().bold().green())
+                .title_alignment(Alignment::Center)
+                .borders(Borders::all())
+                .border_style(Style::new().green())
+                .border_type(BorderType::Thick),
+            block,
+        );
+        match packet {
+            AppPacket::Ip(ip_packet) => ip_packet.render(block, frame),
+            AppPacket::Arp(arp_packet) => arp_packet.render(block, frame),
+        };
+    }
+    pub fn handle_key_events(&mut self, key_event: KeyEvent, app: &mut App) {
+        match key_event.code {
+            KeyCode::Esc => app.phase.popup = None,
+            _ => {}
+        }
+    }
+}

oryx-tui/src/popup.rs

@@ -1,23 +1,26 @@
 use ratatui::{layout::Rect, Frame};
 
-use crate::app::App;
+use crate::{app::App, packets::info::PacketInfo};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum PopupEnum {
     Help,
     FilterUpdate,
+    PacketInfo,
 }
 impl PopupEnum {
     pub fn render(&self, frame: &mut Frame, _: Rect, app: &mut App) {
         match self {
             PopupEnum::Help => app.help.render(frame),
             PopupEnum::FilterUpdate => app.filter_update.clone().render(frame, app),
+            PopupEnum::PacketInfo => PacketInfo::render(frame, app),
         }
     }
     pub fn handle_key_events(&mut self, key_event: crossterm::event::KeyEvent, app: &mut App) {
         match self {
             PopupEnum::Help => app.help.clone().handle_key_events(key_event, app),
             PopupEnum::FilterUpdate => app.filter_update.clone().handle_key_events(key_event, app),
+            _ => {}
         }
     }
 }

oryx-tui/src/sections/section.rs

@@ -15,8 +15,8 @@ use ratatui::{
     style::{Color, Style, Stylize},
     text::{Line, Span},
     widgets::{
-        Block, BorderType, Borders, Cell, Clear, HighlightSpacing, Padding, Paragraph, Row,
-        Scrollbar, ScrollbarOrientation, ScrollbarState, Table,
+        Block, BorderType, Borders, Cell, HighlightSpacing, Padding, Paragraph, Row, Scrollbar,
+        ScrollbarOrientation, ScrollbarState, Table,
     },
     Frame,
 };
@@ -87,7 +87,7 @@ impl Section {
                             match key_event.code {
                                 KeyCode::Char('i') => {
                                     if !app.packet_index.is_none() && !fuzzy.packets.is_empty() {
-                                        app.show_packet_infos_popup = true;
+                                        app.phase.popup = Some(PopupEnum::PacketInfo);
                                     }
                                 }
                                 KeyCode::Char('/') => {
@@ -218,13 +218,7 @@ impl Section {
             app.alert.title_span(*self == Section::Alerts),
         );
         match self {
-            Section::Packet => {
-                self.render_packets_section(frame, section_block, app);
-                // show packet info popup if needed
-                if app.show_packet_infos_popup {
-                    self.render_packet_infos_popup(frame, app);
-                }
-            }
+            Section::Packet => self.render_packets_section(frame, section_block, app),
             Section::Stats => self.render_stats_section(frame, section_block, app),
             Section::Alerts => app.alert.render(frame, section_block),
             Section::Firewall => app.firewall.render(frame, section_block),
@@ -693,51 +687,4 @@ impl Section {
             frame.render_widget(fuzzy, fuzzy_block);
         }
     }
-
-    fn render_packet_infos_popup(&self, frame: &mut Frame, app: &mut App) {
-        let layout = Layout::default()
-            .direction(Direction::Vertical)
-            .constraints([
-                Constraint::Fill(1),
-                Constraint::Length(36),
-                Constraint::Fill(1),
-            ])
-            .flex(ratatui::layout::Flex::SpaceBetween)
-            .split(frame.area());
-
-        let block = Layout::default()
-            .direction(Direction::Horizontal)
-            .constraints([
-                Constraint::Fill(1),
-                Constraint::Max(80),
-                Constraint::Fill(1),
-            ])
-            .flex(ratatui::layout::Flex::SpaceBetween)
-            .split(layout[1])[1];
-
-        let fuzzy = app.fuzzy.lock().unwrap();
-        let packets = app.packets.lock().unwrap();
-
-        let packet = if fuzzy.is_enabled() {
-            fuzzy.packets[app.packet_index.unwrap()]
-        } else {
-            packets[app.packet_index.unwrap()]
-        };
-
-        frame.render_widget(Clear, block);
-        frame.render_widget(
-            Block::new()
-                .title(" Packet Infos 󰋼  ")
-                .title_style(Style::new().bold().green())
-                .title_alignment(Alignment::Center)
-                .borders(Borders::all())
-                .border_style(Style::new().green())
-                .border_type(BorderType::Thick),
-            block,
-        );
-        match packet {
-            AppPacket::Ip(ip_packet) => ip_packet.render(block, frame),
-            AppPacket::Arp(arp_packet) => arp_packet.render(block, frame),
-        };
-    }
 }