summaryrefslogtreecommitdiff
path: root/src/DisplayApp/Screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp/Screens')
-rw-r--r--src/DisplayApp/Screens/Clock.cpp142
-rw-r--r--src/DisplayApp/Screens/Clock.h51
-rw-r--r--src/DisplayApp/Screens/Gauge.cpp57
-rw-r--r--src/DisplayApp/Screens/Gauge.h39
-rw-r--r--src/DisplayApp/Screens/Message.cpp82
-rw-r--r--src/DisplayApp/Screens/Message.h20
-rw-r--r--src/DisplayApp/Screens/Meter.cpp47
-rw-r--r--src/DisplayApp/Screens/Meter.h38
-rw-r--r--src/DisplayApp/Screens/Modal.cpp81
-rw-r--r--src/DisplayApp/Screens/Modal.h44
-rw-r--r--src/DisplayApp/Screens/Screen.h15
-rw-r--r--src/DisplayApp/Screens/Tab.cpp67
-rw-r--r--src/DisplayApp/Screens/Tab.h28
-rw-r--r--src/DisplayApp/Screens/Tile.cpp163
-rw-r--r--src/DisplayApp/Screens/Tile.h64
15 files changed, 868 insertions, 70 deletions
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp
index 16f4cfeb..7051c433 100644
--- a/src/DisplayApp/Screens/Clock.cpp
+++ b/src/DisplayApp/Screens/Clock.cpp
@@ -2,36 +2,94 @@
#include <libs/date/includes/date/date.h>
#include <Components/DateTime/DateTimeController.h>
#include <Version.h>
+#include <libs/lvgl/lvgl.h>
#include "Clock.h"
+#include "../DisplayApp.h"
using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
-void Clock::Refresh(bool fullRefresh) {
- if(fullRefresh) {
- gfx.FillRectangle(0,0,240,240,0x0000);
- currentChar[0] = 1;
- currentChar[1] = 2;
- currentChar[2] = 3;
- currentChar[3] = 4;
- auto dummy = currentDateTime.Get();
- }
+static void event_handler(lv_obj_t * obj, lv_event_t event) {
+ Clock* screen = static_cast<Clock *>(obj->user_data);
+ screen->OnObjectEvent(obj, event);
+}
+
+Clock::Clock(DisplayApp* app,
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController) : Screen(app), currentDateTime{{}}, version {{}},
+ dateTimeController{dateTimeController}, batteryController{batteryController}, bleController{bleController} {
+ displayedChar[0] = 0;
+ displayedChar[1] = 0;
+ displayedChar[2] = 0;
+ displayedChar[3] = 0;
+ displayedChar[4] = 0;
+
+ label_battery = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_align(label_battery, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -80, 0);
+
+ labelStyle = const_cast<lv_style_t *>(lv_label_get_style(label_battery, LV_LABEL_STYLE_MAIN));
+ labelStyle->text.font = &jetbrains_mono_bold_20;
+
+ lv_style_copy(&labelBigStyle, labelStyle);
+ labelBigStyle.text.font = &jetbrains_mono_extrabold_compressed;
+
+ lv_label_set_style(label_battery, LV_LABEL_STYLE_MAIN, labelStyle);
+
+ label_ble = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_style(label_ble, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_obj_align(label_ble, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, 0);
+
+ label_time = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_style(label_time, LV_LABEL_STYLE_MAIN, &labelBigStyle);
+ lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);
+
+
+ label_date = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_style(label_date, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60);
+
+ backgroundLabel = lv_label_create(lv_scr_act(), NULL);
+ backgroundLabel->user_data = this;
+ lv_label_set_style(backgroundLabel, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_obj_set_click(backgroundLabel, true);
+ lv_obj_set_event_cb(backgroundLabel, event_handler);
+ lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+ lv_obj_set_size(backgroundLabel, 240, 240);
+ lv_obj_set_pos(backgroundLabel, 0, 0);
+ lv_label_set_text(backgroundLabel, "");
+}
+
+Clock::~Clock() {
+ lv_obj_clean(lv_scr_act());
+}
- if (fullRefresh || batteryPercentRemaining.IsUpdated()) {
+bool Clock::Refresh() {
+ batteryPercentRemaining = batteryController.PercentRemaining();
+ if (batteryPercentRemaining.IsUpdated()) {
char batteryChar[11];
auto newBatteryValue = batteryPercentRemaining.Get();
newBatteryValue = (newBatteryValue > 100) ? 100 : newBatteryValue;
newBatteryValue = (newBatteryValue < 0) ? 0 : newBatteryValue;
sprintf(batteryChar, "BAT: %d%%", newBatteryValue);
- gfx.DrawString((240 - 108), 0, 0xffff, batteryChar, &smallFont, false);
+ lv_label_set_text(label_battery, batteryChar);
}
- if (fullRefresh || bleState.IsUpdated()) {
- uint16_t color = (bleState.Get() == BleConnectionStates::Connected) ? 0xffff : 0x0000;
- gfx.DrawString(10, 0, color, "BLE", &smallFont, false);
+ bleState = bleController.IsConnected();
+ if (bleState.IsUpdated()) {
+ if(bleState.Get() == true) {
+ lv_obj_set_hidden(label_ble, false);
+ lv_label_set_text(label_ble, "BLE");
+ } else {
+ lv_obj_set_hidden(label_ble, true);
+ }
}
- if(fullRefresh || currentDateTime.IsUpdated()) {
+ currentDateTime = dateTimeController.CurrentDateTime();
+
+ if(currentDateTime.IsUpdated()) {
auto newDateTime = currentDateTime.Get();
auto dp = date::floor<date::days>(newDateTime);
@@ -53,35 +111,23 @@ void Clock::Refresh(bool fullRefresh) {
char hoursChar[3];
sprintf(hoursChar, "%02d", hour);
- uint8_t x = 7;
- if (hoursChar[0] != currentChar[0]) {
- gfx.DrawChar(&largeFont, hoursChar[0], &x, 78, 0xffff);
- currentChar[0] = hoursChar[0];
- }
-
- x = 61;
- if (hoursChar[1] != currentChar[1]) {
- gfx.DrawChar(&largeFont, hoursChar[1], &x, 78, 0xffff);
- currentChar[1] = hoursChar[1];
- }
+ char timeStr[6];
+ sprintf(timeStr, "%c%c:%c%c", hoursChar[0],hoursChar[1],minutesChar[0], minutesChar[1]);
- x = 127;
- if (minutesChar[0] != currentChar[2]) {
- gfx.DrawChar(&largeFont, minutesChar[0], &x, 78, 0xffff);
- currentChar[2] = minutesChar[0];
- }
+ if(hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] || minutesChar[1] != displayedChar[3]) {
+ displayedChar[0] = hoursChar[0];
+ displayedChar[1] = hoursChar[1];
+ displayedChar[2] = minutesChar[0];
+ displayedChar[3] = minutesChar[1];
- x = 181;
- if (minutesChar[1] != currentChar[3]) {
- gfx.DrawChar(&largeFont, minutesChar[1], &x, 78, 0xffff);
- currentChar[3] = minutesChar[1];
+ lv_label_set_text(label_time, timeStr);
}
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
- gfx.FillRectangle(0,180, 240, 15, 0x0000);
char dateStr[22];
sprintf(dateStr, "%s %d %s %d", DayOfWeekToString(dayOfWeek), day, MonthToString(month), year);
- gfx.DrawString(10, 180, 0xffff, dateStr, &smallFont, false);
+ lv_label_set_text(label_date, dateStr);
+
currentYear = year;
currentMonth = month;
@@ -90,12 +136,7 @@ void Clock::Refresh(bool fullRefresh) {
}
}
- if(fullRefresh || version.IsUpdated()) {
- auto dummy = version.Get();
- char versionStr[20];
- sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
- gfx.DrawString(20, 220, 0xffff, versionStr, &smallFont, false);
- }
+ return running;
}
const char *Clock::MonthToString(Pinetime::Controllers::DateTime::Months month) {
@@ -132,3 +173,18 @@ char const *Clock::MonthsString[] = {
"NOV",
"DEC"
};
+
+void Clock::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
+ if(obj == backgroundLabel) {
+ if (event == LV_EVENT_CLICKED) {
+
+ running = false;
+ }
+ }
+}
+
+bool Clock::OnButtonPushed() {
+ return Screen::OnButtonPushed();
+}
+
+
diff --git a/src/DisplayApp/Screens/Clock.h b/src/DisplayApp/Screens/Clock.h
index 75ea34dd..d14595b0 100644
--- a/src/DisplayApp/Screens/Clock.h
+++ b/src/DisplayApp/Screens/Clock.h
@@ -5,6 +5,10 @@
#include <Components/Gfx/Gfx.h>
#include "Screen.h"
#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
#include "../Fonts/lcdfont14.h"
#include "../Fonts/lcdfont70.h"
#include "../../Version.h"
@@ -19,11 +23,13 @@ namespace Pinetime {
explicit DirtyValue(T v) { value = v; }
explicit DirtyValue(T& v) { value = v; }
bool IsUpdated() const { return isUpdated; }
- T& Get() { this->isUpdated = false; return value;}
+ T& Get() { this->isUpdated = false; return value; }
DirtyValue& operator=(const T& other) {
- this->value = other;
- this->isUpdated = true;
+ if (this->value != other) {
+ this->value = other;
+ this->isUpdated = true;
+ }
return *this;
}
private:
@@ -32,33 +38,50 @@ namespace Pinetime {
};
class Clock : public Screen{
public:
- enum class BleConnectionStates{ NotConnected, Connected};
- Clock(Components::Gfx& gfx) : Screen(gfx), currentDateTime{{}}, version {{}} {}
- void Refresh(bool fullRefresh) override;
+ Clock(DisplayApp* app,
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController);
+ ~Clock() override;
- void SetBatteryPercentRemaining(uint8_t percent) { batteryPercentRemaining = percent; }
- void SetBleConnectionState(BleConnectionStates state) { bleState = state; }
- void SetCurrentDateTime(const std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>& tp) { currentDateTime = tp;}
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+ void OnObjectEvent(lv_obj_t *pObj, lv_event_t i);
private:
static const char* MonthToString(Pinetime::Controllers::DateTime::Months month);
static const char* DayOfWeekToString(Pinetime::Controllers::DateTime::Days dayOfWeek);
static char const *DaysString[];
static char const *MonthsString[];
- const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
- const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
+ char displayedChar[5];
- char currentChar[4];
uint16_t currentYear = 1970;
Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
uint8_t currentDay = 0;
DirtyValue<uint8_t> batteryPercentRemaining {0};
- DirtyValue<BleConnectionStates> bleState {BleConnectionStates::NotConnected};
- DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>> currentDateTime;
+ DirtyValue<bool> bleState {false};
+ DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime;
DirtyValue<Pinetime::Version> version;
+
+ lv_style_t* labelStyle;
+ lv_style_t labelBigStyle;
+ lv_obj_t * label_battery;
+
+ lv_obj_t * label_ble;
+ lv_obj_t* label_time;
+ lv_obj_t* label_date;
+ lv_obj_t* label_version;
+ lv_obj_t* backgroundLabel;
+
+ Controllers::DateTime& dateTimeController;
+ Controllers::Battery& batteryController;
+ Controllers::Ble& bleController;
+
+ bool running = true;
+
};
}
}
diff --git a/src/DisplayApp/Screens/Gauge.cpp b/src/DisplayApp/Screens/Gauge.cpp
new file mode 100644
index 00000000..4c4cccd9
--- /dev/null
+++ b/src/DisplayApp/Screens/Gauge.cpp
@@ -0,0 +1,57 @@
+#include <libs/lvgl/lvgl.h>
+#include "Gauge.h"
+#include "../DisplayApp.h"
+
+using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
+
+
+Gauge::Gauge(Pinetime::Applications::DisplayApp *app) : Screen(app) {
+ /*Create a style*/
+ lv_style_copy(&style, &lv_style_pretty_color);
+ style.body.main_color = LV_COLOR_CYAN; /*Line color at the beginning*/
+ style.body.grad_color = LV_COLOR_RED; /*Line color at the end*/
+ style.body.padding.left = 10; /*Scale line length*/
+ style.body.padding.inner = 8 ; /*Scale label padding*/
+ style.body.border.color = lv_color_hex3(0x333); /*Needle middle circle color*/
+ style.line.width = 3;
+ style.text.color = LV_COLOR_WHITE;
+ style.line.color = LV_COLOR_RED; /*Line color after the critical value*/
+
+ /*Describe the color for the needles*/
+
+ needle_colors[0] = LV_COLOR_ORANGE;
+
+ /*Create a gauge*/
+ gauge1 = lv_gauge_create(lv_scr_act(), NULL);
+ lv_gauge_set_style(gauge1, LV_GAUGE_STYLE_MAIN, &style);
+ lv_gauge_set_needle_count(gauge1, 1, needle_colors);
+ lv_obj_set_size(gauge1, 180, 180);
+ lv_obj_align(gauge1, NULL, LV_ALIGN_CENTER, 0, 0);
+ lv_gauge_set_scale(gauge1, 360, 60, 0);
+ lv_gauge_set_range(gauge1, 0, 59);
+
+ /*Set the values*/
+ lv_gauge_set_value(gauge1, 0, value);
+}
+
+Gauge::~Gauge() {
+
+
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Gauge::Refresh() {
+// lv_lmeter_set_value(lmeter, value++); /*Set the current value*/
+// if(value>=60) value = 0;
+
+ lv_gauge_set_value(gauge1, 0, value++);
+ if(value == 59) value = 0;
+ return running;
+}
+
+bool Gauge::OnButtonPushed() {
+ running = false;
+ return true;
+}
diff --git a/src/DisplayApp/Screens/Gauge.h b/src/DisplayApp/Screens/Gauge.h
new file mode 100644
index 00000000..463654ee
--- /dev/null
+++ b/src/DisplayApp/Screens/Gauge.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+
+ class Gauge : public Screen{
+ public:
+ Gauge(DisplayApp* app);
+ ~Gauge() override;
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ private:
+ lv_style_t style;
+ lv_color_t needle_colors[3];
+ lv_obj_t * gauge1;
+
+ uint32_t value=30;
+ bool running = true;
+
+ };
+ }
+ }
+}
diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp
index 121e34b9..c8a4ea1f 100644
--- a/src/DisplayApp/Screens/Message.cpp
+++ b/src/DisplayApp/Screens/Message.cpp
@@ -2,13 +2,87 @@
#include <libs/date/includes/date/date.h>
#include <Components/DateTime/DateTimeController.h>
#include <Version.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <libs/lvgl/src/lv_font/lv_font.h>
+#include <libs/lvgl/lvgl.h>
+#include <libraries/log/nrf_log.h>
#include "Message.h"
+#include <DisplayApp/DisplayApp.h>
+
using namespace Pinetime::Applications::Screens;
-void Message::Refresh(bool fullRefresh) {
- if(fullRefresh) {
- gfx.FillRectangle(0,0,240,240,0xffff);
- gfx.DrawString(120, 10, 0x5555, "COUCOU", &smallFont, false);
+extern lv_font_t jetbrains_mono_bold_20;
+
+static void event_handler(lv_obj_t * obj, lv_event_t event) {
+ Message* screen = static_cast<Message *>(obj->user_data);
+ screen->OnObjectEvent(obj, event);
+}
+
+Message::Message(DisplayApp* app) : Screen(app) {
+
+ backgroundLabel = lv_label_create(lv_scr_act(), NULL);
+ backgroundLabel->user_data = this;
+
+ labelStyle = const_cast<lv_style_t *>(lv_label_get_style(backgroundLabel, LV_LABEL_STYLE_MAIN));
+ labelStyle->text.font = &jetbrains_mono_bold_20;
+
+ lv_label_set_style(backgroundLabel, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_obj_set_click(backgroundLabel, true);
+ lv_obj_set_event_cb(backgroundLabel, event_handler);
+ lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+ lv_obj_set_size(backgroundLabel, 240, 240);
+ lv_obj_set_pos(backgroundLabel, 0, 0);
+ lv_label_set_text(backgroundLabel, "");
+// lv_obj_align(backgroundLabel, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);
+
+ button = lv_btn_create(lv_scr_act(), NULL);
+ lv_obj_set_event_cb(button, event_handler);
+ lv_obj_align(button, NULL, LV_ALIGN_CENTER, 0, -40);
+ button->user_data = this;
+
+ label = lv_label_create(button, NULL);
+ lv_label_set_style(label, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_label_set_text(label, "Hello!");
+
+ labelClick = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_style(labelClick, LV_LABEL_STYLE_MAIN, labelStyle);
+ lv_obj_align(labelClick, button, LV_ALIGN_OUT_BOTTOM_MID, 0, 30);
+ lv_label_set_text(labelClick, "0");
+}
+
+Message::~Message() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Message::Refresh() {
+ if(previousClickCount != clickCount) {
+ lv_label_set_text_fmt(labelClick, "%d", clickCount);
+ previousClickCount = clickCount;
+ }
+
+ return running;
+}
+
+void Message::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
+ if(obj == backgroundLabel) {
+ if(event == LV_EVENT_CLICKED) {
+ app->PushMessage(DisplayApp::Messages::SwitchScreen);
+ NRF_LOG_INFO("SCREEN");
+ }
+ return ;
}
+
+ if(event == LV_EVENT_CLICKED) {
+ NRF_LOG_INFO("Clicked");
+ clickCount++;
+ }
+ else if(event == LV_EVENT_VALUE_CHANGED) {
+ NRF_LOG_INFO("Toggled");
+ }
+}
+
+bool Message::OnButtonPushed() {
+ running = false;
+ return true;
}
diff --git a/src/DisplayApp/Screens/Message.h b/src/DisplayApp/Screens/Message.h
index ac300faf..4e87bba4 100644
--- a/src/DisplayApp/Screens/Message.h
+++ b/src/DisplayApp/Screens/Message.h
@@ -8,18 +8,30 @@
#include "../Fonts/lcdfont14.h"
#include "../Fonts/lcdfont70.h"
#include "../../Version.h"
+#include <lvgl/src/lv_core/lv_style.h>
namespace Pinetime {
namespace Applications {
namespace Screens {
class Message : public Screen{
public:
- Message(Components::Gfx& gfx) : Screen(gfx) {}
- void Refresh(bool fullRefresh) override;
+ explicit Message(DisplayApp* app);
+ ~Message() override;
+ bool Refresh() override;
+ bool OnButtonPushed();
+ void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
private:
- const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
- const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
+
+ lv_style_t* labelStyle;
+ lv_obj_t * label;
+ lv_obj_t* backgroundLabel;
+ lv_obj_t * button;
+ lv_obj_t * labelClick;
+
+ uint32_t clickCount = 0 ;
+ uint32_t previousClickCount = 0;
+ bool running = true;
};
}
}
diff --git a/src/DisplayApp/Screens/Meter.cpp b/src/DisplayApp/Screens/Meter.cpp
new file mode 100644
index 00000000..c74b8bdf
--- /dev/null
+++ b/src/DisplayApp/Screens/Meter.cpp
@@ -0,0 +1,47 @@
+#include <libs/lvgl/lvgl.h>
+#include "Meter.h"
+#include "../DisplayApp.h"
+
+using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
+
+
+Meter::Meter(Pinetime::Applications::DisplayApp *app) : Screen(app) {
+
+ lv_style_copy(&style_lmeter, &lv_style_pretty_color);
+ style_lmeter.line.width = 2;
+ style_lmeter.line.color = LV_COLOR_SILVER;
+ style_lmeter.body.main_color = lv_color_make(255,0,0);
+ style_lmeter.body.grad_color = lv_color_make(160,0,0);
+ style_lmeter.body.padding.left = 16; /*Line length*/
+
+ /*Create a line meter */
+ lmeter = lv_lmeter_create(lv_scr_act(), NULL);
+ lv_lmeter_set_range(lmeter, 0, 60); /*Set the range*/
+ lv_lmeter_set_value(lmeter, value); /*Set the current value*/
+ lv_lmeter_set_angle_offset(lmeter, 180);
+ lv_lmeter_set_scale(lmeter, 360, 60); /*Set the angle and number of lines*/
+ lv_lmeter_set_style(lmeter, LV_LMETER_STYLE_MAIN, &style_lmeter); /*Apply the new style*/
+ lv_obj_set_size(lmeter, 150, 150);
+ lv_obj_align(lmeter, NULL, LV_ALIGN_CENTER, 0, 0);
+
+}
+
+Meter::~Meter() {
+
+
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Meter::Refresh() {
+ lv_lmeter_set_value(lmeter, value++); /*Set the current value*/
+ if(value>=60) value = 0;
+
+ return running;
+}
+
+bool Meter::OnButtonPushed() {
+ running = false;
+ return true;
+}
diff --git a/src/DisplayApp/Screens/Meter.h b/src/DisplayApp/Screens/Meter.h
new file mode 100644
index 00000000..1a08b46c
--- /dev/null
+++ b/src/DisplayApp/Screens/Meter.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+
+ class Meter : public Screen{
+ public:
+ Meter(DisplayApp* app);
+ ~Meter() override;
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ private:
+ lv_style_t style_lmeter;
+ lv_obj_t * lmeter;
+
+ uint32_t value=0;
+ bool running = true;
+
+ };
+ }
+ }
+}
diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp
new file mode 100644
index 00000000..fc353c49
--- /dev/null
+++ b/src/DisplayApp/Screens/Modal.cpp
@@ -0,0 +1,81 @@
+#include <libs/lvgl/lvgl.h>
+#include "Modal.h"
+#include "../DisplayApp.h"
+
+using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
+
+Modal::Modal(Pinetime::Applications::DisplayApp *app) : Screen(app) {
+
+
+}
+
+Modal::~Modal() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Modal::Refresh() {
+
+ return running;
+}
+
+bool Modal::OnButtonPushed() {
+ running = false;
+ return true;
+}
+
+void Modal::Show() {
+ lv_style_copy(&modal_style, &lv_style_plain_color);
+ modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK;
+ modal_style.body.opa = LV_OPA_50;
+
+ obj = lv_obj_create(lv_scr_act(), NULL);
+ lv_obj_set_style(obj, &modal_style);
+ lv_obj_set_pos(obj, 0, 0);
+ lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES);
+ lv_obj_set_opa_scale_enable(obj, true); /* Enable opacity scaling for the animation */
+
+ static const char * btns2[] = {"Ok", ""};
+
+ /* Create the message box as a child of the modal background */
+ mbox = lv_mbox_create(obj, NULL);
+ lv_mbox_add_btns(mbox, btns2);
+ char versionStr[20];
+ sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
+ lv_mbox_set_text(mbox, versionStr);
+// lv_mbox_set_text(mbox, "Hello world!");
+ lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
+ lv_obj_set_event_cb(mbox, Modal::mbox_event_cb);
+
+ mbox->user_data = this;
+
+ /* Fade the message box in with an animation */
+ lv_anim_t a;
+ lv_anim_init(&a);
+ lv_anim_set_time(&a, 500, 0);
+ lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER);
+ lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale);
+ lv_anim_create(&a);
+}
+
+void Modal::Hide() {
+ /* Delete the parent modal background */
+ lv_obj_del_async(lv_obj_get_parent(mbox));
+ mbox = NULL; /* happens before object is actually deleted! */
+}
+
+void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) {
+ auto* m = static_cast<Modal *>(obj->user_data);
+ m->OnEvent(obj, evt);
+}
+
+void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) {
+ if(evt == LV_EVENT_DELETE && event_obj == mbox) {
+ Hide();
+ } else if(evt == LV_EVENT_VALUE_CHANGED) {
+ /* A button was clicked */
+ lv_mbox_start_auto_close(mbox, 0);
+// Hide();
+ }
+}
diff --git a/src/DisplayApp/Screens/Modal.h b/src/DisplayApp/Screens/Modal.h
new file mode 100644
index 00000000..de287293
--- /dev/null
+++ b/src/DisplayApp/Screens/Modal.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+
+ class Modal : public Screen{
+ public:
+ Modal(DisplayApp* app);
+ ~Modal() override;
+
+ void Show();
+ void Hide();
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ static void mbox_event_cb(lv_obj_t *obj, lv_event_t evt);
+ private:
+ void OnEvent(lv_obj_t *event_obj, lv_event_t evt);
+
+ lv_style_t modal_style;
+ lv_obj_t *obj;
+ lv_obj_t *mbox;
+ lv_obj_t *info;
+ bool running = true;
+
+ };
+ }
+ }
+}
diff --git a/src/DisplayApp/Screens/Screen.h b/src/DisplayApp/Screens/Screen.h
index 5e2fa43e..6cbd41ad 100644
--- a/src/DisplayApp/Screens/Screen.h
+++ b/src/DisplayApp/Screens/Screen.h
@@ -1,17 +1,22 @@
#pragma once
-#include <Components/Gfx/Gfx.h>
-
namespace Pinetime {
namespace Applications {
+ class DisplayApp;
namespace Screens {
class Screen {
public:
- Screen(Components::Gfx& gfx) : gfx{gfx} {}
- virtual void Refresh(bool fullRefresh) = 0;
+ Screen(DisplayApp* app) : app{app} {}
+ virtual ~Screen() = default;
+
+ // Return false if the app can be closed, true if it must continue to run
+ virtual bool Refresh() = 0;
+
+ // Return false if the button hasn't been handled by the app, true if it has been handled
+ virtual bool OnButtonPushed() { return false; }
protected:
- Components::Gfx& gfx;
+ DisplayApp* app;
};
}
}
diff --git a/src/DisplayApp/Screens/Tab.cpp b/src/DisplayApp/Screens/Tab.cpp
new file mode 100644
index 00000000..adc32578
--- /dev/null
+++ b/src/DisplayApp/Screens/Tab.cpp
@@ -0,0 +1,67 @@
+#include <cstdio>
+#include <libs/date/includes/date/date.h>
+#include <Components/DateTime/DateTimeController.h>
+#include <Version.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <libs/lvgl/src/lv_font/lv_font.h>
+#include <libs/lvgl/lvgl.h>
+#include <libraries/log/nrf_log.h>
+#include "Tab.h"
+#include <DisplayApp/DisplayApp.h>
+
+
+using namespace Pinetime::Applications::Screens;
+
+extern lv_font_t jetbrains_mono_bold_20;
+
+//static void event_handler(lv_obj_t * obj, lv_event_t event) {
+// Tile* screen = static_cast<Tile *>(obj->user_data);
+// screen->OnObjectEvent(obj, event);
+//}
+
+Tab::Tab(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app, gfx) {
+/*Create a Tab view object*/
+ lv_obj_t *tabview;
+ tabview = lv_tabview_create(lv_scr_act(), NULL);
+
+ /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/
+ lv_obj_t *tab1 = lv_tabview_add_tab(tabview, "Tab 1");
+ lv_obj_t *tab2 = lv_tabview_add_tab(tabview, "Tab 2");
+ lv_obj_t *tab3 = lv_tabview_add_tab(tabview, "Tab 3");
+
+
+ /*Add content to the tabs*/
+ lv_obj_t * label = lv_label_create(tab1, NULL);
+ lv_label_set_text(label, "This the first tab\n\n"
+ "If the content\n"
+ "of a tab\n"
+ "become too long\n"
+ "the it \n"
+ "automatically\n"
+ "become\n"
+ "scrollable.");
+
+ label = lv_label_create(tab2, NULL);
+ lv_label_set_text(label, "Second tab");
+
+ label = lv_label_create(tab3, NULL);
+ lv_label_set_text(label, "Third tab");
+
+}
+
+Tab::~Tab() {
+ lv_obj_clean(lv_scr_act());
+}
+
+void Tab::Refresh(bool fullRefresh) {
+
+}
+
+void Tab::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
+ if(event == LV_EVENT_CLICKED) {
+ NRF_LOG_INFO("Clicked");
+ }
+ else if(event == LV_EVENT_VALUE_CHANGED) {
+ NRF_LOG_INFO("Toggled");
+ }
+}
diff --git a/src/DisplayApp/Screens/Tab.h b/src/DisplayApp/Screens/Tab.h
new file mode 100644
index 00000000..1af956f4
--- /dev/null
+++ b/src/DisplayApp/Screens/Tab.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+#include <lvgl/src/lv_core/lv_style.h>
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+ class Tab : public Screen {
+ public:
+ explicit Tab(DisplayApp* app, Components::Gfx& gfx);
+ ~Tab() override;
+ void Refresh(bool fullRefresh) override;
+ void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
+
+ private:
+
+ };
+ }
+ }
+}
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp
new file mode 100644
index 00000000..004c8d31
--- /dev/null
+++ b/src/DisplayApp/Screens/Tile.cpp
@@ -0,0 +1,163 @@
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <libs/lvgl/src/lv_font/lv_font.h>
+#include <libs/lvgl/lvgl.h>
+#include "Tile.h"
+#include <DisplayApp/DisplayApp.h>
+
+
+using namespace Pinetime::Applications::Screens;
+
+extern lv_font_t jetbrains_mono_bold_20;
+
+static void event_handler(lv_obj_t * obj, lv_event_t event) {
+ Tile* screen = static_cast<Tile *>(obj->user_data);
+ uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
+ uint32_t eventData = *eventDataPtr;
+ screen->OnObjectEvent(obj, event, eventData);
+}
+
+static const char * btnm_map1[] = {"Meter", "Gauge", "Clock", "\n", "Soft\nversion", "App2", "App3", ""};
+
+Tile::Tile(DisplayApp* app) : Screen(app) {
+ modal.reset(new Modal(app));
+/*
+ static lv_point_t valid_pos[] = {{0,0}, {LV_COORD_MIN, LV_COORD_MIN}};
+ tileview = lv_tileview_create(lv_scr_act(), NULL);
+ lv_tileview_set_valid_positions(tileview, valid_pos, 1);
+ lv_tileview_set_edge_flash(tileview, false);
+
+ tile1 = lv_obj_create(tileview, NULL);
+ lv_obj_set_pos(tile1, 0, 0);
+ lv_obj_set_size(tile1, LV_HOR_RES, LV_VER_RES);
+ lv_tileview_add_element(tileview, tile1);
+*/
+ btnm1 = lv_btnm_create(lv_scr_act(), NULL);
+ lv_btnm_set_map(btnm1, btnm_map1);
+ lv_obj_set_size(btnm1, LV_HOR_RES, LV_VER_RES);
+
+// labelRelStyle = const_cast<lv_style_t *>(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_REL));
+// labelRelStyle->text.font = &jetbrains_mono_bold_20;
+// labelRelStyle->body.grad_color = labelRelStyle->body.main_color;
+// lv_btnm_set_style(btnm1, LV_BTNM_STYLE_BTN_REL, labelRelStyle);
+//
+// labelPrStyle = const_cast<lv_style_t *>(lv_label_get_style(btnm1, LV_BTNM_STYLE_BTN_PR));
+// labelPrStyle->text.font = &jetbrains_mono_bold_20;
+// labelPrStyle->body.grad_color = labelPrStyle->body.shadow.color;
+
+
+
+// lv_btnm_set_style(btnm1, LV_BTNM_STYLE_BTN_PR, labelPrStyle);
+//TODO better style handling
+// lv_obj_align(btnm1, tile1, LV_ALIGN_CENTER, 0, 0);
+ btnm1->user_data = this;
+ lv_obj_set_event_cb(btnm1, event_handler);
+
+/*
+ tile2 = lv_obj_create(tileview, NULL);
+ lv_obj_set_pos(tile2, 0, LV_VER_RES);
+ lv_obj_set_size(tile2, LV_HOR_RES, LV_VER_RES);
+ lv_tileview_add_element(tileview, tile2);
+
+ btnm2 = lv_btnm_create(tileview, NULL);
+ lv_btnm_set_map(btnm2, btnm_map2);
+ lv_obj_align(btnm2, tile2, LV_ALIGN_CENTER, 0, 0);
+*/
+/*
+ tile1 = lv_obj_create(tileview, NULL);
+ lv_obj_set_pos(tile1, 0, 0);
+ lv_obj_set_size(tile1, LV_HOR_RES, LV_VER_RES);
+ lv_tileview_add_element(tileview, tile1);
+
+ btn1 = lv_btn_create(tile1, NULL);
+ lv_obj_align(btn1, tile1, LV_ALIGN_CENTER, 0, 0);
+
+ label1 = lv_label_create(btn1, NULL);
+ lv_label_set_text(label1, "Button1");
+*/
+/*
+ tile2 = lv_obj_create(tileview, NULL);
+ lv_obj_set_pos(tile2, 0, LV_VER_RES);
+ lv_obj_set_size(tile2, LV_HOR_RES, LV_VER_RES);
+ lv_tileview_add_element(tileview, tile2);
+
+ btn2 = lv_btn_create(tile2, NULL);
+ lv_obj_align(btn2, tile2, LV_ALIGN_CENTER, 0, 0);
+
+
+ label2 = lv_label_create(btn2, NULL);
+ lv_label_set_text(label2, "Button2");
+
+ tile3 = lv_obj_create(tileview, NULL);
+ lv_obj_set_pos(tile3, 0, LV_VER_RES*2);
+ lv_obj_set_size(tile3, LV_HOR_RES, LV_VER_RES);
+ lv_tileview_add_element(tileview, tile3);
+
+ btn3 = lv_btn_create(tile3, NULL);
+ lv_obj_align(btn3, tile3, LV_ALIGN_CENTER, 0, 0);
+
+
+ label3 = lv_label_create(btn3, NULL);
+ lv_label_set_text(label3, "Button3");
+*/
+}
+
+Tile::~Tile() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Tile::Refresh() {
+ return running;
+}
+
+void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event, uint32_t buttonId) {
+ auto* tile = static_cast<Tile*>(obj->user_data);
+ if(event == LV_EVENT_VALUE_CHANGED) {
+ switch(buttonId) {
+ case 0:
+ tile->StartMeterApp();
+ break;
+ case 1:
+ tile->StartGaugeApp();
+ break;
+ case 2:
+ tile->StartClockApp();
+ break;
+ case 3:
+ modal->Show();
+ break;
+ case 4:
+ case 5:
+ tile->StartTestApp();
+
+ break;
+ }
+ clickCount++;
+ }
+}
+
+bool Tile::OnButtonPushed() {
+ app->StartApp(DisplayApp::Apps::Clock);
+ running = false;
+ return true;
+}
+
+void Tile::StartClockApp() {
+ app->StartApp(DisplayApp::Apps::Clock);
+ running = false;
+}
+
+void Tile::StartTestApp() {
+ app->StartApp(DisplayApp::Apps::Test);
+ running = false;
+}
+
+void Tile::StartMeterApp() {
+ app->StartApp(DisplayApp::Apps::Meter);
+ running = false;
+}
+
+void Tile::StartGaugeApp() {
+ app->StartApp(DisplayApp::Apps::Gauge);
+ running = false;
+}
+
diff --git a/src/DisplayApp/Screens/Tile.h b/src/DisplayApp/Screens/Tile.h
new file mode 100644
index 00000000..eb253435
--- /dev/null
+++ b/src/DisplayApp/Screens/Tile.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+#include "Modal.h"
+#include <lvgl/src/lv_core/lv_style.h>
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+ class Tile : public Screen {
+ public:
+ explicit Tile(DisplayApp* app);
+ ~Tile() override;
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
+
+ private:
+
+ lv_style_t* labelRelStyle;
+ lv_style_t* labelPrStyle;
+ lv_obj_t * label1;
+ lv_obj_t * label2;
+ lv_obj_t * label3;
+
+ lv_obj_t* backgroundLabel;
+ lv_obj_t * button;
+ lv_obj_t * labelClick;
+
+ lv_obj_t *tileview;
+ lv_obj_t * tile1;
+ lv_obj_t * tile2;
+ lv_obj_t * list;
+ lv_obj_t * list_btn;
+ lv_obj_t * tile3;
+ lv_obj_t * btn1;
+ lv_obj_t * btn2;
+ lv_obj_t * btn3;
+
+ lv_obj_t * btnm1;
+ lv_obj_t * btnm2;
+
+ uint32_t clickCount = 0 ;
+ uint32_t previousClickCount = 0;
+ void StartClockApp();
+ void StartTestApp();
+ void StartMeterApp();
+ void StartGaugeApp();
+ bool running = true;
+
+ std::unique_ptr<Modal> modal;
+ };
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 17:20:06 +0000