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

refactor: move views to views sub folder

Browse Source
This commit is contained in:
rhetenor
2026-08-18 19:24:50 +00:00
parent ea3bd5c10b
commit 2bab03351b
16 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/navigation/main_menu.rs
-65
View File
@@ -1,65 +0,0 @@
use core::future;
use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
use crate::navigation::menu_item;
use crate::navigation::settings_menu::SettingsMenu;
use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::RgbColor;
use embedded_graphics_core::draw_target::DrawTarget;
use super::state::ScreenItem;
pub const MAX_SELECTED: i32 = 3;
#[derive(Debug, Clone)]
pub struct MainMenu {
pub selected: i32,
}
impl super::navigation::Navigable for MainMenu {
fn display(
&self,
display: &mut PrimaryLcdDisplay<'static>,
) -> impl core::future::Future<Output = ()> + Send {
display.clear(Rgb565::BLACK).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(())
}
fn handle_input(
&self,
input: super::navigation::Action,
) -> impl core::future::Future<Output = ScreenItem> + Send {
let new_menu = match input {
super::navigation::Action::Up => {
let new_selected = if (self.selected - 1) < 0 {
MAX_SELECTED - 1
} else {
self.selected - 1
};
ScreenItem::Main(MainMenu {
selected: new_selected,
})
}
super::navigation::Action::Down => {
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
ScreenItem::Main(MainMenu {
selected: new_selected,
})
}
super::navigation::Action::Ok => match self.selected {
2 => ScreenItem::Settings(SettingsMenu { selected: 0 }),
_ => ScreenItem::Main(self.clone()),
},
_ => ScreenItem::Main(self.clone()),
};
future::ready(new_menu)
}
}
src/navigation/menu_item.rs
-33
View File
@@ -1,33 +0,0 @@
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();
}
src/navigation/navigation.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use crate::navigation::scan_menu::ScanMenu;
use crate::navigation::state::{NavigationState, ScreenItem};
use crate::navigation::state::NavigationState;
use crate::views::view::View;
use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
use embassy_futures::select::Either6;
@@ -23,7 +23,7 @@ pub trait Navigable {
&self,
display: &mut PrimaryLcdDisplay<'static>,
) -> impl core::future::Future<Output = ()> + Send;
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = ScreenItem> + Send;
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send;
}
#[embassy_executor::task]
src/navigation/scan_menu.rs
-97
View File
@@ -1,97 +0,0 @@
use crate::display::primary_lcd::PrimaryLcdDisplay;
use alloc::format;
use embedded_graphics::Drawable;
use embedded_graphics::geometry::AngleUnit as _;
use embedded_graphics::geometry::Dimensions as _;
use embedded_graphics::geometry::Size;
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::primitives::Arc;
use embedded_graphics::primitives::Primitive as _;
use embedded_graphics::primitives::PrimitiveStyleBuilder;
use embedded_graphics::primitives::Rectangle;
use embedded_graphics::primitives::StrokeAlignment;
use embedded_graphics::text::Alignment;
use embedded_graphics::text::Baseline;
use embedded_graphics::text::Text;
use embedded_graphics::text::TextStyleBuilder;
use embedded_graphics_core::draw_target::DrawTarget;
use super::navigation::Action;
use super::state::ScreenItem;
#[derive(Debug, Clone)]
pub struct ScanMenu {
pub progress: u8, // 0..255
}
impl super::navigation::Navigable for ScanMenu {
fn display(
&self,
display: &mut PrimaryLcdDisplay<'static>,
) -> impl core::future::Future<Output = ()> + Send {
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
display.clear(Rgb565::BLACK).unwrap();
let display_area = display.bounding_box();
Text::new("Scanning...", Point::new(20, 30), style)
.draw(display)
.unwrap();
// Create styles used by the drawing operations.
let arc_stroke = PrimitiveStyleBuilder::new()
.stroke_color(Rgb565::WHITE)
.stroke_width(5)
.stroke_alignment(StrokeAlignment::Inside)
.build();
let character_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let text_style = TextStyleBuilder::new()
.baseline(Baseline::Middle)
.alignment(Alignment::Center)
.build();
let sweep = self.progress as f32 * 360.0 / 255.0;
let width = display_area.size.width;
let bounding_box =
Rectangle::with_center(display_area.center(), Size::new_equal(4 * width / 5));
// log::info!("bounding_box: {:?}", bounding_box);
// log::info!("display_area: {:?}", display_area);
// Draw an arc with a 5px wide stroke.
Arc::new(
bounding_box.top_left,
bounding_box.size.width,
90.0.deg(),
sweep.deg(),
)
.into_styled(arc_stroke)
.draw(display)
.unwrap();
// Draw centered text.
let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.);
Text::with_text_style(&text, display_area.center(), character_style, text_style)
.draw(display)
.unwrap();
core::future::ready(())
}
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = ScreenItem> + Send {
async move {
let new_progress = match input {
Action::Up => self.progress.wrapping_add(5),
_ => self.progress,
};
ScreenItem::Scan(ScanMenu {
progress: new_progress,
})
}
}
}
src/navigation/settings_menu.rs
-33
View File
@@ -1,33 +0,0 @@
use crate::navigation::menu_item;
use crate::navigation::state::ScreenItem;
use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::RgbColor;
use embedded_graphics_core::draw_target::DrawTarget;
pub const MAX_SELECTED: i8 = 2;
#[derive(Debug, Clone)]
pub struct SettingsMenu {
pub selected: i32,
}
impl super::navigation::Navigable for SettingsMenu {
fn display(
&self,
display: &mut PrimaryLcdDisplay<'static>,
) -> impl core::future::Future<Output = ()> + Send {
display.clear(Rgb565::BLACK).unwrap();
menu_item::show(display, "System Inforation", 0, self.selected);
menu_item::show(display, "Wifi Information", 1, self.selected);
core::future::ready(())
}
fn handle_input(
&self,
input: super::navigation::Action,
) -> impl core::future::Future<Output = ScreenItem> + Send {
async move { ScreenItem::Settings(SettingsMenu { selected: 0 }) }
}
}
src/navigation/state.rs
+4 -41
View File
@@ -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");