rename some structs that start with Joshuto to App

- reduce sharing global variables between modules

9 files changed, 35 insertions, 35 deletions

diff --git a/src/ui/views/tui_command_menu.rs b/src/ui/views/tui_command_menu.rs
index b2dcc35..434d15e 100644
--- a/src/ui/views/tui_command_menu.rs
+++ b/src/ui/views/tui_command_menu.rs
@@ -5,12 +5,12 @@ use tui::layout::Rect;
 use tui::widgets::Clear;
 
 use crate::commands::{CommandKeybind, KeyCommand};
-use crate::config::JoshutoKeyMapping;
-use crate::context::JoshutoContext;
+use crate::config::AppKeyMapping;
+use crate::context::AppContext;
 use crate::ui::views::TuiView;
 use crate::ui::widgets::TuiMenu;
 use crate::ui::TuiBackend;
-use crate::util::event::JoshutoEvent;
+use crate::util::event::AppEvent;
 use crate::util::input;
 use crate::util::to_string::ToString;
 
@@ -27,8 +27,8 @@ impl TuiCommandMenu {
     pub fn get_input<'a>(
         &mut self,
         backend: &mut TuiBackend,
-        context: &mut JoshutoContext,
-        map: &'a JoshutoKeyMapping,
+        context: &mut AppContext,
+        map: &'a AppKeyMapping,
     ) -> Option<&'a KeyCommand> {
         let mut map = map;
         let terminal = backend.terminal_mut();
