move App from ui module

src/ui/app.rs → src/app.rs

@@ -1,11 +1,11 @@
-use super::{
-    bottom_bar, context_viewer::ContextViewer, input_handler::InputHandler,
-    keymap_popup::KeymapPopup, result_list::ResultList, search_popup::SearchPopup, theme::Theme,
-};
-
 use crate::{
     editor::EditorCommand,
     ig::{Ig, SearchConfig},
+    ui::{
+        bottom_bar, context_viewer::ContextViewer, input_handler::InputHandler,
+        keymap_popup::KeymapPopup, result_list::ResultList, search_popup::SearchPopup,
+        theme::Theme,
+    },
 };
 use anyhow::Result;
 use crossterm::{

src/main.rs

@@ -1,12 +1,11 @@
 use anyhow::Result;
+use app::App;
 use args::Args;
 use editor::EditorCommand;
 use std::io::Write;
-use ui::{
-    theme::{dark::Dark, light::Light, Theme, ThemeVariant},
-    App,
-};
+use ui::theme::{dark::Dark, light::Light, Theme, ThemeVariant};
 
+mod app;
 mod args;
 mod editor;
 pub mod ig;

src/ui/input_handler.rs

@@ -1,8 +1,9 @@
-use super::app::Application;
 use anyhow::Result;
 use crossterm::event::{poll, read, Event, KeyCode, KeyEvent, KeyModifiers};
 use std::time::Duration;
 
+use crate::app::Application;
+
 #[derive(Default)]
 pub struct InputHandler {
     input_buffer: String,
@@ -241,8 +242,9 @@ impl InputHandler {
 
 #[cfg(test)]
 mod tests {
+    use crate::app::MockApplication;
+
     use super::*;
-    use crate::ui::app::MockApplication;
     use crossterm::event::KeyCode::{Char, Esc};
     use test_case::test_case;
 

src/ui/mod.rs

@@ -1,11 +1,9 @@
-pub mod app;
-pub use app::App;
-
-mod bottom_bar;
-mod context_viewer;
-mod input_handler;
-mod keymap_popup;
+pub mod bottom_bar;
+pub mod context_viewer;
+pub mod input_handler;
+pub mod keymap_popup;
 pub mod result_list;
-mod scroll_offset_list;
-mod search_popup;
+pub mod search_popup;
 pub mod theme;
+
+mod scroll_offset_list;