Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-12 11:42:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Clean up UI navigation push constructor scheme.

Browse source
This commit is contained in:
Jared Boone 2015-12-14 10:22:42 -08:00
parent a1aa6ecdbf
commit 97f29f8336
5 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/application/ui_navigation.cpp
View file

@ -48,7 +48,7 @@ NavigationView::NavigationView()
{
}
void NavigationView::push(View* new_view) {
void NavigationView::push_view(View* new_view) {
// TODO: Trap nullptr?
// TODO: Trap push of object already on stack?
view_stack.push_back(new_view);
@ -96,13 +96,13 @@ void NavigationView::focus() {
SystemMenuView::SystemMenuView(NavigationView& nav) {
add_items<7>({ {
{ "Receiver", [&nav](){ nav.push(new ReceiverView { nav, portapack::receiver_model }); } },
{ "Capture", [&nav](){ nav.push(new NotImplementedView { nav }); } },
{ "Analyze", [&nav](){ nav.push(new NotImplementedView { nav }); } },
{ "Setup", [&nav](){ nav.push(new SetupMenuView { nav }); } },
{ "About", [&nav](){ nav.push(new AboutView { nav }); } },
{ "Debug", [&nav](){ nav.push(new DebugMenuView { nav }); } },
{ "HackRF", [&nav](){ nav.push(new HackRFFirmwareView { nav }); } },
{ "Receiver", [&nav](){ nav.push<ReceiverView>(nav, portapack::receiver_model); } },
{ "Capture", [&nav](){ nav.push<NotImplementedView>(nav); } },
{ "Analyze", [&nav](){ nav.push<NotImplementedView>(nav); } },
{ "Setup", [&nav](){ nav.push<SetupMenuView>(nav); } },
{ "About", [&nav](){ nav.push<AboutView>(nav); } },
{ "Debug", [&nav](){ nav.push<DebugMenuView>(nav); } },
{ "HackRF", [&nav](){ nav.push<HackRFFirmwareView>(nav); } },
} });
}
@ -138,7 +138,7 @@ SystemView::SystemView(
// Initial view.
// TODO: Restore from non-volatile memory?
navigation_view.push(new SystemMenuView { navigation_view });
navigation_view.push<SystemMenuView>(navigation_view);
}
Context& SystemView::context() const {