Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat

# Conflicts:
#	src/components/datetime/DateTimeController.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index cbc80447..6e5ee3ca 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -2,6 +2,8 @@
 
 #include <cstdint>
 #include <chrono>
+#include <string>
+#include "components/settings/Settings.h"
 
 namespace Pinetime {
   namespace System {
@@ -10,6 +12,7 @@ namespace Pinetime {
   namespace Controllers {
     class DateTime {
     public:
+      DateTime(Controllers::Settings& settingsController);
       enum class Days : uint8_t { Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday };
       enum class Months : uint8_t {
         Unknown,
@@ -71,6 +74,7 @@ namespace Pinetime {
 
       void Register(System::SystemTask* systemTask);
       void SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t);
+      std::string FormattedTime();
 
     private:
       uint16_t year = 0;
@@ -89,6 +93,7 @@ namespace Pinetime {
       bool isHourAlreadyNotified = true;
       bool isHalfHourAlreadyNotified = true;
       System::SystemTask* systemTask = nullptr;
+      Controllers::Settings& settingsController;
     };
   }
 }