Refactor shared watch face code into base class

src/CMakeLists.txt

@@ -430,6 +430,7 @@ list(APPEND SOURCE_FILES
 
         ## Watch faces
         displayapp/icons/bg_clock.c
+        displayapp/screens/WatchFaceBase.cpp
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
         displayapp/screens/PineTimeStyle.cpp
@@ -451,6 +452,7 @@ list(APPEND SOURCE_FILES
         components/battery/BatteryController.cpp
         components/ble/BleController.cpp
         components/ble/NotificationManager.cpp
+        components/datetime/DateTime.cpp
         components/datetime/DateTimeController.cpp
         components/brightness/BrightnessController.cpp
         components/motion/MotionController.cpp

src/components/ble/CurrentTimeClient.cpp

@@ -28,7 +28,7 @@ namespace {
   }
 }
 
-CurrentTimeClient::CurrentTimeClient(DateTime& dateTimeController) : dateTimeController {dateTimeController} {
+CurrentTimeClient::CurrentTimeClient(DateTimeController& dateTimeController) : dateTimeController {dateTimeController} {
 }
 
 void CurrentTimeClient::Init() {

src/components/ble/CurrentTimeClient.h

@@ -9,11 +9,11 @@
 
 namespace Pinetime {
   namespace Controllers {
-    class DateTime;
+    class DateTimeController;
 
     class CurrentTimeClient : public BleClient {
     public:
-      explicit CurrentTimeClient(DateTime& dateTimeController);
+      explicit CurrentTimeClient(DateTimeController& dateTimeController);
       void Init();
       void Reset();
       bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error* error, const ble_gatt_svc* service);
@@ -45,7 +45,7 @@ namespace Pinetime {
       static constexpr ble_uuid16_t ctsServiceUuid {.u {.type = BLE_UUID_TYPE_16}, .value = ctsServiceId};
       static constexpr ble_uuid16_t currentTimeCharacteristicUuid {.u {.type = BLE_UUID_TYPE_16}, .value = currentTimeCharacteristicId};
 
-      DateTime& dateTimeController;
+      DateTimeController& dateTimeController;
       bool isDiscovered = false;
       uint16_t ctsStartHandle;
       uint16_t ctsEndHandle;
@@ -55,4 +55,4 @@ namespace Pinetime {
       std::function<void(uint16_t)> onServiceDiscovered;
     };
   }
-}
+}

src/components/ble/CurrentTimeService.cpp

@@ -52,7 +52,7 @@ int CurrentTimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handl
   return 0;
 }
 
-CurrentTimeService::CurrentTimeService(DateTime& dateTimeController)
+CurrentTimeService::CurrentTimeService(DateTimeController& dateTimeController)
   : characteristicDefinition {{.uuid = (ble_uuid_t*) &ctChrUuid,
                                .access_cb = CTSCallback,
 

src/components/ble/CurrentTimeService.h

@@ -13,7 +13,7 @@ namespace Pinetime {
   namespace Controllers {
     class CurrentTimeService {
     public:
-      CurrentTimeService(DateTime& dateTimeController);
+      CurrentTimeService(DateTimeController& dateTimeController);
       void Init();
 
       int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt);
@@ -40,7 +40,7 @@ namespace Pinetime {
         uint8_t reason;
       } CtsData;
 
-      DateTime& m_dateTimeController;
+      DateTimeController& m_dateTimeController;
     };
   }
 }

src/components/ble/DfuService.h

@@ -155,4 +155,4 @@ namespace Pinetime {
       TimerHandle_t timeoutTimer;
     };
   }
-}
+}

src/components/ble/NimbleController.cpp

@@ -19,7 +19,7 @@ using namespace Pinetime::Controllers;
 
 NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
                                    Pinetime::Controllers::Ble& bleController,
-                                   DateTime& dateTimeController,
+                                   DateTimeController& dateTimeController,
                                    Pinetime::Controllers::NotificationManager& notificationManager,
                                    Controllers::Battery& batteryController,
                                    Pinetime::Drivers::SpiNorFlash& spiNorFlash,

src/components/ble/NimbleController.h

