Rethinking transitions between views (#130)

* Fix user command view not to retain previous view

* Fix detail view to close with Confirm action

* Open detail view via Confirm action in user command view

Author: lusingander

src/app.rs

@@ -349,25 +349,27 @@ impl App<'_> {
     }
 
     fn open_detail(&mut self) {
-        if let View::List(ref mut view) = self.view {
-            let commit_list_state = view.take_list_state();
-            let selected = commit_list_state.selected_commit_hash().clone();
-            let (commit, changes) = self.repository.commit_detail(&selected);
-            let refs = self
-                .repository
-                .refs(&selected)
-                .into_iter()
-                .cloned()
-                .collect();
-            self.view = View::of_detail(
-                commit_list_state,
-                commit,
-                changes,
-                refs,
-                self.ctx.clone(),
-                self.tx.clone(),
-            );
-        }
+        let commit_list_state = match self.view {
+            View::List(ref mut view) => view.take_list_state(),
+            View::UserCommand(ref mut view) => view.take_list_state(),
+            _ => return,
+        };
+        let selected = commit_list_state.selected_commit_hash().clone();
+        let (commit, changes) = self.repository.commit_detail(&selected);
+        let refs = self
+            .repository
+            .refs(&selected)
+            .into_iter()
+            .cloned()
+            .collect();
+        self.view = View::of_detail(
+            commit_list_state,
+            commit,
+            changes,
+            refs,
+            self.ctx.clone(),
+            self.tx.clone(),
+        );
     }
 
     fn close_detail(&mut self) {
@@ -384,79 +386,28 @@ impl App<'_> {
     }
 
     fn open_user_command(&mut self, user_command_number: usize) {
-        if let View::List(ref mut view) = self.view {
-            let commit_list_state = view.take_list_state();
-            let selected = commit_list_state.selected_commit_hash().clone();
-            let (commit, _) = self.repository.commit_detail(&selected);
-            self.view = View::of_user_command_from_list(
-                commit_list_state,
-                commit,
-                user_command_number,
-                self.app_status.view_area,
-                self.ctx.clone(),
-                self.tx.clone(),
-            );
-        } else if let View::Detail(ref mut view) = self.view {
-            let commit_list_state = view.take_list_state();
-            let selected = commit_list_state.selected_commit_hash().clone();
-            let (commit, _) = self.repository.commit_detail(&selected);
-            self.view = View::of_user_command_from_detail(
-                commit_list_state,
-                commit,
-                user_command_number,
-                self.app_status.view_area,
-                self.ctx.clone(),
-                self.tx.clone(),
-            );
-        } else if let View::UserCommand(ref mut view) = self.view {
-            let commit_list_state = view.take_list_state();
-            let selected = commit_list_state.selected_commit_hash().clone();
-            let (commit, _) = self.repository.commit_detail(&selected);
-            if view.before_view_is_list() {
-                self.view = View::of_user_command_from_list(
-                    commit_list_state,
-                    commit,
-                    user_command_number,
-                    self.app_status.view_area,
-                    self.ctx.clone(),
-                    self.tx.clone(),
-                );
-            } else {
-                self.view = View::of_user_command_from_detail(
-                    commit_list_state,
-                    commit,
-                    user_command_number,
-                    self.app_status.view_area,
-                    self.ctx.clone(),
-                    self.tx.clone(),
-                );
-            }
-        }
+        let commit_list_state = match self.view {
+            View::List(ref mut view) => view.take_list_state(),
+            View::Detail(ref mut view) => view.take_list_state(),
+            View::UserCommand(ref mut view) => view.take_list_state(),
+            _ => return,
+        };
+        let selected = commit_list_state.selected_commit_hash().clone();
+        let (commit, _) = self.repository.commit_detail(&selected);
+        self.view = View::of_user_command(
+            commit_list_state,
+            commit,
+            user_command_number,
+            self.app_status.view_area,
+            self.ctx.clone(),
+            self.tx.clone(),
+        );
     }
 
     fn close_user_command(&mut self) {
         if let View::UserCommand(ref mut view) = self.view {
             let commit_list_state = view.take_list_state();
-            let selected = commit_list_state.selected_commit_hash().clone();
-            let (commit, changes) = self.repository.commit_detail(&selected);
-            let refs = self
-                .repository
-                .refs(&selected)
-                .into_iter()
-                .cloned()
-                .collect();
-            if view.before_view_is_list() {
-                self.view = View::of_list(commit_list_state, self.ctx.clone(), self.tx.clone());
-            } else {
-                self.view = View::of_detail(
-                    commit_list_state,
-                    commit,
-                    changes,
-                    refs,
-                    self.ctx.clone(),
-                    self.tx.clone(),
-                );
-            }
+            self.view = View::of_list(commit_list_state, self.ctx.clone(), self.tx.clone());
         }
     }
 

src/view/detail.rs

