Fonts: make fonts part of InfiniTimeTheme

Added a Fonts namespace to the InfiniTimeTheme, which provides
references to the available standard fonts. Instead of directly
referencing fonts in various code places, we can now rely on the
Theme's settings. This makes it easier to try out different fonts
and have the setting applied system-wide.

Author: muesli

src/displayapp/InfiniTimeTheme.cpp

@@ -218,10 +218,10 @@ static void basic_init() {
 lv_theme_t* lv_pinetime_theme_init() {
   theme.color_primary = LV_COLOR_WHITE;
   theme.color_secondary = LV_COLOR_GRAY;
-  theme.font_small = &jetbrains_mono_bold_20;
-  theme.font_normal = &jetbrains_mono_bold_20;
-  theme.font_subtitle = &jetbrains_mono_bold_20;
-  theme.font_title = &jetbrains_mono_bold_20;
+  theme.font_small = Fonts::normal;
+  theme.font_normal = Fonts::normal;
+  theme.font_subtitle = Fonts::normal;
+  theme.font_title = Fonts::normal;
   theme.flags = 0;
 
   basic_init();

src/displayapp/InfiniTimeTheme.h

@@ -16,6 +16,14 @@ namespace Colors {
   static constexpr lv_color_t highlight = green;
 };
 
+namespace Fonts {
+  static constexpr const lv_font_t* normal = &jetbrains_mono_bold_20;
+  static constexpr const lv_font_t* mono = &jetbrains_mono_bold_20;
+  static constexpr const lv_font_t* large = &jetbrains_mono_42;
+  static constexpr const lv_font_t* huge = &jetbrains_mono_76;
+  static constexpr const lv_font_t* hugeBold = &jetbrains_mono_extrabold_compressed;
+}
+
 /**
  * Initialize the default
  * @param color_primary the primary color of the theme

src/displayapp/screens/Alarm.cpp

@@ -56,7 +56,7 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
     hourCounter.EnableTwelveHourMode();
 
     lblampm = lv_label_create(lv_scr_act(), nullptr);
-    lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
+    lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Fonts::normal);
     lv_label_set_text_static(lblampm, "AM");
     lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
@@ -70,7 +70,7 @@ Alarm::Alarm(Controllers::AlarmController& alarmController,
   minuteCounter.SetValueChangedEventCallback(this, ValueChangedHandler);
 
   lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
+  lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Fonts::huge);
   lv_label_set_text_static(colonLabel, ":");
   lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
 

src/displayapp/screens/Alarm.h

@@ -24,6 +24,7 @@
 #include "displayapp/Controllers.h"
 #include "systemtask/WakeLock.h"
 #include "Symbols.h"
+#include "displayapp/InfiniTimeTheme.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -62,8 +63,8 @@ namespace Pinetime {
         void HideInfo();
         void ToggleRecurrence();
         void UpdateAlarmTime();
-        Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_76);
-        Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+        Widgets::Counter hourCounter = Widgets::Counter(0, 23, *Fonts::huge);
+        Widgets::Counter minuteCounter = Widgets::Counter(0, 59, *Fonts::huge);
       };
     }
 

src/displayapp/screens/BatteryInfo.cpp

@@ -29,7 +29,7 @@ BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController
   lv_obj_align(status, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, -17);
 
   percent = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Fonts::large);
   lv_label_set_text_fmt(percent, "%i%%", batteryPercent);
   lv_label_set_align(percent, LV_LABEL_ALIGN_LEFT);
   lv_obj_align(percent, chargingArc, LV_ALIGN_CENTER, 0, 0);

src/displayapp/screens/Dice.cpp

@@ -4,11 +4,12 @@
 #include "components/settings/Settings.h"
 #include "components/motor/MotorController.h"
 #include "components/motion/MotionController.h"
+#include "displayapp/InfiniTimeTheme.h"
 
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-  lv_obj_t* MakeLabel(lv_font_t* font,
+  lv_obj_t* MakeLabel(const lv_font_t* font,
                       lv_color_t color,
                       lv_label_long_mode_t longMode,
                       uint8_t width,
@@ -49,7 +50,7 @@ Dice::Dice(Controllers::MotionController& motionController,
                       static_cast<uint32_t>(motionController.Z())};
   gen.seed(sseq);
 
-  lv_obj_t* nCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
+  lv_obj_t* nCounterLabel = MakeLabel(Fonts::normal,
                                       LV_COLOR_WHITE,
                                       LV_LABEL_LONG_EXPAND,
                                       0,
@@ -60,7 +61,7 @@ Dice::Dice(Controllers::MotionController& motionController,
                                       0,
                                       0);
 
-  lv_obj_t* dCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
+  lv_obj_t* dCounterLabel = MakeLabel(Fonts::normal,
                                       LV_COLOR_WHITE,
                                       LV_LABEL_LONG_EXPAND,
                                       0,
@@ -82,7 +83,7 @@ Dice::Dice(Controllers::MotionController& motionController,
   std::uniform_int_distribution<> distrib(0, resultColors.size() - 1);
   currentColorIndex = distrib(gen);
 
-  resultTotalLabel = MakeLabel(&jetbrains_mono_42,
+  resultTotalLabel = MakeLabel(Fonts::large,
                                resultColors[currentColorIndex],
                                LV_LABEL_LONG_BREAK,
                                120,
@@ -92,7 +93,7 @@ Dice::Dice(Controllers::MotionController& motionController,
                                LV_ALIGN_IN_TOP_RIGHT,
                                11,
                                38);
-  resultIndividualLabel = MakeLabel(&jetbrains_mono_bold_20,
+  resultIndividualLabel = MakeLabel(Fonts::normal,
                                     resultColors[currentColorIndex],
                                     LV_LABEL_LONG_BREAK,
                                     90,
@@ -112,7 +113,7 @@ Dice::Dice(Controllers::MotionController& motionController,
   lv_obj_set_size(btnRoll, 240, 50);
   lv_obj_align(btnRoll, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  btnRollLabel = MakeLabel(&jetbrains_mono_bold_20,
+  btnRollLabel = MakeLabel(Fonts::normal,
                            LV_COLOR_WHITE,
                            LV_LABEL_LONG_EXPAND,
                            0,

src/displayapp/screens/Dice.h

@@ -5,6 +5,7 @@
 #include "displayapp/widgets/Counter.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
+#include "displayapp/InfiniTimeTheme.h"
 
 #include <array>
 #include <random>
@@ -35,8 +36,8 @@ namespace Pinetime {
         uint8_t currentColorIndex;
         void NextColor();
 
-        Widgets::Counter nCounter = Widgets::Counter(1, 9, jetbrains_mono_42);
-        Widgets::Counter dCounter = Widgets::Counter(2, 99, jetbrains_mono_42);
+        Widgets::Counter nCounter = Widgets::Counter(1, 9, *Fonts::large);
+        Widgets::Counter dCounter = Widgets::Counter(2, 99, *Fonts::large);
 
         bool openingRoll = true;
         uint8_t currentRollHysteresis = 0;

src/displayapp/screens/HeartRate.cpp

@@ -33,7 +33,7 @@ HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, Syst
   bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
   label_hr = lv_label_create(lv_scr_act(), nullptr);
 
-  lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
+  lv_obj_set_style_local_text_font(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Fonts::huge);
 
   if (isHrRunning) {
     lv_obj_set_style_local_text_color(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight);

src/displayapp/screens/Metronome.cpp

@@ -10,7 +10,7 @@ namespace {
     screen->OnEvent(obj, event);
   }
 
-  lv_obj_t* createLabel(const char* name, lv_obj_t* reference, lv_align_t align, lv_font_t* font, uint8_t x, uint8_t y) {
+  lv_obj_t* createLabel(const char* name, lv_obj_t* reference, lv_align_t align, const lv_font_t* font, uint8_t x, uint8_t y) {
     lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
     lv_obj_set_style_local_text_font(label, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font);
     lv_obj_set_style_local_text_color(label, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray);
@@ -35,8 +35,8 @@ Metronome::Metronome(Controllers::MotorController& motorController, System::Syst
   lv_arc_set_adjustable(bpmArc, true);
   lv_obj_align(bpmArc, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 0, 0);
 
-  bpmValue = createLabel("120", bpmArc, LV_ALIGN_IN_TOP_MID, &jetbrains_mono_76, 0, 55);
-  createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, &jetbrains_mono_bold_20, 0, 0);
+  bpmValue = createLabel("120", bpmArc, LV_ALIGN_IN_TOP_MID, Fonts::huge, 0, 55);
+  createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, Fonts::normal, 0, 0);
 
   bpmTap = lv_btn_create(lv_scr_act(), nullptr);
   bpmTap->user_data = this;

src/displayapp/screens/Navigation.cpp

@@ -213,7 +213,7 @@ Navigation::Navigation(Pinetime::Controllers::NavigationService& nav) : navServi
   txtManDist = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtManDist, LV_LABEL_LONG_BREAK);
   lv_obj_set_style_local_text_color(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
-  lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Fonts::large);
   lv_obj_set_width(txtManDist, LV_HOR_RES);
   lv_label_set_text_static(txtManDist, "--M");
   lv_label_set_align(txtManDist, LV_LABEL_ALIGN_CENTER);