From 0ed6bd30f170948c1bb1804d6875ce58e565cbe6 Mon Sep 17 00:00:00 2001
From: ChristianVisintin <christian.visintin1997@gmail.com>
Date: Sun, 6 Dec 2020 18:06:42 +0100
Subject: [PATCH] Fixed help popup

---
 .../filetransfer_activity/layout.rs           | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/src/ui/activities/filetransfer_activity/layout.rs b/src/ui/activities/filetransfer_activity/layout.rs
index e22a44d..c5a5dfc 100644
--- a/src/ui/activities/filetransfer_activity/layout.rs
+++ b/src/ui/activities/filetransfer_activity/layout.rs
@@ -129,10 +129,9 @@ impl FileTransferActivity {
                         self.draw_popup_wait(txt.clone(), popup_area.width),
                         popup_area,
                     ),
-                    PopupType::YesNo(txt, _, _) => f.render_widget(
-                        self.draw_popup_yesno(txt.clone()),
-                        popup_area,
-                    ),
+                    PopupType::YesNo(txt, _, _) => {
+                        f.render_widget(self.draw_popup_yesno(txt.clone()), popup_area)
+                    }
                 }
             }
         });
@@ -411,11 +410,7 @@ impl FileTransferActivity {
             DialogYesNoOption::No => 1,
         };
         Tabs::new(choices)
-            .block(
-                Block::default()
-                    .borders(Borders::ALL)
-                    .title(text),
-            )
+            .block(Block::default().borders(Borders::ALL).title(text))
             .select(index)
             .style(Style::default())
             .highlight_style(
@@ -435,8 +430,7 @@ impl FileTransferActivity {
                 Span::styled(
                     "<ESC>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("           "),
@@ -446,19 +440,27 @@ impl FileTransferActivity {
                 Span::styled(
                     "<TAB>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("           "),
-                Span::raw("change input field"),
+                Span::raw("Switch between log tab and explorer"),
+            ])),
+            ListItem::new(Spans::from(vec![
+                Span::styled(
+                    "<BACKSPACE>",
+                    Style::default()
+                        .fg(Color::Cyan)
+                        .add_modifier(Modifier::BOLD),
+                ),
+                Span::raw("     "),
+                Span::raw("Go to previous directory in stack"),
             ])),
             ListItem::new(Spans::from(vec![
                 Span::styled(
                     "<RIGHT/LEFT>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("    "),
@@ -468,8 +470,7 @@ impl FileTransferActivity {
                 Span::styled(
                     "<UP/DOWN>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("       "),
@@ -479,8 +480,7 @@ impl FileTransferActivity {
                 Span::styled(
                     "<PGUP/PGDOWN>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("   "),
@@ -490,8 +490,7 @@ impl FileTransferActivity {
                 Span::styled(
                     "<ENTER>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("         "),
@@ -501,19 +500,27 @@ impl FileTransferActivity {
                 Span::styled(
                     "<SPACE>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("         "),
                 Span::raw("upload/download file"),
             ])),
+            ListItem::new(Spans::from(vec![
+                Span::styled(
+                    "<CANC>",
+                    Style::default()
+                        .fg(Color::Cyan)
+                        .add_modifier(Modifier::BOLD),
+                ),
+                Span::raw("          "),
+                Span::raw("delete file"),
+            ])),
             ListItem::new(Spans::from(vec![
                 Span::styled(
                     "<CTRL+D>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("        "),
@@ -523,19 +530,27 @@ impl FileTransferActivity {
                 Span::styled(
                     "<CTRL+G>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("        "),
                 Span::raw("goto path"),
             ])),
+            ListItem::new(Spans::from(vec![
+                Span::styled(
+                    "<CTRL+H>",
+                    Style::default()
+                        .fg(Color::Cyan)
+                        .add_modifier(Modifier::BOLD),
+                ),
+                Span::raw("        "),
+                Span::raw("show help"),
+            ])),
             ListItem::new(Spans::from(vec![
                 Span::styled(
                     "<CTRL+Q>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("        "),
@@ -545,8 +560,7 @@ impl FileTransferActivity {
                 Span::styled(
                     "<CTRL+R>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("        "),
@@ -556,24 +570,12 @@ impl FileTransferActivity {
                 Span::styled(
                     "<CTRL+U>",
                     Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
+                        .fg(Color::Cyan)
                         .add_modifier(Modifier::BOLD),
                 ),
                 Span::raw("        "),
                 Span::raw("go to parent directory"),
             ])),
-            ListItem::new(Spans::from(vec![
-                Span::styled(
-                    "<CANC>",
-                    Style::default()
-                        .bg(Color::Cyan)
-                        .fg(Color::White)
-                        .add_modifier(Modifier::BOLD),
-                ),
-                Span::raw("          "),
-                Span::raw("delete file"),
-            ])),
         ];
         List::new(cmds)
             .block(