Move views to submodule

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

6 files changed, 13 insertions, 12 deletions

diff --git a/src/bindings.rs b/src/bindings.rs
index 9907bdc..0e42cf2 100644
--- a/src/bindings.rs
+++ b/src/bindings.rs
@@ -15,7 +15,7 @@ use cursive::view::SizeConstraint;
 use cursive::views::NamedView;
 use cursive::views::ResizedView;
 
-use crate::main_view::MainView;
+use crate::views::main::MainView;
 
 pub fn get_bindings() -> Bindings {
     Bindings(vec![
@@ -23,7 +23,7 @@ pub fn get_bindings() -> Bindings {
             chars: ["quit", "q"].iter().map(ToString::to_string).collect(),
             callback: Callback::from_fn(|siv: &mut Cursive| {
                 trace!("Callback called: q");
-                let continue_running = siv.call_on_name(crate::main_view::MAIN_VIEW_NAME, |mv: &mut MainView| {
+                let continue_running = siv.call_on_name(crate::views::main::MAIN_VIEW_NAME, |mv: &mut MainView| {
                     if mv.tabs().tab_order().len() == 1 {
                         false
                     } else {
diff --git a/src/main.rs b/src/main.rs
index 89cdab8..2bf7c50 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,11 +9,9 @@ use cursive_flexi_logger_view::FlexiLoggerView;
 use flexi_logger::{Logger, LogTarget};
 
 mod bindings;
-mod main_view;
-mod mail_view;
-mod maillist_view;
 mod configuration;
 mod util;
+mod views;
 
 use configuration::Configuration;
 
@@ -42,7 +40,7 @@ fn main() -> Result<()> {
     siv.set_on_post_event(trigger, |s| s.quit());
 
     debug!("Adding mainview");
-    siv.add_fullscreen_layer(main_view::MainView::new(config)?);
+    siv.add_fullscreen_layer(crate::views::main::MainView::new(config)?);
     siv.add_global_callback('~', |siv: &mut Cursive| siv.add_layer(FlexiLoggerView::scrollable()));
 
     debug!("Starting cursive");
diff --git a/src/mail_view.rs b/src/views/mail.rs
index 93c781a..93c781a 100644
--- a/src/mail_view.rs
+++ b/src/views/mail.rs
diff --git a/src/maillist_view.rs b/src/views/maillist.rs
index 3de8e9f..dc13bf3 100644
--- a/src/maillist_view.rs
+++ b/src/views/maillist.rs
@@ -23,8 +23,8 @@ use getset::Getters;
 use cursive::views::ResizedView;
 use cursive::view::SizeConstraint;
 
-use crate::main_view::MainView;
-use crate::mail_view::MailView;
+use crate::views::main::MainView;
+use crate::views::mail::MailView;
 
 pub struct MaillistView {
     view: ResizedView<TableView<MailListingData, MailListingColumn>>,
@@ -121,7 +121,7 @@ impl MaillistView {
                     let name = format!("{}-{}", n, mail_id);
                     let mv = MailView::create_for(db_path, mail_id, filename, name).unwrap();
 
-                    siv.call_on_name(crate::main_view::MAIN_MUX_NAME, move |mux: &mut cursive_multiplex::Mux| {
+                    siv.call_on_name(crate::views::main::MAIN_MUX_NAME, move |mux: &mut cursive_multiplex::Mux| {
                         mux.add_right_of(mv, mux.root().build().unwrap());
                     });
 
diff --git a/src/main_view.rs b/src/views/main.rs
index 5195fb0..af9dcea 100644
--- a/src/main_view.rs
+++ b/src/views/main.rs
@@ -23,9 +23,9 @@ use getset::{Getters, MutGetters};
 use crate::bindings::BindingCaller;
 use crate::bindings::Bindings;
 use crate::configuration::Configuration;
-use crate::mail_view::MailView;
-use crate::maillist_view::MailListingData;
-use crate::maillist_view::MaillistView;
+use crate::views::mail::MailView;
+use crate::views::maillist::MailListingData;
+use crate::views::maillist::MaillistView;
 
 pub const MAIN_VIEW_NAME: &'static str = "main_view";
 pub const MAIN_MUX_NAME: &'static str = "main_mux";
diff --git a/src/views/mod.rs b/src/views/mod.rs
new file mode 100644
index 0000000..9053bf1
--- /dev/null
+++ b/src/views/mod.rs
@@ -0,0 +1,3 @@
+pub mod maillist;
+pub mod mail;
+pub mod main;