Make changing fonts easier.

Make some changes to centralize the default font sizes.
These changes enable fonts to be changed by modifying..
fonts.json, lv_conf.h, CMakeLists.txt and InfiniTineTheme.h.
No more having to search & replace to test new fonts.

 * Abstract the font names behind some sane variable names.
 * Add Fonts:: namespace to InfinitimeTheme.h, with references to fonts.
 * Update all screens, widgets, and settings to use the Fonts::
   namespace.

Author: mzrinsky

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::small;
+  theme.font_normal = Fonts::small;
+  theme.font_subtitle = Fonts::small;
+  theme.font_title = Fonts::small;
   theme.flags = 0;
 
   basic_init();
@@ -251,22 +251,7 @@ static void theme_apply(lv_obj_t* obj, lv_theme_style_t name) {
       lv_obj_clean_style_list(obj, LV_OBJ_PART_MAIN);
       list = lv_obj_get_style_list(obj, LV_OBJ_PART_MAIN);
       _lv_style_list_add_style(list, &style_box);
-      break;
-
-    case LV_THEME_CONT:
-      lv_obj_clean_style_list(obj, LV_OBJ_PART_MAIN);
-      list = lv_obj_get_style_list(obj, LV_CONT_PART_MAIN);
-      _lv_style_list_add_style(list, &style_box);
-      break;
-
-    case LV_THEME_BTN:
-      lv_obj_clean_style_list(obj, LV_BTN_PART_MAIN);
-      list = lv_obj_get_style_list(obj, LV_BTN_PART_MAIN);
-      _lv_style_list_add_style(list, &style_btn);
-      break;
-
-    case LV_THEME_BTNMATRIX:
-      list = lv_obj_get_style_list(obj, LV_BTNMATRIX_PART_BG);
+      break;src/displayapp/InfiniTimeTheme.cppobj, LV_BTNMATRIX_PART_BG);
       _lv_style_list_add_style(list, &style_bg);
       _lv_style_list_add_style(list, &style_pad_small);
 

src/displayapp/InfiniTimeTheme.h

@@ -15,6 +15,13 @@ namespace Colors {
   static constexpr lv_color_t highlight = green;
 };
 
+namespace Fonts {
+  static lv_font_t * small = &jetbrains_mono_bold_20;
+  static lv_font_t * normal = &jetbrains_mono_42;
+  static lv_font_t * large = &jetbrains_mono_76;
+  static lv_font_t * xlarge = &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::large);
   lv_label_set_text_static(colonLabel, ":");
   lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
 

src/displayapp/screens/Alarm.h

@@ -22,6 +22,7 @@
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/Counter.h"
 #include "displayapp/Controllers.h"
+#include "displayapp/InfiniTimeTheme.h"
 #include "systemtask/WakeLock.h"
 #include "Symbols.h"
 
@@ -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::large);
+        Widgets::Counter minuteCounter = Widgets::Counter(0, 59, *Fonts::large);
       };
     }
 

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::normal);
   lv_label_set_text_fmt(percent, "%02i%%", 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

@@ -49,7 +49,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::small,
                                       LV_COLOR_WHITE,
                                       LV_LABEL_LONG_EXPAND,
                                       0,
@@ -60,7 +60,7 @@ Dice::Dice(Controllers::MotionController& motionController,
                                       0,
                                       0);
 
-  lv_obj_t* dCounterLabel = MakeLabel(&jetbrains_mono_bold_20,
+  lv_obj_t* dCounterLabel = MakeLabel(Fonts::small,
                                       LV_COLOR_WHITE,
                                       LV_LABEL_LONG_EXPAND,
                                       0,
@@ -82,7 +82,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::normal,
                                resultColors[currentColorIndex],
                                LV_LABEL_LONG_BREAK,
                                120,
@@ -92,7 +92,7 @@ Dice::Dice(Controllers::MotionController& motionController,
                                LV_ALIGN_IN_TOP_RIGHT,
                                11,
                                38);
-  resultIndividualLabel = MakeLabel(&jetbrains_mono_bold_20,
+  resultIndividualLabel = MakeLabel(Fonts::small,
                                     resultColors[currentColorIndex],
                                     LV_LABEL_LONG_BREAK,
                                     90,
@@ -112,7 +112,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::small,
                            LV_COLOR_WHITE,
                            LV_LABEL_LONG_EXPAND,
                            0,

src/displayapp/screens/Dice.h

@@ -4,6 +4,7 @@
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/Counter.h"
 #include "displayapp/Controllers.h"
+#include "displayapp/InfiniTimeTheme.h"
 #include "Symbols.h"
 
 #include <array>
@@ -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::normal);
+        Widgets::Counter dCounter = Widgets::Counter(2, 99, *Fonts::normal);
 
         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::large);
 
   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

@@ -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::large, 0, 55);
+  createLabel("bpm", bpmValue, LV_ALIGN_OUT_BOTTOM_MID, Fonts::small, 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::normal);
   lv_obj_set_width(txtManDist, LV_HOR_RES);
   lv_label_set_text_static(txtManDist, "--M");
   lv_label_set_align(txtManDist, LV_LABEL_ALIGN_CENTER);