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

fix: recognize actual button, not wrong one

Browse Source
This commit was merged in pull request #30.
This commit is contained in:
ede1998
2026-08-22 18:29:35 +02:00
parent 07c5210d7b
commit b6f43d1055
7 changed files with 136 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/main_menu.rs
+48 -37
View File
@@ -1,10 +1,10 @@
use alloc::vec;
use core::future;
use crate::card::model::Card;
use crate::card::{decoder::split_nfc_hex, mock::*};
use crate::display::primary_lcd::PrimaryLcdDisplay;
use crate::navigation::inputs::ButtonAction;
use crate::views::card_view::CardView;
use crate::views::journal_view::JournalView;
use crate::views::{menu_item, settings_menu::SettingsMenu, view::View};
@@ -37,43 +37,54 @@ impl Navigable for MainMenu {
}
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD3).unwrap()).unwrap();
let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap();
let new_menu = match input {
Action::Up => {
let new_selected = if (self.selected - 1) < 0 {
MAX_SELECTED - 1
} else {
self.selected - 1
async move {
let Action::Button(input) = input else {
// Skip timer inputs
return NewState {
view: View::Main(self.clone()),
replace_view: true,
redraw: false,
};
View::Main(MainMenu {
selected: new_selected,
})
}
Action::Down => {
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
View::Main(MainMenu {
selected: new_selected,
})
}
Action::Ok => match self.selected {
0 => View::Scan(crate::views::scan_menu::ScanMenu { progress: 0 }),
1 => View::Card(CardView { card: card_mock1 }),
2 => View::Journal(JournalView {
cards: vec![card_mock1, card_mock2],
selected_card: 0,
}),
3 => View::Settings(SettingsMenu { selected: 0 }),
_ => View::Main(self.clone()),
},
_ => View::Main(self.clone()),
};
};
future::ready(NewState {
replace_view: matches!(new_menu, View::Main(_)),
view: new_menu,
redraw: !matches!(input, Action::Timer),
})
let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD3).unwrap()).unwrap();
let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap();
let new_menu = match input {
ButtonAction::Up => {
let new_selected = if (self.selected - 1) < 0 {
MAX_SELECTED - 1
} else {
self.selected - 1
};
View::Main(MainMenu {
selected: new_selected,
})
}
ButtonAction::Down => {
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
View::Main(MainMenu {
selected: new_selected,
})
}
ButtonAction::Ok => match self.selected {
0 => View::Scan(crate::views::scan_menu::ScanMenu { progress: 0 }),
1 => View::Card(CardView { card: card_mock1 }),
2 => View::Journal(JournalView {
cards: vec![card_mock1, card_mock2],
selected_card: 0,
}),
3 => View::Settings(SettingsMenu { selected: 0 }),
_ => View::Main(self.clone()),
},
_ => View::Main(self.clone()),
};
NewState {
replace_view: matches!(new_menu, View::Main(_)),
view: new_menu,
redraw: true,
}
}
}
}