Merge branch 'refactor/generate_block' into dev

README.md

@@ -7,7 +7,7 @@
 </p>
 
 <p align="center">
- A simple tui to view and control docker containers
+ A simple tui to view & control docker containers
 </p>
 
 <p align="center">
@@ -55,7 +55,6 @@ available command line arguments
 
 requires docker & <a href='https://github.com/cross-rs/cross' target='_blank' rel='noopener noreferrer'>cross-rs</a>
 
-
 #### 64bit pi (pi 4, pi zero w 2)
 
 ```cross build --target aarch64-unknown-linux-gnu --release```

src/ui/draw_blocks.rs

@@ -42,32 +42,32 @@ const MARGIN: &str = "   ";
 /// Generate block, add a border if is the selected panel,
 /// add custom title based on state of each panel
 fn generate_block<'a>(
-    selectable_panel: Option<SelectablePanel>,
     app_data: &Arc<Mutex<AppData>>,
-    selected_panel: &SelectablePanel,
+    area: Rect,
+    gui_state: &Arc<Mutex<GuiState>>,
+    panel: SelectablePanel,
 ) -> Block<'a> {
+	gui_state.lock().insert_into_area_map(panel, area);
     let mut block = Block::default()
         .borders(Borders::ALL)
         .border_type(BorderType::Rounded);
-
+    let current_selected_panel = gui_state.lock().selected_panel;
-    if let Some(panel) = selectable_panel {
+    let title = match panel {
-        let title = match panel {
+        SelectablePanel::Containers => {
-            SelectablePanel::Containers => {
+            format!(
-                format!(
+                " {} {} ",
-                    " {} {} ",
+                panel.title(),
-                    panel.title(),
+                app_data.lock().containers.get_state_title()
-                    app_data.lock().containers.get_state_title()
+            )
-                )
-            }
-            SelectablePanel::Logs => {
-                format!(" {} {} ", panel.title(), app_data.lock().get_log_title())
-            }
-            _ => String::from(""),
-        };
-        block = block.title(title);
-        if selected_panel == &panel {
-            block = block.border_style(Style::default().fg(Color::LightCyan));
         }
+        SelectablePanel::Logs => {
+            format!(" {} {} ", panel.title(), app_data.lock().get_log_title())
+        }
+        _ => String::from(""),
+    };
+    block = block.title(title);
+    if current_selected_panel == panel {
+        block = block.border_style(Style::default().fg(Color::LightCyan));
     }
     block
 }
@@ -79,13 +79,8 @@ pub fn draw_commands<B: Backend>(
     f: &mut Frame<'_, B>,
     gui_state: &Arc<Mutex<GuiState>>,
     index: Option<usize>,
-    selected_panel: &SelectablePanel,
 ) {
-    let panel = SelectablePanel::Commands;
+    let block = generate_block(app_data, area, gui_state, SelectablePanel::Commands);
-    let block = generate_block(Some(panel), app_data, selected_panel);
-
-    gui_state.lock().insert_into_area_map(panel, area);
-
     if let Some(i) = index {
         let items = app_data.lock().containers.items[i]
             .docker_controls
@@ -125,13 +120,14 @@ pub fn draw_containers<B: Backend>(
     area: Rect,
     f: &mut Frame<'_, B>,
     gui_state: &Arc<Mutex<GuiState>>,
-    selected_panel: &SelectablePanel,
     widths: &Columns,
 ) {
-    let panel = SelectablePanel::Containers;
+    let block = generate_block(
-    let block = generate_block(Some(panel), app_data, selected_panel);
+        app_data,
-
+        area,
-    gui_state.lock().insert_into_area_map(panel, area);
+        gui_state,
+        SelectablePanel::Containers,
+    );
 
     let items = app_data
         .lock()
@@ -216,7 +212,7 @@ pub fn draw_containers<B: Backend>(
     }
 }
 
-/// Draw the selectable panels
+/// Draw the logs panels
 pub fn draw_logs<B: Backend>(
     app_data: &Arc<Mutex<AppData>>,
     area: Rect,
@@ -224,17 +220,16 @@ pub fn draw_logs<B: Backend>(
     gui_state: &Arc<Mutex<GuiState>>,
     index: Option<usize>,
     loading_icon: String,
-    selected_panel: &SelectablePanel,
 ) {
-    let panel = SelectablePanel::Logs;
+    let block = generate_block(
-
+        app_data,
-    gui_state.lock().insert_into_area_map(panel, area);
+        area,
-
+        gui_state,
-    let block = generate_block(Some(panel), app_data, selected_panel);
+        SelectablePanel::Logs,
+    );
 
     let init = app_data.lock().init;
     if !init {
-        // let icon = gui_state.lock().get_loading();
         let parsing_logs = format!("parsing logs {}", loading_icon);
         let paragraph = Paragraph::new(parsing_logs)
             .style(Style::default())

src/ui/mod.rs

@@ -153,7 +153,6 @@ fn ui<B: Backend>(
     let has_containers = !app_data.lock().containers.items.is_empty();
     let has_error = app_data.lock().get_error();
     let log_index = app_data.lock().get_selected_log_index();
-    let selected_panel = gui_state.lock().selected_panel;
     let show_help = gui_state.lock().show_help;
     let info_text = gui_state.lock().info_box_text.clone();
     let loading_icon = gui_state.lock().get_loading();
@@ -197,7 +196,6 @@ fn ui<B: Backend>(
         top_panel[0],
         f,
         gui_state,
-        &selected_panel,
         &column_widths,
     );
 
@@ -208,7 +206,6 @@ fn ui<B: Backend>(
             f,
             gui_state,
             log_index,
-            &selected_panel,
         );
     }
 
@@ -219,7 +216,6 @@ fn ui<B: Backend>(
         gui_state,
         log_index,
         loading_icon.to_owned(),
-        &selected_panel,
     );
 
     draw_heading_bar(