portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-10 00:29:33 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Cleaned up and tweaked

Browse Source
This commit is contained in:
klockee
2020-08-08 04:24:57 -04:00
parent 9c9021f63b
commit b300cc258e
5 changed files with 38 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui_navigation.cpp
+11 -40
View File
@@ -321,38 +321,14 @@ InformationView::InformationView(
add_children({
&backdrop,
&version,
&test,
&time
&ltime
});
test.on_select = [this](ImageButton&){
update_time();
};
this->set_focusable(true);
this->set_visible(true);
time.set_focusable(true);
version.set_style(&style_infobar);
ltime.set_style(&style_infobar);
ltime.set_seconds_enabled(true);
ltime.set_date_enabled(false);
time.on_select = [this](Button&) {
this->on_time();
};
refresh();
}
void InformationView::refresh() {
update_time();
set_dirty();
}
void InformationView::on_time(){
update_time();
}
void InformationView::update_time() {
rtcGetTime(&RTCD1, &datetime);
time.set_text(to_string_datetime(datetime));
set_dirty();
}
@@ -584,17 +560,18 @@ SystemView::SystemView(
this->navigation_view.pop();
};
add_child(&navigation_view);
navigation_view.set_parent_rect({
{ 0, status_view_height },
{ parent_rect.width(), static_cast<ui::Dim>(parent_rect.height() - status_view_height) }
});
add_child(&info_view);
info_view.set_parent_rect({
{0, 19 * 16},
{ parent_rect.width(), info_view_height }
});
add_child(&navigation_view);
navigation_view.set_parent_rect({
{ 0, status_view_height },
{ parent_rect.width(), static_cast<ui::Dim>(parent_rect.height() - status_view_height - info_view_height) }
});
navigation_view.on_view_changed = [this](const View& new_view) {
if(!this->navigation_view.is_top()){
@@ -602,7 +579,7 @@ SystemView::SystemView(
}
else{
add_child(&info_view);
this->info_view.update_time();
//this->info_view.set_dirty();
}
this->status_view.set_back_enabled(!this->navigation_view.is_top());
@@ -610,8 +587,6 @@ SystemView::SystemView(
this->status_view.set_title(new_view.title());
this->status_view.set_dirty();
//this->info_view.focus();
};
@@ -640,10 +615,6 @@ Context& SystemView::context() const {
return context_;
}
void SystemView::on_tick_second() {
this->info_view.update_time();
}
/* ***********************************************************************/
void BMPView::focus() {
firmware/application/ui_navigation.hpp
+3 -32
View File
@@ -211,54 +211,27 @@ private:
class InformationView : public View {
public:
InformationView(NavigationView& nav);
void update_time();
private:
void refresh();
static constexpr auto version_string = "v1.1.1";
NavigationView& nav_;
void on_time();
rtc::RTC datetime;
Rectangle backdrop {
{ 0, 0 * 16, 240, 16 },
{33, 33, 33}
{ 0, 0 * 16, 240, 16 },
{33, 33, 33}
};
Text version {
{0, 0, 11 * 8, 16},
version_string
};
ImageButton test {
{80, 0, 16, 16},
&bitmap_icon_camera,
Color::white(),
Color::dark_grey()
};
Button time {
{120, 0, 11 * 8, 16},
""
};
/*
LiveDateTime ltime {
{120, 0, 11 * 8, 16}
{176, 0, 8 * 8, 16}
};
*/
MessageHandlerRegistration message_handler_refresh {
Message::ID::InfoRefresh,
[this](const Message* const p) {
(void)p;
this->refresh();
}
};
};
class BMPView : public View {
@@ -314,8 +287,6 @@ public:
Context& context() const override;
private:
void on_tick_second();
SystemStatusView status_view { navigation_view };
InformationView info_view { navigation_view };
NavigationView navigation_view { };