Changed activity paths

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,
+    auth::AuthActivity, filetransfer::FileTransferActivity, setup::SetupActivity, Activity,
-    setup_activity::SetupActivity, Activity, ExitReason,
+    ExitReason,
 };
 use crate::ui::context::{Context, FileTransferParams};
 

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};
 

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};

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 auth;
-pub mod filetransfer_activity;
+pub mod filetransfer;
-pub mod setup_activity;
+pub mod setup;
 
 // -- Exit reason
 

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};

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;