diff --git a/src/ui/entryBox.rs b/src/ui/entryBox.rs index 581eae0..fddcd4c 100644 --- a/src/ui/entryBox.rs +++ b/src/ui/entryBox.rs @@ -3,7 +3,7 @@ use ratatui::{ widgets::{Block, Borders}, }; -pub fn entryBox(title: String) -> Block<'static> { +pub fn entryBox<'a>(title: &'a str) -> Block<'a> { Block::default() .title(title) .borders(Borders::ALL) diff --git a/src/ui/entryTable.rs b/src/ui/entryTable.rs index 0ca7142..fa03c5e 100644 --- a/src/ui/entryTable.rs +++ b/src/ui/entryTable.rs @@ -9,12 +9,12 @@ use ratatui::{ widgets::{Block, Borders, Cell, Row, Table}, }; -pub fn getTableElement( - entries: &[Entry], +pub fn getTableElement<'a>( + entries: &'a [Entry], curScreen: &CurrentScreen, appStatus: &AppStatus, isHashDifferent: bool, -) -> Table<'static> { +) -> Table<'a> { let headers = ["No.", "From IP", "From Port", "-->", "To IP", "To Port"] .into_iter() .map(Cell::from) diff --git a/src/ui/exitPrompt.rs b/src/ui/exitPrompt.rs index de93a67..c77aaaa 100644 --- a/src/ui/exitPrompt.rs +++ b/src/ui/exitPrompt.rs @@ -4,7 +4,7 @@ use ratatui::{ widgets::{Block, Borders, Paragraph, Wrap}, }; -pub fn getExitPara() -> Paragraph<'static> { +pub fn getExitPara<'a>() -> Paragraph<'a> { let exitPopup = Block::default() .title("Exit Window") .borders(Borders::ALL) diff --git a/src/ui/header.rs b/src/ui/header.rs index 2007c36..220e370 100644 --- a/src/ui/header.rs +++ b/src/ui/header.rs @@ -5,7 +5,7 @@ use ratatui::{ use crate::app::status::{AppStatus, CurrentScreen, EditingField, EntryValError}; -pub fn getHeaderScreen(scr: &CurrentScreen) -> (Color, Span<'static>) { +pub fn getHeaderScreen<'a>(scr: &'a CurrentScreen) -> (Color, Span<'a>) { match scr { CurrentScreen::Main => ( Color::LightBlue, @@ -30,7 +30,10 @@ pub fn getHeaderScreen(scr: &CurrentScreen) -> (Color, Span<'static>) { } } -pub fn getHeaderStatus(status: &AppStatus, editingField: &Option) -> Span<'static> { +pub fn getHeaderStatus<'a>( + status: &'a AppStatus, + editingField: &'a Option, +) -> Span<'a> { match status { AppStatus::Welcome => Span::styled("Welcome", Style::default().fg(Color::White)), AppStatus::Added => Span::styled("Added", Style::default().fg(Color::Green)), diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 62d0bb8..5816a7d 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -94,10 +94,10 @@ pub fn ui(frame: &mut Frame, app: &mut AppState) { ]) .split(area); - let mut fromIPBlock = entryBox::entryBox("From IP".to_string()); - let mut toIPBlock = entryBox::entryBox("To IP".to_string()); - let mut fromPortBlock = entryBox::entryBox("From Port".to_string()); - let mut toPortBlock = entryBox::entryBox("To Port".to_string()); + let mut fromIPBlock = entryBox::entryBox("From IP"); + let mut toIPBlock = entryBox::entryBox("To IP"); + let mut fromPortBlock = entryBox::entryBox("From Port"); + let mut toPortBlock = entryBox::entryBox("To Port"); let activeStyle = Style::default().bg(Color::LightYellow).fg(Color::Black); match edit {