Rename Editing{View,Edit}Mode to Editing{Normal,Insert}Mode (#14)

gluesql · Oct 27, 2024 · 9eb6f64 · 9eb6f64
1 parent 56d6dca
commit 9eb6f64
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/core/src/state/notebook.rs b/core/src/state/notebook.rs
@@ -89,15 +89,15 @@ impl NotebookState {
             NoteTreeNumber(n) => {
                 format!("Steps: '{n}' selected")
             }
-            EditingViewMode => {
+            EditingNormalMode => {
                 let name = &self.get_selected_note()?.name;
 
-                format!("Note '{name}' view mode")
+                format!("Note '{name}' normal mode")
             }
-            EditingEditMode => {
+            EditingInsertMode => {
                 let name = &self.get_selected_note()?.name;
 
-                format!("Note '{name}' edit mode")
+                format!("Note '{name}' insert mode")
             }
         })
     }
@@ -134,18 +134,18 @@ impl NotebookState {
                     "[Esc] Cancel".to_owned(),
                 ]
             }
-            EditingViewMode => {
+            EditingNormalMode => {
                 vec![
-                    "[i] Edit mode".to_owned(),
+                    "[i] Insert mode".to_owned(),
                     "[b] Browse note tree".to_owned(),
                     "[n] Toggle line number".to_owned(),
                     "[h] Show editor keymap".to_owned(),
                     "[Esc] Quit".to_owned(),
                 ]
             }
-            EditingEditMode => {
+            EditingInsertMode => {
                 vec![
-                    "[Esc] Save note & View mode".to_owned(),
+                    "[Esc] Save note & Normal mode".to_owned(),
                     "[Ctrl+h] Show editor keymap".to_owned(),
                 ]
             }

diff --git a/core/src/state/notebook/consume/note.rs b/core/src/state/notebook/consume/note.rs
@@ -93,21 +93,21 @@ pub async fn open(
     let content = db.fetch_note_content(note.id.clone()).await?;
 
     state.editing = Some(note.clone());
-    state.inner_state = InnerState::EditingViewMode;
+    state.inner_state = InnerState::EditingNormalMode;
 
     Ok(NotebookTransition::OpenNote { note, content })
 }
 
 pub async fn edit(state: &mut NotebookState) -> Result<NotebookTransition> {
-    state.inner_state = InnerState::EditingEditMode;
+    state.inner_state = InnerState::EditingInsertMode;
 
     Ok(NotebookTransition::EditMode)
 }
 
 pub async fn view(state: &mut NotebookState) -> Result<NotebookTransition> {
     let note = state.get_editing()?.clone();
 
-    state.inner_state = InnerState::EditingViewMode;
+    state.inner_state = InnerState::EditingNormalMode;
 
     Ok(NotebookTransition::ViewMode(note))
 }

diff --git a/core/src/state/notebook/inner_state.rs b/core/src/state/notebook/inner_state.rs
@@ -1,7 +1,7 @@
 mod directory_more_actions;
 mod directory_selected;
-mod editing_edit_mode;
-mod editing_view_mode;
+mod editing_insert_mode;
+mod editing_normal_mode;
 mod note_more_actions;
 mod note_selected;
 mod note_tree_number;
@@ -15,8 +15,8 @@ pub enum InnerState {
     DirectorySelected,
     DirectoryMoreActions,
     NoteTreeNumber(usize),
-    EditingViewMode,
-    EditingEditMode,
+    EditingNormalMode,
+    EditingInsertMode,
 }
 
 pub async fn consume(
@@ -32,7 +32,7 @@ pub async fn consume(
         NoteMoreActions => note_more_actions::consume(db, state, event).await,
         DirectoryMoreActions => directory_more_actions::consume(db, state, event).await,
         NoteTreeNumber(n) => note_tree_number::consume(db, state, *n, event).await,
-        EditingViewMode => editing_view_mode::consume(db, state, event).await,
-        EditingEditMode => editing_edit_mode::consume(db, state, event).await,
+        EditingNormalMode => editing_normal_mode::consume(db, state, event).await,
+        EditingInsertMode => editing_insert_mode::consume(db, state, event).await,
     }
 }
diff --git a/...notebook/inner_state/editing_edit_mode.rs → ...tebook/inner_state/editing_insert_mode.rs b/...notebook/inner_state/editing_edit_mode.rs → ...tebook/inner_state/editing_insert_mode.rs
diff --git a/...notebook/inner_state/editing_view_mode.rs → ...tebook/inner_state/editing_normal_mode.rs b/...notebook/inner_state/editing_view_mode.rs → ...tebook/inner_state/editing_normal_mode.rs
diff --git a/tui/src/context/notebook.rs b/tui/src/context/notebook.rs
@@ -42,8 +42,8 @@ pub enum ContextState {
     NoteTreeNumbering,
     NoteActionsDialog,
     DirectoryActionsDialog,
-    EditorViewMode,
-    EditorEditMode,
+    EditorNormalMode,
+    EditorInsertMode,
 }
 
 pub struct NotebookContext {
@@ -128,7 +128,7 @@ impl NotebookContext {
     }
 
     pub fn open_note(&mut self, note: Note, content: String) {
-        self.state = ContextState::EditorViewMode;
+        self.state = ContextState::EditorNormalMode;
         self.opened_note = Some(note);
         self.editor = TextArea::from(content.lines());
     }
@@ -142,7 +142,7 @@ impl NotebookContext {
         match self.state {
             ContextState::NoteTreeBrowsing => self.consume_on_note_tree_browsing(code),
             ContextState::NoteTreeNumbering => self.consume_on_note_tree_numbering(code),
-            ContextState::EditorViewMode | ContextState::EditorEditMode => {
+            ContextState::EditorNormalMode | ContextState::EditorInsertMode => {
                 self.consume_on_editor(input)
             }
             ContextState::NoteActionsDialog => self.consume_on_note_actions(code),
@@ -270,9 +270,9 @@ impl NotebookContext {
             _ => return Action::None,
         };
 
-        if self.state == ContextState::EditorEditMode {
+        if self.state == ContextState::EditorInsertMode {
             if code == KeyCode::Esc {
-                self.state = ContextState::EditorViewMode;
+                self.state = ContextState::EditorNormalMode;
                 return Action::Dispatch(NotebookEvent::ViewNote.into());
             } else if matches!(
                 input,
@@ -297,7 +297,7 @@ impl NotebookContext {
                 Action::Dispatch(NotebookEvent::BrowseNoteTree.into())
             }
             KeyCode::Char('i') => {
-                self.state = ContextState::EditorEditMode;
+                self.state = ContextState::EditorInsertMode;
                 Action::Dispatch(NotebookEvent::EditNote.into())
             }
             KeyCode::Char('n') => {

diff --git a/tui/src/views/body/notebook/editor.rs b/tui/src/views/body/notebook/editor.rs
@@ -16,7 +16,7 @@ pub fn draw(frame: &mut Frame, area: Rect, context: &mut Context) {
     };
     let title = if matches!(
         context.notebook.state,
-        ContextState::EditorViewMode | ContextState::EditorEditMode
+        ContextState::EditorNormalMode | ContextState::EditorInsertMode
     ) {
         title.light_blue()
     } else {
@@ -37,7 +37,7 @@ pub fn draw(frame: &mut Frame, area: Rect, context: &mut Context) {
     context.notebook.editor.set_block(block);
 
     let (cursor_style, cursor_line_style) = match context.notebook.state {
-        ContextState::EditorEditMode => (
+        ContextState::EditorInsertMode => (
             Style::default().white().on_blue(),
             Style::default().underlined(),
         ),