@@ -31,15 +31,15 @@ namespace Pinetime {
 
   namespace Controllers {
     class Ble;
-    class DateTime;
+    class DateTimeController;
     class NotificationManager;
 
     class NimbleController {
 
     public:
       NimbleController(Pinetime::System::SystemTask& systemTask,
                        Pinetime::Controllers::Ble& bleController,
-                       DateTime& dateTimeController,
+                       DateTimeController& dateTimeController,
                        Pinetime::Controllers::NotificationManager& notificationManager,
                        Controllers::Battery& batteryController,
                        Pinetime::Drivers::SpiNorFlash& spiNorFlash,
@@ -76,7 +76,7 @@ namespace Pinetime {
       static constexpr const char* deviceName = "InfiniTime";
       Pinetime::System::SystemTask& systemTask;
       Pinetime::Controllers::Ble& bleController;
-      DateTime& dateTimeController;
+      DateTimeController& dateTimeController;
       Pinetime::Controllers::NotificationManager& notificationManager;
       Pinetime::Drivers::SpiNorFlash& spiNorFlash;
       Pinetime::Controllers::DfuService dfuService;

src/components/ble/NotificationManager.cpp

@@ -75,11 +75,11 @@ NotificationManager::Notification NotificationManager::GetPrevious(NotificationM
   return result;
 }
 
-bool NotificationManager::AreNewNotificationsAvailable() {
+bool NotificationManager::AreNewNotificationsAvailable() const {
   return newNotification;
 }
 
-bool NotificationManager::IsVibrationEnabled() {
+bool NotificationManager::IsVibrationEnabled() const {
   return vibrationEnabled;
 }
 

src/components/ble/NotificationManager.h

@@ -43,8 +43,8 @@ namespace Pinetime {
       Notification GetNext(Notification::Id id);
       Notification GetPrevious(Notification::Id id);
       bool ClearNewNotificationFlag();
-      bool AreNewNotificationsAvailable();
-      bool IsVibrationEnabled();
+      bool AreNewNotificationsAvailable() const;
+      bool IsVibrationEnabled() const;
       void ToggleVibrations();
 
       static constexpr size_t MaximumMessageSize() {
@@ -63,4 +63,4 @@ namespace Pinetime {
       bool vibrationEnabled = true;
     };
   }
-}
+}

src/components/datetime/DateTime.cpp

@@ -0,0 +1,136 @@
+#include "DateTime.h"
+
+#include <array>
+
+namespace Pinetime {
+  namespace DateTime {
+    namespace {
+
+      constexpr std::array<char const*, 8> DaysStringLow = {
+        "--",
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Sunday"
+      };
+
+      constexpr std::array<char const*, 8> DaysStringShortLow = {
+        "--",
+        "Mon",
+        "Tue",
+        "Wed",
+        "Thu",
+        "Fri",
+        "Sat",
+        "Sun"
+      };
+
+      constexpr std::array<char const*, 8> DaysStringShort = {
+        "--",
+        "MON",
+        "TUE",
+        "WED",
+        "THU",
+        "FRI",
+        "SAT",
+        "SUN"
+      };
+
+      constexpr std::array<char const*, 8> DaysString = {
+        "--",
+        "MONDAY",
+        "TUESDAY",
+        "WEDNESDAY",
+        "THURSDAY",
+        "FRIDAY",
+        "SATURDAY",
+        "SUNDAY"
+      };
+
+      constexpr std::array<char const*, 13> MonthsString = {
+        "--",
+        "JAN",
+        "FEB",
+        "MAR",
+        "APR",
+        "MAY",
+        "JUN",
+        "JUL",
+        "AUG",
+        "SEP",
+        "OCT",
+        "NOV",
+        "DEC"
+      };
+
+      constexpr std::array<char const*, 13> MonthsStringLow = {
+        "--",
+        "Jan",
+        "Feb",
+        "Mar",
+        "Apr",
+        "May",
+        "Jun",
+        "Jul",
+        "Aug",
+        "Sep",
+        "Oct",
+        "Nov",
+        "Dec"
+      };
+
+      constexpr std::array<char const*, 13> MonthsLow = {
+        "--",
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December"
+      };
+
+      template<typename E>
+      constexpr typename std::underlying_type<E>::type to_underlying(E e) {
+        return static_cast<typename std::underlying_type<E>::type>(e);
+      }
+    }
+
+    char const* MonthShortToString(Months month) {
+      return MonthsString[to_underlying(month)];
+    }
+
+    char const* MonthShortToStringLow(Months month) {
+      return MonthsStringLow[to_underlying(month)];
+    }
+
+    char const* MonthsToStringLow(Months month) {
+      return MonthsLow[to_underlying(month)];
+    }
+
+    char const* DayOfWeekToString(Days day) {
+      return DaysString[to_underlying(day)];
+    }
+
+    char const* DayOfWeekShortToString(Days day) {
+      return DaysStringShort[to_underlying(day)];
+    }
+
+    char const* DayOfWeekToStringLow(Days day) {
+      return DaysStringLow[to_underlying(day)];
+    }
+
+    char const* DayOfWeekShortToStringLow(Days day) {
+      return DaysStringShortLow[to_underlying(day)];
+    }
+
+  }
+}

src/components/datetime/DateTime.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <cstdint>
+
+namespace Pinetime {
+  namespace DateTime {
+    enum class Days : uint8_t {
+      Unknown,
+      Monday,
+      Tuesday,
+      Wednesday,
+      Thursday,
+      Friday,
+      Saturday,
+      Sunday
+    };
+
+    enum class Months : uint8_t {
+      Unknown,
+      January,
+      February,
+      March,
+      April,
+      May,
+      June,
+      July,
+      August,
+      September,
+      October,
+      November,
+      December
+    };
+
+    char const* MonthShortToString(Months month);
+    char const* MonthShortToStringLow(Months month);
+    char const* MonthsToStringLow(Months month);
+    char const* DayOfWeekToString(Days day);
+    char const* DayOfWeekShortToString(Days day);
+    char const* DayOfWeekToStringLow(Days day);
+    char const* DayOfWeekShortToStringLow(Days day);
+  }
+}