refactor(View): Move View implementation to View directory

Signed-off-by: Ivin Joel Abraham <[email protected]>

Author: ivinjabraham

src/app.rs

@@ -1,10 +1,10 @@
-use crate::viewmodels::ViewModel;
+use crate::{viewmodels::ViewModel, views::View};
 use std::collections::HashMap;
 
 use color_eyre::eyre::Result;
 use ratatui::crossterm::event::{self, Event, KeyEventKind};
 
-use crate::model::{screens::View, Model};
+use crate::model::Model;
 
 #[allow(dead_code)]
 pub struct App {

src/handler/bookmarked.rs

@@ -9,8 +9,11 @@ use std::ops::ControlFlow;
 use crate::{
     loading_screen,
     lore::lore_session::B4Result,
-    model::{screens::View, Model},
-    views::popup::{help::HelpPopUpBuilder, info_popup::InfoPopUp, PopUp},
+    model::Model,
+    views::{
+        popup::{help::HelpPopUpBuilder, info_popup::InfoPopUp, PopUp},
+        View,
+    },
 };
 
 pub fn handle_bookmarked_patchsets<B>(

src/handler/details_actions.rs

@@ -8,8 +8,11 @@ use std::time::Duration;
 
 use crate::{
     infrastructure::terminal::{setup_user_io, teardown_user_io},
-    model::{screens::View, Model},
-    views::popup::{help::HelpPopUpBuilder, review_trailers::ReviewTrailersPopUp, PopUp},
+    model::Model,
+    views::{
+        popup::{help::HelpPopUpBuilder, review_trailers::ReviewTrailersPopUp, PopUp},
+        View,
+    },
 };
 
 use super::wait_key_press;

src/handler/edit_config.rs

@@ -1,8 +1,11 @@
 use ratatui::crossterm::event::{KeyCode, KeyEvent};
 
 use crate::{
-    model::{screens::View, Model},
-    views::popup::{help::HelpPopUpBuilder, PopUp},
+    model::Model,
+    views::{
+        popup::{help::HelpPopUpBuilder, PopUp},
+        View,
+    },
 };
 
 pub fn handle_edit_config(model: &mut Model, key: KeyEvent) -> color_eyre::Result<()> {

src/handler/latest.rs

@@ -9,8 +9,11 @@ use std::ops::ControlFlow;
 use crate::{
     loading_screen,
     lore::lore_session::B4Result,
-    model::{screens::View, Model},
-    views::popup::{help::HelpPopUpBuilder, info_popup::InfoPopUp, PopUp},
+    model::Model,
+    views::{
+        popup::{help::HelpPopUpBuilder, info_popup::InfoPopUp, PopUp},
+        View,
+    },
 };
 
 pub fn handle_latest_patchsets<B>(

src/handler/mail_list.rs

@@ -1,3 +1,4 @@
+use crate::views::View;
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent},
     prelude::Backend,
@@ -8,7 +9,7 @@ use std::ops::ControlFlow;
 
 use crate::{
     loading_screen,
-    model::{screens::View, Model},
+    model::Model,
     views::popup::{help::HelpPopUpBuilder, PopUp},
 };
 

src/handler/mod.rs

@@ -17,8 +17,8 @@ use std::{
 
 use crate::{
     loading_screen,
-    model::{screens::View, Model},
-    views::draw_ui,
+    model::Model,
+    views::{draw_ui, View},
 };
 
 use bookmarked::handle_bookmarked_patchsets;

src/model/mod.rs

@@ -17,7 +17,10 @@ use crate::{
         lore_session::{self, B4Result},
         patch::{Author, Patch},
     },
-    views::popup::{info_popup::InfoPopUp, PopUp},
+    views::{
+        popup::{info_popup::InfoPopUp, PopUp},
+        View,
+    },
 };
 
 use config::Config;
@@ -29,7 +32,6 @@ use screens::{
     edit_config::EditConfig,
     latest::LatestPatchsets,
     mail_list::MailingListSelection,
-    View,
 };
 
 /// Type that represents the overall state of the application. It can be viewed

src/model/screens/details_actions.rs

@@ -14,10 +14,9 @@ use crate::{
         patch::{Author, Patch},
     },
     model::config::{Config, KernelTree},
+    views::View,
 };
 
-use super::View;
-
 pub struct DetailsActions {
     pub representative_patch: Patch,
     /// Raw patches as plain text files

src/model/screens/mod.rs

@@ -1,29 +1,5 @@
-use crate::viewmodels::ViewModelState;
-
 pub mod bookmarked;
 pub mod details_actions;
 pub mod edit_config;
 pub mod latest;
 pub mod mail_list;
-
-#[derive(Copy, Debug, Clone, PartialEq, Eq, Hash)]
-pub enum View {
-    MailingListSelection,
-    BookmarkedPatchsets,
-    LatestPatchsets,
-    PatchsetDetails,
-    EditConfig,
-}
-
-impl View {
-    #[allow(dead_code, unused_variables)]
-    pub fn draw_screen(&self, state: ViewModelState) {
-        match self {
-            View::MailingListSelection => todo!(),
-            View::BookmarkedPatchsets => todo!(),
-            View::LatestPatchsets => todo!(),
-            View::PatchsetDetails => todo!(),
-            View::EditConfig => todo!(),
-        }
-    }
-}