@@ -78,7 +78,7 @@ impl TuiCommandMenu {
 
             if let Ok(event) = context.poll_event() {
                 match event {
-                    JoshutoEvent::Termion(event) => {
+                    AppEvent::Termion(event) => {
                         match event {
                             Event::Key(Key::Esc) => return None,
                             event => match map.as_ref().get(&event) {
diff --git a/src/ui/views/tui_folder_view.rs b/src/ui/views/tui_folder_view.rs
index f32b422..24aa36f 100644
--- a/src/ui/views/tui_folder_view.rs
+++ b/src/ui/views/tui_folder_view.rs
@@ -4,18 +4,18 @@ use tui::style::{Color, Style};
 use tui::text::Span;
 use tui::widgets::{Block, Borders, Paragraph, Widget, Wrap};
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::ui::widgets::{TuiDirList, TuiDirListDetailed, TuiFooter, TuiTabBar, TuiTopBar};
 
 const TAB_VIEW_WIDTH: u16 = 15;
 
 pub struct TuiFolderView<'a> {
-    pub context: &'a JoshutoContext,
+    pub context: &'a AppContext,
     pub show_bottom_status: bool,
 }
 
 impl<'a> TuiFolderView<'a> {
-    pub fn new(context: &'a JoshutoContext) -> Self {
+    pub fn new(context: &'a AppContext) -> Self {
         Self {
             context,
             show_bottom_status: true,
diff --git a/src/ui/views/tui_progress_view.rs b/src/ui/views/tui_progress_view.rs
index 8b0c283..8c97bfe 100644
--- a/src/ui/views/tui_progress_view.rs
+++ b/src/ui/views/tui_progress_view.rs
@@ -4,16 +4,16 @@ use tui::style::{Color, Style};
 use tui::widgets::{Paragraph, Text, Widget};
 
 use super::{TuiDirList, TuiDirListDetailed, TuiFooter, TuiTabBar, TuiTopBar};
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 
 const TAB_VIEW_WIDTH: u16 = 15;
 
 pub struct TuiProgressView<'a> {
-    pub context: &'a JoshutoContext,
+    pub context: &'a AppContext,
 }
 
 impl<'a> TuiProgressView<'a> {
-    pub fn new(context: &'a JoshutoContext) -> Self {
+    pub fn new(context: &'a AppContext) -> Self {
         Self {
             context,
             show_bottom_status: true,
diff --git a/src/ui/views/tui_textfield.rs b/src/ui/views/tui_textfield.rs
index b2e72cb..43d8f4d 100644
--- a/src/ui/views/tui_textfield.rs
+++ b/src/ui/views/tui_textfield.rs
@@ -6,11 +6,11 @@ use tui::layout::Rect;
 use tui::widgets::Clear;
 use unicode_width::UnicodeWidthStr;
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::ui::views::TuiView;
 use crate::ui::widgets::{TuiMenu, TuiMultilineText};
 use crate::ui::TuiBackend;
-use crate::util::event::JoshutoEvent;
+use crate::util::event::AppEvent;
 use crate::util::input;
 
 struct CompletionTracker {
@@ -70,7 +70,7 @@ impl<'a> TuiTextField<'a> {
     pub fn get_input(
         &mut self,
         backend: &mut TuiBackend,
-        context: &mut JoshutoContext,
+        context: &mut AppContext,
     ) -> Option<String> {
         let mut line_buffer = line_buffer::LineBuffer::with_capacity(255);
         let completer = FilenameCompleter::new();
@@ -157,7 +157,7 @@ impl<'a> TuiTextField<'a> {
 
             if let Ok(event) = context.poll_event() {
                 match event {
-                    JoshutoEvent::Termion(Event::Key(key)) => {
+                    AppEvent::Termion(Event::Key(key)) => {
                         match key {
                             Key::Backspace => {
                                 if line_buffer.backspace(1) {
@@ -236,7 +236,7 @@ impl<'a> TuiTextField<'a> {
                         }
                         context.flush_event();
                     }
-                    JoshutoEvent::Termion(_) => {
+                    AppEvent::Termion(_) => {
                         context.flush_event();
                     }
                     event => input::process_noninteractive(event, context),
diff --git a/src/ui/views/tui_view.rs b/src/ui/views/tui_view.rs
index 81512b5..2178475 100644
--- a/src/ui/views/tui_view.rs
+++ b/src/ui/views/tui_view.rs
@@ -3,15 +3,15 @@ use tui::layout::Rect;
 use tui::widgets::Widget;
 
 use super::TuiFolderView;
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 
 pub struct TuiView<'a> {
-    pub context: &'a JoshutoContext,
+    pub context: &'a AppContext,
     pub show_bottom_status: bool,
 }
 
 impl<'a> TuiView<'a> {
-    pub fn new(context: &'a JoshutoContext) -> Self {
+    pub fn new(context: &'a AppContext) -> Self {
         Self {
             context,
             show_bottom_status: true,
diff --git a/src/ui/views/tui_worker_view.rs b/src/ui/views/tui_worker_view.rs
index c52e134..a46cb4f 100644
--- a/src/ui/views/tui_worker_view.rs
+++ b/src/ui/views/tui_worker_view.rs
@@ -2,10 +2,10 @@ use termion::event::{Event, Key};
 
 use tui::layout::Rect;
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::ui::widgets::{TuiTopBar, TuiWorker};
 use crate::ui::TuiBackend;
-use crate::util::event::JoshutoEvent;
+use crate::util::event::AppEvent;
 use crate::util::input;
 
 pub struct TuiWorkerView {}
@@ -15,7 +15,7 @@ impl TuiWorkerView {
         Self {}
     }
 
-    pub fn display(&self, context: &mut JoshutoContext, backend: &mut TuiBackend) {
+    pub fn display(&self, context: &mut AppContext, backend: &mut TuiBackend) {
         let terminal = backend.terminal_mut();
 
         loop {
@@ -42,7 +42,7 @@ impl TuiWorkerView {
 
             if let Ok(event) = context.poll_event() {
                 match event {
-                    JoshutoEvent::Termion(event) => {
+                    AppEvent::Termion(event) => {
                         match event {
                             Event::Key(Key::Esc) => {
                                 break;
diff --git a/src/ui/widgets/tui_prompt.rs b/src/ui/widgets/tui_prompt.rs
index 581149c..aff44e9 100644
--- a/src/ui/widgets/tui_prompt.rs
+++ b/src/ui/widgets/tui_prompt.rs
@@ -4,10 +4,10 @@ use tui::style::{Color, Style};
 use tui::text::Span;
 use tui::widgets::{Clear, Paragraph, Wrap};
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::ui::views::TuiView;
 use crate::ui::TuiBackend;
-use crate::util::event::JoshutoEvent;
+use crate::util::event::AppEvent;
 use crate::util::input;
 
 pub struct TuiPrompt<'a> {
@@ -19,7 +19,7 @@ impl<'a> TuiPrompt<'a> {
         Self { prompt }
     }
 
-    pub fn get_key(&mut self, backend: &mut TuiBackend, context: &mut JoshutoContext) -> Key {
+    pub fn get_key(&mut self, backend: &mut TuiBackend, context: &mut AppContext) -> Key {
         let terminal = backend.terminal_mut();
 
         context.flush_event();
@@ -56,10 +56,10 @@ impl<'a> TuiPrompt<'a> {
 
             if let Ok(event) = context.poll_event() {
                 match event {
-                    JoshutoEvent::Termion(Event::Key(key)) => {
+                    AppEvent::Termion(Event::Key(key)) => {
                         return key;
                     }
-                    JoshutoEvent::Termion(_) => {
+                    AppEvent::Termion(_) => {
                         context.flush_event();
                     }
                     event => input::process_noninteractive(event, context),
diff --git a/src/ui/widgets/tui_topbar.rs b/src/ui/widgets/tui_topbar.rs
index 74cd44b..aef32ed 100644
--- a/src/ui/widgets/tui_topbar.rs
+++ b/src/ui/widgets/tui_topbar.rs
@@ -6,16 +6,16 @@ use tui::style::{Color, Modifier, Style};
 use tui::text::{Span, Spans};
 use tui::widgets::{Paragraph, Widget};
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::{HOME_DIR, HOSTNAME, USERNAME};
 
 pub struct TuiTopBar<'a> {
-    pub context: &'a JoshutoContext,
+    pub context: &'a AppContext,
     path: &'a Path,
 }
 
 impl<'a> TuiTopBar<'a> {
-    pub fn new(context: &'a JoshutoContext, path: &'a Path) -> Self {
+    pub fn new(context: &'a AppContext, path: &'a Path) -> Self {
         Self { context, path }
     }
 }
diff --git a/src/ui/widgets/tui_worker.rs b/src/ui/widgets/tui_worker.rs
index 9f6d258..df9230a 100644
--- a/src/ui/widgets/tui_worker.rs
+++ b/src/ui/widgets/tui_worker.rs
@@ -3,15 +3,15 @@ use tui::layout::Rect;
 use tui::style::{Color, Modifier, Style};
 use tui::widgets::Widget;
 
-use crate::context::JoshutoContext;
+use crate::context::AppContext;
 use crate::io::FileOp;
 
 pub struct TuiWorker<'a> {
-    pub context: &'a JoshutoContext,
+    pub context: &'a AppContext,
 }
 
 impl<'a> TuiWorker<'a> {
-    pub fn new(context: &'a JoshutoContext) -> Self {
+    pub fn new(context: &'a AppContext) -> Self {
         Self { context }
     }
 }