Changed activity paths

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/keymap.rs

@@ -1,217 +0,0 @@
-//! ## Keymap
-//!
-//! Keymap contains pub constants which can be used in the `update` function to match messages
-
-/**
- * MIT License
- *
- * termscp - Copyright (c) 2021 Christian Visintin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-use tuirealm::event::{KeyCode, KeyEvent, KeyModifiers};
-use tuirealm::Msg;
-
-// -- Special keys
-
-pub const MSG_KEY_ENTER: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Enter,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_ESC: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Esc,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_TAB: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Tab,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_DEL: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Delete,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_BACKSPACE: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Backspace,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_DOWN: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Down,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_LEFT: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Left,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_RIGHT: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Right,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_UP: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Up,
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_SPACE: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char(' '),
-    modifiers: KeyModifiers::NONE,
-});
-
-// -- char keys
-
-pub const MSG_KEY_CHAR_A: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('a'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_B: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('b'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_C: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('c'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_D: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('d'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_E: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('e'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_F: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('f'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_G: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('g'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_H: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('h'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_I: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('i'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_J: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('j'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_K: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('k'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-pub const MSG_KEY_CHAR_L: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('l'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_M: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('m'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-pub const MSG_KEY_CHAR_N: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('n'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_O: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('o'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_P: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('p'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-pub const MSG_KEY_CHAR_Q: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('q'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_R: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('r'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_S: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('s'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_T: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('t'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-pub const MSG_KEY_CHAR_U: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('u'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_V: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('v'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_W: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('w'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-pub const MSG_KEY_CHAR_X: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('x'),
-    modifiers: KeyModifiers::NONE,
-});
-pub const MSG_KEY_CHAR_Y: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('y'),
-    modifiers: KeyModifiers::NONE,
-});
-/*
-pub const MSG_KEY_CHAR_Z: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('z'),
-    modifiers: KeyModifiers::NONE,
-});
-*/
-
-// -- control
-pub const MSG_KEY_CTRL_C: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('c'),
-    modifiers: KeyModifiers::CONTROL,
-});
-pub const MSG_KEY_CTRL_E: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('e'),
-    modifiers: KeyModifiers::CONTROL,
-});
-pub const MSG_KEY_CTRL_H: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('h'),
-    modifiers: KeyModifiers::CONTROL,
-});
-pub const MSG_KEY_CTRL_N: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('n'),
-    modifiers: KeyModifiers::CONTROL,
-});
-pub const MSG_KEY_CTRL_R: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('r'),
-    modifiers: KeyModifiers::CONTROL,
-});
-pub const MSG_KEY_CTRL_S: Msg = Msg::OnKey(KeyEvent {
-    code: KeyCode::Char('s'),
-    modifiers: KeyModifiers::CONTROL,
-});

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
 

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