Use Outputs type in Navigable trait

2026-08-23 11:35:15 +02:00
parent 889da2e62c
commit dbbc93b528
10 changed files with 114 additions and 119 deletions
@@ -1,6 +1,5 @@
-use embedded_graphics::draw_target::DrawTarget;
-use embedded_graphics::pixelcolor::Rgb565;

+use crate::navigation::outputs::Outputs;
 use crate::views::card_view::CardView;
 use crate::views::{
    journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
@@ -19,18 +18,15 @@ pub enum View {
 }

 impl Navigable for View {
-    fn display<D>(&self, display: &mut D) -> impl core::future::Future<Output = ()> + Send
-    where
-        D: DrawTarget<Color = Rgb565> + Send,
-        D::Error: core::fmt::Debug,
+    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send
    {
        async move {
            match self {
-                View::Main(main_menu) => main_menu.display(display).await,
-                View::Scan(scan_menu) => scan_menu.display(display).await,
-                View::Settings(settings_menu) => settings_menu.display(display).await,
-                View::Journal(journal_view) => journal_view.display(display).await,
-                View::Card(card_view) => card_view.display(display).await,
+                View::Main(main_menu) => main_menu.display(outputs).await,
+                View::Scan(scan_menu) => scan_menu.display(outputs).await,
+                View::Settings(settings_menu) => settings_menu.display(outputs).await,
+                View::Journal(journal_view) => journal_view.display(outputs).await,
+                View::Card(card_view) => card_view.display(outputs).await,
            }
        }
    }