refactor: move views to views sub folder
This commit is contained in:
+4
-41
@@ -1,53 +1,16 @@
|
||||
use crate::navigation::{
|
||||
main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu, settings_menu::SettingsMenu,
|
||||
};
|
||||
use crate::views::{main_menu::MainMenu, view::View};
|
||||
use alloc::vec;
|
||||
use alloc::vec::Vec;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum ScreenItem {
|
||||
Main(MainMenu),
|
||||
Scan(ScanMenu),
|
||||
Settings(SettingsMenu),
|
||||
}
|
||||
|
||||
impl Navigable for ScreenItem {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
async move {
|
||||
match self {
|
||||
ScreenItem::Main(main_menu) => main_menu.display(display).await,
|
||||
ScreenItem::Scan(scan_menu) => scan_menu.display(display).await,
|
||||
ScreenItem::Settings(settings_menu) => settings_menu.display(display).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_input(
|
||||
&self,
|
||||
input: crate::navigation::navigation::Action,
|
||||
) -> impl core::future::Future<Output = Self> + Send {
|
||||
async move {
|
||||
match self {
|
||||
ScreenItem::Main(main_menu) => main_menu.handle_input(input).await,
|
||||
ScreenItem::Scan(scan_menu) => scan_menu.handle_input(input).await,
|
||||
ScreenItem::Settings(settings_menu) => settings_menu.handle_input(input).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct NavigationState {
|
||||
pub screens: Vec<ScreenItem>,
|
||||
pub screens: Vec<View>,
|
||||
}
|
||||
|
||||
impl Default for NavigationState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
screens: vec![ScreenItem::Main(MainMenu { selected: 0 })],
|
||||
screens: vec![View::Main(MainMenu { selected: 0 })],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,7 +20,7 @@ impl NavigationState {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn back(&mut self) -> ScreenItem {
|
||||
pub fn back(&mut self) -> View {
|
||||
let screen = self.screens.pop().unwrap();
|
||||
if self.screens.is_empty() {
|
||||
log::info!("last screen");
|
||||
|
||||
Reference in New Issue
Block a user