@@ -114,7 +114,7 @@ impl<'a> DetailView<'a> {
             UserEvent::HelpToggle => {
                 self.tx.send(AppEvent::OpenHelp);
             }
-            UserEvent::Cancel | UserEvent::Close => {
+            UserEvent::Confirm | UserEvent::Cancel | UserEvent::Close => {
                 self.tx.send(AppEvent::ClearDetail); // hack: reset the rendering of the image area
                 self.tx.send(AppEvent::CloseDetail);
             }

src/view/help.rs

@@ -275,7 +275,7 @@ fn build_lines(
     let (list_key_lines, list_value_lines) = build_block_lines("Commit List:", list_helps, color_theme, keybind);
 
     let mut detail_helps = vec![
-        (vec![UserEvent::Cancel, UserEvent::Close], "Close commit details".into()),
+        (vec![UserEvent::Cancel, UserEvent::Close, UserEvent::Confirm], "Close commit details".into()),
         (vec![UserEvent::NavigateDown], "Scroll down".into()),
         (vec![UserEvent::NavigateUp], "Scroll up".into()),
         (vec![UserEvent::PageDown], "Scroll page down".into()),
@@ -318,6 +318,7 @@ fn build_lines(
         (vec![UserEvent::SelectDown], "Select older commit".into()),
         (vec![UserEvent::SelectUp], "Select newer commit".into()),
         (vec![UserEvent::GoToParent], "Select parent commit".into()),
+        (vec![UserEvent::Confirm], "Show commit details".into()),
     ];
     user_command_helps.extend(user_command_view_toggle_helps);
     let (user_command_key_lines, user_command_value_lines) = build_block_lines("User Command:", user_command_helps, color_theme, keybind);

src/view/user_command.rs

@@ -20,12 +20,6 @@ use crate::{
     },
 };
 
-#[derive(Debug)]
-pub enum UserCommandViewBeforeView {
-    List,
-    Detail,
-}
-
 #[derive(Debug)]
 pub struct UserCommandView<'a> {
     commit_list_state: Option<CommitListState<'a>>,
@@ -36,7 +30,6 @@ pub struct UserCommandView<'a> {
 
     ctx: Rc<AppContext>,
     tx: Sender,
-    before_view: UserCommandViewBeforeView,
     clear: bool,
 }
 
@@ -48,7 +41,6 @@ impl<'a> UserCommandView<'a> {
         view_area: Rect,
         ctx: Rc<AppContext>,
         tx: Sender,
-        before_view: UserCommandViewBeforeView,
     ) -> UserCommandView<'a> {
         let user_command_output_lines =
             build_user_command_output_lines(&commit, user_command_number, view_area, ctx.clone())
@@ -64,7 +56,6 @@ impl<'a> UserCommandView<'a> {
             user_command_output_lines,
             ctx,
             tx,
-            before_view,
             clear: false,
         }
     }
@@ -130,6 +121,9 @@ impl<'a> UserCommandView<'a> {
                     self.tx.send(AppEvent::OpenUserCommand(n));
                 }
             }
+            UserEvent::Confirm => {
+                self.tx.send(AppEvent::OpenDetail);
+            }
             UserEvent::Cancel | UserEvent::Close => {
                 self.close();
             }
@@ -217,10 +211,6 @@ impl<'a> UserCommandView<'a> {
         self.clear = true;
     }
 
-    pub fn before_view_is_list(&self) -> bool {
-        matches!(self.before_view, UserCommandViewBeforeView::List)
-    }
-
     fn close(&self) {
         self.tx.send(AppEvent::ClearUserCommand); // hack: reset the rendering of the image area
         self.tx.send(AppEvent::CloseUserCommand);

src/view/views.rs

@@ -7,11 +7,8 @@ use crate::{
     event::{Sender, UserEventWithCount},
     git::{Commit, FileChange, Ref},
     view::{
-        detail::DetailView,
-        help::HelpView,
-        list::ListView,
-        refs::RefsView,
-        user_command::{UserCommandView, UserCommandViewBeforeView},
+        detail::DetailView, help::HelpView, list::ListView, refs::RefsView,
+        user_command::UserCommandView,
     },
     widget::commit_list::CommitListState,
 };
@@ -76,7 +73,7 @@ impl<'a> View<'a> {
         )))
     }
 
-    pub fn of_user_command_from_list(
+    pub fn of_user_command(
         commit_list_state: CommitListState<'a>,
         commit: Commit,
         user_command_number: usize,
@@ -91,26 +88,6 @@ impl<'a> View<'a> {
             view_area,
             ctx,
             tx,
-            UserCommandViewBeforeView::List,
-        )))
-    }
-
-    pub fn of_user_command_from_detail(
-        commit_list_state: CommitListState<'a>,
-        commit: Commit,
-        user_command_number: usize,
-        view_area: Rect,
-        ctx: Rc<AppContext>,
-        tx: Sender,
-    ) -> Self {
-        View::UserCommand(Box::new(UserCommandView::new(
-            commit_list_state,
-            commit,
-            user_command_number,
-            view_area,
-            ctx,
-            tx,
-            UserCommandViewBeforeView::Detail,
         )))
     }