Alarm status on infineat

.gitignore

@@ -11,6 +11,7 @@ cmake_install.cmake
 Makefile
 build
 tools
+node_modules
 
 # Resulting binary files
 *.a

doc/alarmStatusOnInfineat/alarmStatusOnInfineat.md

@@ -0,0 +1,22 @@
+# [InfiniTime : show alarm status on infineat watchface](https://github.com/Eve1374/InfiniTime/tree/alarm-status-on-infineat)
+- I forked from [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime) and added a branch alarm-status-on-infineat
+- I modified the watchface settings to have the possibility to show alarm status on watchface
+
+Here are pictures with alarm set in 12 and 24hrs format :
+
+![alarm set and shown, 12hrs format](infineat_alarm_set_12hrs.png "alarm set and shown, 12hrs format")
+![alarm set and shown, 24hrs format](infineat_alarm_set_24hrs.png "alarm set and shown, 24hrs format")
+
+Alarm not set :
+
+![alarm shown and not set](infineat_alarm_notset.png "alarm shown and not set")
+
+Settings view :
+
+![settings](infineat_settings.png "settings modified with a button to turn on or off alarm display")
+
+
+## Possible further development :
+- Move this setting to the Alarm app and include alarm display in all watchfaces ?
+
+

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "lv_font_conv": "^1.5.2"
+  }
+}

src/CMakeLists.txt

@@ -371,6 +371,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/StopWatch.cpp
         displayapp/screens/BatteryIcon.cpp
         displayapp/screens/BleIcon.cpp
+        displayapp/screens/AlarmIcon.cpp
         displayapp/screens/NotificationIcon.cpp
         displayapp/screens/SystemInfo.cpp
         displayapp/screens/Label.cpp

src/components/settings/Settings.h

@@ -47,7 +47,8 @@ namespace Pinetime {
 
       struct WatchFaceInfineat {
         bool showSideCover = true;
-        int colorIndex = 0;
+        bool showAlarmStatus = true;
+	int colorIndex = 0;
       };
 
       Settings(Pinetime::Controllers::FS& fs);
@@ -123,6 +124,17 @@ namespace Pinetime {
         return settings.watchFaceInfineat.showSideCover;
       };
 
+      void SetInfineatShowAlarmStatus(bool show) {
+        if (show != settings.watchFaceInfineat.showAlarmStatus) {
+          settings.watchFaceInfineat.showAlarmStatus = show;
+          settingsChanged = true;
+        }
+      };
+
+      bool GetInfineatShowAlarmStatus() const {
+        return settings.watchFaceInfineat.showAlarmStatus;
+      };
+
       void SetInfineatColorIndex(int index) {
         if (index != settings.watchFaceInfineat.colorIndex) {
           settings.watchFaceInfineat.colorIndex = index;

src/displayapp/fonts/fonts.json

@@ -7,7 +7,7 @@
          },
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
-            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743"
+            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf0f3, 0xf1f6"
          }
       ],
       "bpp": 1,

src/displayapp/screens/AlarmIcon.cpp

@@ -0,0 +1,11 @@
+#include "displayapp/screens/AlarmIcon.h"
+#include "displayapp/screens/Symbols.h"
+using namespace Pinetime::Applications::Screens;
+
+const char* AlarmIcon::GetIcon(bool isSet) {
+  if (isSet) {
+    return Symbols::bell;
+  }
+
+  return Symbols::notbell;
+}

src/displayapp/screens/AlarmIcon.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "components/alarm/AlarmController.h"
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
+      class AlarmIcon {
+      public:
+        static const char* GetIcon(bool isSet);
+      };
+    }
+  }
+}

src/displayapp/screens/Symbols.h

@@ -12,6 +12,7 @@ namespace Pinetime {
         static constexpr const char* shoe = "\xEF\x95\x8B";
         static constexpr const char* clock = "\xEF\x80\x97";
         static constexpr const char* bell = "\xEF\x83\xB3";
+        static constexpr const char* notbell = "\xEF\x87\xB6";
         static constexpr const char* info = "\xEF\x84\xA9";
         static constexpr const char* list = "\xEF\x80\xBA";
         static constexpr const char* sun = "\xEF\x86\x85";