implement back button

src/navigation/state.rs

@@ -1,24 +1,26 @@
 use crate::navigation::{
     main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu, settings_menu::SettingsMenu,
 };
+use alloc::vec;
+use alloc::vec::Vec;
 
 #[derive(Debug, Clone)]
-pub enum Menu {
+pub enum ScreenItem {
     Main(MainMenu),
     Scan(ScanMenu),
     Settings(SettingsMenu),
 }
 
-impl Navigable for Menu {
+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 {
-                Menu::Main(main_menu) => main_menu.display(display).await,
-                Menu::Scan(scan_menu) => scan_menu.display(display).await,
-                Menu::Settings(settings_menu) => settings_menu.display(display).await,
+                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,
             }
         }
     }
@@ -29,9 +31,9 @@ impl Navigable for Menu {
     ) -> impl core::future::Future<Output = Self> + Send {
         async move {
             match self {
-                Menu::Main(main_menu) => main_menu.handle_input(input).await,
-                Menu::Scan(scan_menu) => scan_menu.handle_input(input).await,
-                Menu::Settings(settings_menu) => settings_menu.handle_input(input).await,
+                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,
             }
         }
     }
@@ -39,13 +41,13 @@ impl Navigable for Menu {
 
 #[derive(Debug, Clone)]
 pub struct NavigationState {
-    pub current_screen: Menu,
+    pub screens: Vec<ScreenItem>,
 }
 
 impl Default for NavigationState {
     fn default() -> Self {
         Self {
-            current_screen: Menu::Main(MainMenu { selected: 0 }),
+            screens: vec![ScreenItem::Main(MainMenu { selected: 0 })],
         }
     }
 }
@@ -54,4 +56,13 @@ impl NavigationState {
     pub fn new() -> Self {
         Self::default()
     }
+
+    pub fn back(&mut self) -> ScreenItem {
+        let screen = self.screens.pop().unwrap();
+        if self.screens.is_empty() {
+            log::info!("last screen");
+            return screen;
+        }
+        self.screens.pop().unwrap()
+    }
 }