summaryrefslogtreecommitdiff
path: root/src/DisplayApp/Screens/Clock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp/Screens/Clock.cpp')
-rw-r--r--src/DisplayApp/Screens/Clock.cpp142
1 files changed, 99 insertions, 43 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();
+}
+
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 10:56:48 +0000