rhetenor/creaturedex
1
0
Fork 0
Code Issues 22 Pull Requests Packages Projects 1 Releases Wiki Activity

move menu drawing to own function

Browse Source
This commit is contained in:
rhetenor
2026-08-14 21:40:24 +00:00
parent 0fb87f2913
commit e1ab69d1ab
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/navigation/main_menu.rs
+7 -42
View File
@@ -2,23 +2,20 @@ use core::future;
use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
use alloc::format;
use crate::navigation::menu_item;
use embedded_graphics::mono_font::MonoTextStyle;
use embedded_graphics::mono_font::ascii::FONT_10X20;
use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::Point;
use embedded_graphics::prelude::RgbColor;
use embedded_graphics::text::Text;
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
use embedded_graphics_core::draw_target::DrawTarget;
use super::state::Menu;
pub const MAX_SELECTED: i8 = 3;
pub const MAX_SELECTED: i32 = 3;
#[derive(Debug, Clone)]
pub struct MainMenu {
pub selected: i8,
pub selected: i32,
}
impl super::navigation::Navigable for MainMenu {
@@ -29,41 +26,9 @@ impl super::navigation::Navigable for MainMenu {
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE);
Text::new(
&format!("Last card"),
Point::new(40, 40),
if self.selected == 0 {
selected_style
} else {
style
},
)
.draw(display)
.unwrap();
Text::new(
&format!("Journal"),
Point::new(40, 60),
if self.selected == 1 {
selected_style
} else {
style
},
)
.draw(display)
.unwrap();
Text::new(
&format!("Settings"),
Point::new(40, 80),
if self.selected == 2 {
selected_style
} else {
style
},
)
.draw(display)
.unwrap();
menu_item::show(display, "Last card", 0, self.selected);
menu_item::show(display, "Journal", 1, self.selected);
menu_item::show(display, "Settings", 2, self.selected);
core::future::ready(())
}
src/navigation/menu_item.rs
+33
View File
@@ -0,0 +1,33 @@
use embedded_graphics::mono_font::MonoTextStyle;
use embedded_graphics::mono_font::ascii::FONT_10X20;
use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::Point;
use embedded_graphics::prelude::RgbColor;
use embedded_graphics::text::Text;
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
use embedded_graphics_core::draw_target::DrawTarget;
use crate::display::primary_lcd::PrimaryLcdDisplay;
pub fn show<'a>(
display: &mut PrimaryLcdDisplay<'static>,
name: &str,
position: i32,
selected: i32,
) {
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE);
Text::new(
name,
Point::new(40, 40 + position * 40),
if position == selected {
selected_style
} else {
style
},
)
.draw(display)
.unwrap();
}