From 05ef863a45fd34c91069736880ef35f804209b7d Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Wed, 21 Oct 2020 13:13:46 +0300
Subject: [PATCH] utilities: move PageMovement to components mod

---
 src/components.rs                            | 12 ++++++++++++
 src/components/mail/listing/compact.rs       |  2 +-
 src/components/mail/listing/conversations.rs |  2 +-
 src/components/mail/listing/offline.rs       |  2 +-
 src/components/mail/listing/plain.rs         |  2 +-
 src/components/mail/listing/thread.rs        |  2 +-
 src/components/mail/view/thread.rs           |  2 +-
 src/components/utilities.rs                  | 12 ------------
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components.rs b/src/components.rs
index da3673482..a22a57bf4 100644
--- a/src/components.rs
+++ b/src/components.rs
@@ -54,6 +54,18 @@ pub type ComponentId = Uuid;
 pub type ShortcutMap = IndexMap<&'static str, Key>;
 pub type ShortcutMaps = IndexMap<&'static str, ShortcutMap>;
 
+#[derive(Debug, Clone, Copy)]
+pub enum PageMovement {
+    Up(usize),
+    Right(usize),
+    Left(usize),
+    Down(usize),
+    PageUp(usize),
+    PageDown(usize),
+    Home,
+    End,
+}
+
 /// Types implementing this Trait can draw on the terminal and receive events.
 /// If a type wants to skip drawing if it has not changed anything, it can hold some flag in its
 /// fields (eg self.dirty = false) and act upon that in their `draw` implementation.
diff --git a/src/components/mail/listing/compact.rs b/src/components/mail/listing/compact.rs
index d8e6ddfb7..dc7a70716 100644
--- a/src/components/mail/listing/compact.rs
+++ b/src/components/mail/listing/compact.rs
@@ -21,7 +21,7 @@
 
 use super::EntryStrings;
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 use crate::jobs::JoinHandle;
 use std::cmp;
 use std::convert::TryInto;
diff --git a/src/components/mail/listing/conversations.rs b/src/components/mail/listing/conversations.rs
index e78d2b15c..b764d09f8 100644
--- a/src/components/mail/listing/conversations.rs
+++ b/src/components/mail/listing/conversations.rs
@@ -20,7 +20,7 @@
  */
 
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 use crate::jobs::JoinHandle;
 use std::iter::FromIterator;
 
diff --git a/src/components/mail/listing/offline.rs b/src/components/mail/listing/offline.rs
index 044b983ea..9b187389f 100644
--- a/src/components/mail/listing/offline.rs
+++ b/src/components/mail/listing/offline.rs
@@ -20,7 +20,7 @@
  */
 
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 
 #[derive(Debug)]
 pub struct OfflineListing {
diff --git a/src/components/mail/listing/plain.rs b/src/components/mail/listing/plain.rs
index 326dbb485..24dbbb604 100644
--- a/src/components/mail/listing/plain.rs
+++ b/src/components/mail/listing/plain.rs
@@ -21,7 +21,7 @@
 
 use super::EntryStrings;
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 use crate::jobs::{JobId, JoinHandle};
 use std::cmp;
 use std::iter::FromIterator;
diff --git a/src/components/mail/listing/thread.rs b/src/components/mail/listing/thread.rs
index ed5540571..613d685b1 100644
--- a/src/components/mail/listing/thread.rs
+++ b/src/components/mail/listing/thread.rs
@@ -20,7 +20,7 @@
  */
 
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 use std::cmp;
 use std::convert::TryInto;
 
diff --git a/src/components/mail/view/thread.rs b/src/components/mail/view/thread.rs
index cc7a0f000..92ac2c202 100644
--- a/src/components/mail/view/thread.rs
+++ b/src/components/mail/view/thread.rs
@@ -20,7 +20,7 @@
  */
 
 use super::*;
-use crate::components::utilities::PageMovement;
+use crate::components::PageMovement;
 use std::cmp;
 
 #[derive(Debug, Clone)]
diff --git a/src/components/utilities.rs b/src/components/utilities.rs
index 9ae34330d..727273817 100644
--- a/src/components/utilities.rs
+++ b/src/components/utilities.rs
@@ -36,18 +36,6 @@ pub use self::layouts::*;
 use crate::jobs::JobId;
 use std::collections::HashSet;
 
-#[derive(Debug, Clone, Copy)]
-pub enum PageMovement {
-    Up(usize),
-    Right(usize),
-    Left(usize),
-    Down(usize),
-    PageUp(usize),
-    PageDown(usize),
-    Home,
-    End,
-}
-
 #[derive(Default, Debug, Clone)]
 pub struct SearchPattern {
     pattern: String,