TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 12:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename display_error() -> display_modal(), add title argument.

Browse Source
This commit is contained in:
Jared Boone 2016-05-17 10:15:34 -07:00
parent 6a3cd4c144
commit ac49726707
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/analog_audio_app.cpp
View File

@ -140,7 +140,7 @@ AnalogAudioView::AnalogAudioView(
};
record_view.on_error = [&nav](std::string message) {
nav.display_error(message);
nav.display_modal("Error", message);
};
audio::output::start();

2
firmware/application/capture_app.cpp
View File

@ -71,7 +71,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
record_view.set_sampling_rate(sampling_rate / 8);
record_view.on_error = [&nav](std::string message) {
nav.display_error(message);
nav.display_modal("Error", message);
};
}

14
firmware/application/ui_navigation.cpp
View File

@ -131,10 +131,13 @@ void NavigationView::pop() {
}
}
void NavigationView::display_error(const std::string& message) {
void NavigationView::display_modal(
const std::string& title,
const std::string& message
) {
/* If a modal view is already visible, don't display another */
if( !modal_view ) {
modal_view = push<ModalMessageView>(message);
modal_view = push<ModalMessageView>(title, message);
}
}
@ -290,7 +293,12 @@ void NotImplementedView::focus() {
/* ModalMessageView ******************************************************/
ModalMessageView::ModalMessageView(NavigationView& nav, std::string message) {
ModalMessageView::ModalMessageView(
NavigationView& nav,
const std::string& title,
const std::string& message
) : title_ { title }
{
button_done.on_select = [&nav](Button&){
nav.pop();
};

12
firmware/application/ui_navigation.hpp
View File

@ -102,7 +102,7 @@ public:
void pop();
void display_error(const std::string& message);
void display_modal(const std::string& title, const std::string& message);
void focus() override;
@ -210,11 +210,19 @@ private:
class ModalMessageView : public View {
public:
ModalMessageView(NavigationView& nav, std::string message);
ModalMessageView(
NavigationView& nav,
const std::string& title,
const std::string& message
);
void focus() override;
std::string title() const override { return title_; };
private:
const std::string title_;
Text text_message {
{ 0 * 8, 7 * 16, 30 * 8, 16 },
""