diff --git a/firmware/application/ui/ui_btngrid.cpp b/firmware/application/ui/ui_btngrid.cpp
index 0c756af4e03660247755dfbbc289b055e053756d..2ad7907eb55524615a912563be7d54c0710546f1 100644
--- a/firmware/application/ui/ui_btngrid.cpp
+++ b/firmware/application/ui/ui_btngrid.cpp
@@ -95,6 +95,15 @@ void BtnGridView::set_parent_rect(const Rect new_parent_rect) {
update_items();
}
+void BtnGridView::set_arrow_enabled(bool new_value) {
+ if(new_value){
+ add_child(&arrow_more);
+ }
+ else{
+ remove_child(&arrow_more);
+ }
+};
+
void BtnGridView::on_tick_second() {
if (more && blink)
arrow_more.set_foreground(Color::white());
diff --git a/firmware/application/ui/ui_btngrid.hpp b/firmware/application/ui/ui_btngrid.hpp
index 1ce14ccacf7bacd793c990b64ebf6fa6179c3c5e..5f922f78b11a6aca0ed5da85972bcf9c7d121677 100644
--- a/firmware/application/ui/ui_btngrid.hpp
+++ b/firmware/application/ui/ui_btngrid.hpp
@@ -62,6 +62,7 @@ public:
uint32_t highlighted_index();
void set_parent_rect(const Rect new_parent_rect) override;
+ void set_arrow_enabled(bool new_value);
void on_focus() override;
void on_blur() override;
bool on_key(const KeyEvent event) override;
diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp
index 32fdafcc48f8b87289f854533f362015b9567243..42b2fdb3dc567d893aa43d728433252910fb874f 100644
--- a/firmware/application/ui_navigation.cpp
+++ b/firmware/application/ui_navigation.cpp
@@ -306,6 +306,32 @@ void SystemStatusView::on_title() {
nav_.push<AboutView>();
}
+/* Information View *****************************************************/
+
+InformationView::InformationView(
+ NavigationView& nav
+) : nav_ (nav)
+{
+ static constexpr Style style_infobar {
+ .font = font::fixed_8x16,
+ .background = {33, 33, 33},
+ .foreground = Color::white(),
+ };
+
+ add_children({
+ &backdrop,
+ &version,
+ <ime
+ });
+
+ version.set_style(&style_infobar);
+ ltime.set_style(&style_infobar);
+ ltime.set_seconds_enabled(true);
+ ltime.set_date_enabled(false);
+
+ set_dirty();
+}
+
/* Navigation ************************************************************/
bool NavigationView::is_top() const {
@@ -502,6 +528,7 @@ SystemMenuView::SystemMenuView(NavigationView& nav) {
//{ "About", ui::Color::cyan(), nullptr, [&nav](){ nav.push<AboutView>(); } }
});
set_max_rows(2); // allow wider buttons
+ set_arrow_enabled(false);
//set_highlighted(1); // Startup selection
}
@@ -522,6 +549,7 @@ SystemView::SystemView(
set_style(&style_default);
constexpr ui::Dim status_view_height = 16;
+ constexpr ui::Dim info_view_height = 16;
add_child(&status_view);
status_view.set_parent_rect({
@@ -537,13 +565,29 @@ SystemView::SystemView(
{ 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 }
+ });
+
navigation_view.on_view_changed = [this](const View& new_view) {
+
+ if(!this->navigation_view.is_top()){
+ remove_child(&info_view);
+ }
+ else{
+ add_child(&info_view);
+ }
+
this->status_view.set_back_enabled(!this->navigation_view.is_top());
this->status_view.set_title_image_enabled(this->navigation_view.is_top());
- this->status_view.set_dirty();
this->status_view.set_title(new_view.title());
+ this->status_view.set_dirty();
+
};
-
+
// portapack::persistent_memory::set_playdead_sequence(0x8D1);
@@ -557,6 +601,9 @@ SystemView::SystemView(
if (portapack::persistent_memory::config_splash())
navigation_view.push<BMPView>();
+ status_view.set_back_enabled(false);
+ status_view.set_title_image_enabled(true);
+ status_view.set_dirty();
//else
// navigation_view.push<SystemMenuView>();
diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp
index 8754d35d9547ddab86454b4d74114facc3b3877e..e626c11544937ceaca387fc6a634af0d7617bfed 100644
--- a/firmware/application/ui_navigation.hpp
+++ b/firmware/application/ui_navigation.hpp
@@ -110,7 +110,7 @@ public:
void set_title(const std::string new_value);
private:
- static constexpr auto default_title = " v1.1.1"; // TODO: Move the version somewhere
+ static constexpr auto default_title = "";
NavigationView& nav_;
@@ -208,6 +208,29 @@ private:
};
};
+class InformationView : public View {
+public:
+ InformationView(NavigationView& nav);
+
+private:
+ static constexpr auto version_string = "v1.1.1";
+ NavigationView& nav_;
+
+ Rectangle backdrop {
+ { 0, 0 * 16, 240, 16 },
+ {33, 33, 33}
+ };
+
+ Text version {
+ {0, 0, 11 * 8, 16},
+ version_string
+ };
+
+ LiveDateTime ltime {
+ {176, 0, 8 * 8, 16}
+ };
+};
+
class BMPView : public View {
public:
BMPView(NavigationView& nav);
@@ -262,6 +285,7 @@ public:
private:
SystemStatusView status_view { navigation_view };
+ InformationView info_view { navigation_view };
NavigationView navigation_view { };
Context& context_;
};
diff --git a/firmware/common/ui_widget.cpp b/firmware/common/ui_widget.cpp
index 01639e0c5ec3cd5eaf4dac6e3c8aad389f7a80ff..1372410d3c28a601f135486be2f75a2377576997 100644
--- a/firmware/common/ui_widget.cpp
+++ b/firmware/common/ui_widget.cpp
@@ -409,10 +409,17 @@ void Labels::paint(Painter& painter) {
void LiveDateTime::on_tick_second() {
rtcGetTime(&RTCD1, &datetime);
+ text = "";
- text = to_string_dec_uint(datetime.month(), 2, '0') + "/" + to_string_dec_uint(datetime.day(), 2, '0') + " " +
- to_string_dec_uint(datetime.hour(), 2, '0') + ":" + to_string_dec_uint(datetime.minute(), 2, '0');
+ if(date_enabled){
+ text = to_string_dec_uint(datetime.month(), 2, '0') + "/" + to_string_dec_uint(datetime.day(), 2, '0') + " ";
+ }
+ text = text + to_string_dec_uint(datetime.hour(), 2, '0') + ":" + to_string_dec_uint(datetime.minute(), 2, '0');
+
+ if(seconds_enabled){
+ text = text + ":" + to_string_dec_uint(datetime.second(), 2, '0');
+ }
set_dirty();
}
@@ -444,6 +451,14 @@ void LiveDateTime::paint(Painter& painter) {
);
}
+void LiveDateTime::set_date_enabled(bool new_value){
+ this->date_enabled = new_value;
+}
+
+void LiveDateTime::set_seconds_enabled(bool new_value) {
+ this->seconds_enabled = new_value;
+}
+
/* BigFrequency **********************************************************/
BigFrequency::BigFrequency(
diff --git a/firmware/common/ui_widget.hpp b/firmware/common/ui_widget.hpp
index 61ffeb7258125103085e40dbb03f4cd8e8cb192c..5b592c486118c4ec053c0e0032aa665ce389a78e 100644
--- a/firmware/common/ui_widget.hpp
+++ b/firmware/common/ui_widget.hpp
@@ -243,7 +243,10 @@ public:
~LiveDateTime();
void paint(Painter& painter) override;
-
+
+ void set_seconds_enabled(bool new_value);
+ void set_date_enabled(bool new_value);
+
std::string& string() {
return text;
}
@@ -251,6 +254,9 @@ public:
private:
void on_tick_second();
+ bool date_enabled = true;
+ bool seconds_enabled = false;
+
rtc::RTC datetime { };
SignalToken signal_token_tick_second { };
std::string text { };