From 300256b196b1927c4966f87717c266a102e64b9c Mon Sep 17 00:00:00 2001
From: veeso <christian.visintin1997@gmail.com>
Date: Sat, 8 May 2021 19:28:47 +0200
Subject: [PATCH] Changed activity paths

---
 src/activity_manager.rs                                   | 4 ++--
 src/ui/activities/{auth_activity => auth}/bookmarks.rs    | 0
 src/ui/activities/{auth_activity => auth}/misc.rs         | 0
 src/ui/activities/{auth_activity => auth}/mod.rs          | 0
 src/ui/activities/{auth_activity => auth}/update.rs       | 2 +-
 src/ui/activities/{auth_activity => auth}/view.rs         | 0
 .../actions/change_dir.rs                                 | 0
 .../actions/copy.rs                                       | 0
 .../actions/delete.rs                                     | 0
 .../actions/edit.rs                                       | 0
 .../actions/exec.rs                                       | 0
 .../actions/find.rs                                       | 0
 .../actions/mkdir.rs                                      | 0
 .../actions/mod.rs                                        | 0
 .../actions/newfile.rs                                    | 0
 .../actions/rename.rs                                     | 0
 .../actions/save.rs                                       | 0
 .../{filetransfer_activity => filetransfer}/browser.rs    | 0
 .../{filetransfer_activity => filetransfer}/misc.rs       | 0
 .../{filetransfer_activity => filetransfer}/mod.rs        | 0
 .../{filetransfer_activity => filetransfer}/session.rs    | 0
 .../{filetransfer_activity => filetransfer}/update.rs     | 2 +-
 .../{filetransfer_activity => filetransfer}/view.rs       | 0
 src/ui/activities/mod.rs                                  | 8 +++-----
 src/ui/activities/{setup_activity => setup}/actions.rs    | 0
 src/ui/activities/{setup_activity => setup}/config.rs     | 0
 src/ui/activities/{setup_activity => setup}/mod.rs        | 0
 src/ui/activities/{setup_activity => setup}/update.rs     | 2 +-
 src/ui/activities/{setup_activity => setup}/view.rs       | 0
 src/ui/{activities => }/keymap.rs                         | 0
 src/ui/mod.rs                                             | 1 +
 31 files changed, 9 insertions(+), 10 deletions(-)
 rename src/ui/activities/{auth_activity => auth}/bookmarks.rs (100%)
 rename src/ui/activities/{auth_activity => auth}/misc.rs (100%)
 rename src/ui/activities/{auth_activity => auth}/mod.rs (100%)
 rename src/ui/activities/{auth_activity => auth}/update.rs (99%)
 rename src/ui/activities/{auth_activity => auth}/view.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/change_dir.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/copy.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/delete.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/edit.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/exec.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/find.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/mkdir.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/mod.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/newfile.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/rename.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/actions/save.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/browser.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/misc.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/mod.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/session.rs (100%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/update.rs (99%)
 rename src/ui/activities/{filetransfer_activity => filetransfer}/view.rs (100%)
 rename src/ui/activities/{setup_activity => setup}/actions.rs (100%)
 rename src/ui/activities/{setup_activity => setup}/config.rs (100%)
 rename src/ui/activities/{setup_activity => setup}/mod.rs (100%)
 rename src/ui/activities/{setup_activity => setup}/update.rs (99%)
 rename src/ui/activities/{setup_activity => setup}/view.rs (100%)
 rename src/ui/{activities => }/keymap.rs (100%)

diff --git a/src/activity_manager.rs b/src/activity_manager.rs
index 3a852c6..7e8f797 100644
--- a/src/activity_manager.rs
+++ b/src/activity_manager.rs
@@ -31,8 +31,8 @@ use crate::host::{HostError, Localhost};
 use crate::system::config_client::ConfigClient;
 use crate::system::environment;
 use crate::ui::activities::{
-    auth_activity::AuthActivity, filetransfer_activity::FileTransferActivity,
-    setup_activity::SetupActivity, Activity, ExitReason,
+    auth::AuthActivity, filetransfer::FileTransferActivity, setup::SetupActivity, Activity,
+    ExitReason,
 };
 use crate::ui::context::{Context, FileTransferParams};
 
diff --git a/src/ui/activities/auth_activity/bookmarks.rs b/src/ui/activities/auth/bookmarks.rs
similarity index 100%
rename from src/ui/activities/auth_activity/bookmarks.rs
rename to src/ui/activities/auth/bookmarks.rs
diff --git a/src/ui/activities/auth_activity/misc.rs b/src/ui/activities/auth/misc.rs
similarity index 100%
rename from src/ui/activities/auth_activity/misc.rs
rename to src/ui/activities/auth/misc.rs
diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth/mod.rs
similarity index 100%
rename from src/ui/activities/auth_activity/mod.rs
rename to src/ui/activities/auth/mod.rs
diff --git a/src/ui/activities/auth_activity/update.rs b/src/ui/activities/auth/update.rs
similarity index 99%
rename from src/ui/activities/auth_activity/update.rs
rename to src/ui/activities/auth/update.rs
index 8970387..4afe7de 100644
--- a/src/ui/activities/auth_activity/update.rs
+++ b/src/ui/activities/auth/update.rs
@@ -34,7 +34,7 @@ use super::{
     COMPONENT_RADIO_PROTOCOL, COMPONENT_RADIO_QUIT, COMPONENT_RECENTS_LIST, COMPONENT_TEXT_ERROR,
     COMPONENT_TEXT_HELP,
 };
-use crate::ui::activities::keymap::*;
+use crate::ui::keymap::*;
 use tuirealm::components::InputPropsBuilder;
 use tuirealm::{Msg, Payload, PropsBuilder, Value};
 
diff --git a/src/ui/activities/auth_activity/view.rs b/src/ui/activities/auth/view.rs
similarity index 100%
rename from src/ui/activities/auth_activity/view.rs
rename to src/ui/activities/auth/view.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/change_dir.rs b/src/ui/activities/filetransfer/actions/change_dir.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/change_dir.rs
rename to src/ui/activities/filetransfer/actions/change_dir.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/copy.rs b/src/ui/activities/filetransfer/actions/copy.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/copy.rs
rename to src/ui/activities/filetransfer/actions/copy.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/delete.rs b/src/ui/activities/filetransfer/actions/delete.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/delete.rs
rename to src/ui/activities/filetransfer/actions/delete.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/edit.rs b/src/ui/activities/filetransfer/actions/edit.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/edit.rs
rename to src/ui/activities/filetransfer/actions/edit.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/exec.rs b/src/ui/activities/filetransfer/actions/exec.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/exec.rs
rename to src/ui/activities/filetransfer/actions/exec.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/find.rs b/src/ui/activities/filetransfer/actions/find.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/find.rs
rename to src/ui/activities/filetransfer/actions/find.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/mkdir.rs b/src/ui/activities/filetransfer/actions/mkdir.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/mkdir.rs
rename to src/ui/activities/filetransfer/actions/mkdir.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/mod.rs b/src/ui/activities/filetransfer/actions/mod.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/mod.rs
rename to src/ui/activities/filetransfer/actions/mod.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/newfile.rs b/src/ui/activities/filetransfer/actions/newfile.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/newfile.rs
rename to src/ui/activities/filetransfer/actions/newfile.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/rename.rs b/src/ui/activities/filetransfer/actions/rename.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/rename.rs
rename to src/ui/activities/filetransfer/actions/rename.rs
diff --git a/src/ui/activities/filetransfer_activity/actions/save.rs b/src/ui/activities/filetransfer/actions/save.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/actions/save.rs
rename to src/ui/activities/filetransfer/actions/save.rs
diff --git a/src/ui/activities/filetransfer_activity/browser.rs b/src/ui/activities/filetransfer/browser.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/browser.rs
rename to src/ui/activities/filetransfer/browser.rs
diff --git a/src/ui/activities/filetransfer_activity/misc.rs b/src/ui/activities/filetransfer/misc.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/misc.rs
rename to src/ui/activities/filetransfer/misc.rs
diff --git a/src/ui/activities/filetransfer_activity/mod.rs b/src/ui/activities/filetransfer/mod.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/mod.rs
rename to src/ui/activities/filetransfer/mod.rs
diff --git a/src/ui/activities/filetransfer_activity/session.rs b/src/ui/activities/filetransfer/session.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/session.rs
rename to src/ui/activities/filetransfer/session.rs
diff --git a/src/ui/activities/filetransfer_activity/update.rs b/src/ui/activities/filetransfer/update.rs
similarity index 99%
rename from src/ui/activities/filetransfer_activity/update.rs
rename to src/ui/activities/filetransfer/update.rs
index 2281599..d7bd6d0 100644
--- a/src/ui/activities/filetransfer_activity/update.rs
+++ b/src/ui/activities/filetransfer/update.rs
@@ -39,8 +39,8 @@ use super::{
 };
 use crate::fs::explorer::FileSorting;
 use crate::fs::FsEntry;
-use crate::ui::activities::keymap::*;
 use crate::ui::components::{file_list::FileListPropsBuilder, logbox::LogboxPropsBuilder};
+use crate::ui::keymap::*;
 // externals
 use bytesize::ByteSize;
 use std::path::{Path, PathBuf};
diff --git a/src/ui/activities/filetransfer_activity/view.rs b/src/ui/activities/filetransfer/view.rs
similarity index 100%
rename from src/ui/activities/filetransfer_activity/view.rs
rename to src/ui/activities/filetransfer/view.rs
diff --git a/src/ui/activities/mod.rs b/src/ui/activities/mod.rs
index 307b73a..488dfaa 100644
--- a/src/ui/activities/mod.rs
+++ b/src/ui/activities/mod.rs
@@ -28,12 +28,10 @@
  */
 // Locals
 use super::context::Context;
-// keymap
-pub(crate) mod keymap;
 // Activities
-pub mod auth_activity;
-pub mod filetransfer_activity;
-pub mod setup_activity;
+pub mod auth;
+pub mod filetransfer;
+pub mod setup;
 
 // -- Exit reason
 
diff --git a/src/ui/activities/setup_activity/actions.rs b/src/ui/activities/setup/actions.rs
similarity index 100%
rename from src/ui/activities/setup_activity/actions.rs
rename to src/ui/activities/setup/actions.rs
diff --git a/src/ui/activities/setup_activity/config.rs b/src/ui/activities/setup/config.rs
similarity index 100%
rename from src/ui/activities/setup_activity/config.rs
rename to src/ui/activities/setup/config.rs
diff --git a/src/ui/activities/setup_activity/mod.rs b/src/ui/activities/setup/mod.rs
similarity index 100%
rename from src/ui/activities/setup_activity/mod.rs
rename to src/ui/activities/setup/mod.rs
diff --git a/src/ui/activities/setup_activity/update.rs b/src/ui/activities/setup/update.rs
similarity index 99%
rename from src/ui/activities/setup_activity/update.rs
rename to src/ui/activities/setup/update.rs
index f5de5a7..053d7b5 100644
--- a/src/ui/activities/setup_activity/update.rs
+++ b/src/ui/activities/setup/update.rs
@@ -34,7 +34,7 @@ use super::{
     COMPONENT_RADIO_GROUP_DIRS, COMPONENT_RADIO_HIDDEN_FILES, COMPONENT_RADIO_QUIT,
     COMPONENT_RADIO_SAVE, COMPONENT_RADIO_UPDATES, COMPONENT_TEXT_ERROR, COMPONENT_TEXT_HELP,
 };
-use crate::ui::activities::keymap::*;
+use crate::ui::keymap::*;
 
 // ext
 use tuirealm::{Msg, Payload, Value};
diff --git a/src/ui/activities/setup_activity/view.rs b/src/ui/activities/setup/view.rs
similarity index 100%
rename from src/ui/activities/setup_activity/view.rs
rename to src/ui/activities/setup/view.rs
diff --git a/src/ui/activities/keymap.rs b/src/ui/keymap.rs
similarity index 100%
rename from src/ui/activities/keymap.rs
rename to src/ui/keymap.rs
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 275a0b6..268a5ab 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -30,4 +30,5 @@ pub mod activities;
 pub(crate) mod components;
 pub mod context;
 pub(crate) mod input;
+pub(crate) mod keymap;
 pub(crate) mod store;