From a456887eff1bc0de6c6a8ecb49a961ffe75661db Mon Sep 17 00:00:00 2001
From: Joaquim <joaquim.org@gmail.com>
Date: Thu, 28 Jan 2021 17:13:28 +0000
Subject: LVGL v7.10.0

---
 src/displayapp/screens/Clock.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/displayapp/screens/Clock.cpp')

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 2988922e..4b280adb 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,9 +14,6 @@
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
-extern lv_font_t jetbrains_mono_extrabold_compressed;
-extern lv_font_t jetbrains_mono_bold_20;
-extern lv_style_t* LabelBigStyle;
 
 static void event_handler(lv_obj_t * obj, lv_event_t event) {
   Clock* screen = static_cast<Clock *>(obj->user_data);
@@ -59,7 +56,9 @@ Clock::Clock(DisplayApp* app,
   lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60);
 
   label_time = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_style(label_time, LV_LABEL_STYLE_MAIN, LabelBigStyle);
+
+  lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed);
+
   lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-- 
cgit v1.2.3-70-g09d2


From d34a5101584bfca81a1f00ca57e32d55b50d55e5 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Wed, 3 Mar 2021 17:07:05 +0000
Subject: Moved private statics into unnamed namespace in cpp file to reduce
 coupling and uncessar in header

---
 src/displayapp/screens/Clock.cpp | 73 +++++++++++++++++++++-------------------
 src/displayapp/screens/Clock.h   |  5 ---
 2 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'src/displayapp/screens/Clock.cpp')

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 4b280adb..eb0e37be 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -15,6 +15,45 @@
 
 using namespace Pinetime::Applications::Screens;
 
+namespace {
+
+char const *DaysString[] = {
+        "",
+        "MONDAY",
+        "TUESDAY",
+        "WEDNESDAY",
+        "THURSDAY",
+        "FRIDAY",
+        "SATURDAY",
+        "SUNDAY"
+};
+
+char const *MonthsString[] = {
+        "",
+        "JAN",
+        "FEB",
+        "MAR",
+        "APR",
+        "MAY",
+        "JUN",
+        "JUL",
+        "AUG",
+        "SEP",
+        "OCT",
+        "NOV",
+        "DEC"
+};
+
+const char *MonthToString(Pinetime::Controllers::DateTime::Months month) {
+  return MonthsString[static_cast<uint8_t>(month)];
+}
+
+const char *DayOfWeekToString(Pinetime::Controllers::DateTime::Days dayOfWeek) {
+  return DaysString[static_cast<uint8_t>(dayOfWeek)];
+}
+
+}
+
 static void event_handler(lv_obj_t * obj, lv_event_t event) {
   Clock* screen = static_cast<Clock *>(obj->user_data);
   screen->OnObjectEvent(obj, event);
@@ -200,40 +239,6 @@ bool Clock::Refresh() {
   return running;
 }
 
-const char *Clock::MonthToString(Pinetime::Controllers::DateTime::Months month) {
-  return Clock::MonthsString[static_cast<uint8_t>(month)];
-}
-
-const char *Clock::DayOfWeekToString(Pinetime::Controllers::DateTime::Days dayOfWeek) {
-  return Clock::DaysString[static_cast<uint8_t>(dayOfWeek)];
-}
-
-char const *Clock::DaysString[] = {
-        "",
-        "MONDAY",
-        "TUESDAY",
-        "WEDNESDAY",
-        "THURSDAY",
-        "FRIDAY",
-        "SATURDAY",
-        "SUNDAY"
-};
-
-char const *Clock::MonthsString[] = {
-        "",
-        "JAN",
-        "FEB",
-        "MAR",
-        "APR",
-        "MAY",
-        "JUN",
-        "JUL",
-        "AUG",
-        "SEP",
-        "OCT",
-        "NOV",
-        "DEC"
-};
 
 void Clock::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
   if(obj == backgroundLabel) {
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 18d70532..5e9cfeaa 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -52,11 +52,6 @@ namespace Pinetime {
 
           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[];
-
           char displayedChar[5];
 
           uint16_t currentYear = 1970;
-- 
cgit v1.2.3-70-g09d2