Swap from Aleo to Bookerly for wider glyph support (#172)

## Summary

* Swap from Aleo to Bookerly for wider glyph support
* Swap from Space Grotesk to a small Noto Sans

## Additional Context

* 0.11.0 swapped to Aleo which has a few issues (things like Cyrillic
support for eg)

src/CrossPointSettings.cpp

@@ -92,7 +92,7 @@ bool CrossPointSettings::loadFromFile() {
 
 float CrossPointSettings::getReaderLineCompression() const {
   switch (fontFamily) {
-    case ALEO:
+    case BOOKERLY:
     default:
       switch (lineSpacing) {
         case TIGHT:
@@ -128,18 +128,18 @@ float CrossPointSettings::getReaderLineCompression() const {
 
 int CrossPointSettings::getReaderFontId() const {
   switch (fontFamily) {
-    case ALEO:
+    case BOOKERLY:
     default:
       switch (fontSize) {
         case SMALL:
-          return ALEO_12_FONT_ID;
+          return BOOKERLY_12_FONT_ID;
         case MEDIUM:
         default:
-          return ALEO_14_FONT_ID;
+          return BOOKERLY_14_FONT_ID;
         case LARGE:
-          return ALEO_16_FONT_ID;
+          return BOOKERLY_16_FONT_ID;
         case EXTRA_LARGE:
-          return ALEO_18_FONT_ID;
+          return BOOKERLY_18_FONT_ID;
       }
     case NOTOSANS:
       switch (fontSize) {

src/CrossPointSettings.h

@@ -39,7 +39,7 @@ class CrossPointSettings {
   enum SIDE_BUTTON_LAYOUT { PREV_NEXT = 0, NEXT_PREV = 1 };
 
   // Font family options
-  enum FONT_FAMILY { ALEO = 0, NOTOSANS = 1, OPENDYSLEXIC = 2 };
+  enum FONT_FAMILY { BOOKERLY = 0, NOTOSANS = 1, OPENDYSLEXIC = 2 };
   // Font size options
   enum FONT_SIZE { SMALL = 0, MEDIUM = 1, LARGE = 2, EXTRA_LARGE = 3 };
   enum LINE_COMPRESSION { TIGHT = 0, NORMAL = 1, WIDE = 2 };
@@ -59,7 +59,7 @@ class CrossPointSettings {
   uint8_t frontButtonLayout = BACK_CONFIRM_LEFT_RIGHT;
   uint8_t sideButtonLayout = PREV_NEXT;
   // Reader font settings
-  uint8_t fontFamily = ALEO;
+  uint8_t fontFamily = BOOKERLY;
   uint8_t fontSize = MEDIUM;
   uint8_t lineSpacing = NORMAL;
 

src/ScreenComponents.cpp

@@ -17,7 +17,7 @@ void ScreenComponents::drawBattery(const GfxRenderer& renderer, const int left,
   constexpr int batteryWidth = 15;
   constexpr int batteryHeight = 10;
   const int x = left;
-  const int y = top + 7;
+  const int y = top + 8;
 
   // Top line
   renderer.drawLine(x, y, x + batteryWidth - 4, y);

src/activities/reader/EpubReaderActivity.cpp

@@ -421,7 +421,7 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
 
   // Position status bar near the bottom of the logical screen, regardless of orientation
   const auto screenHeight = renderer.getScreenHeight();
-  const auto textY = screenHeight - orientedMarginBottom - 2;
+  const auto textY = screenHeight - orientedMarginBottom - 4;
   int progressTextWidth = 0;
 
   if (showProgress) {

src/activities/settings/SettingsActivity.cpp

@@ -28,7 +28,10 @@ const SettingInfo settingsList[settingsCount] = {
      SettingType::ENUM,
      &CrossPointSettings::sideButtonLayout,
      {"Prev, Next", "Next, Prev"}},
-    {"Reader Font Family", SettingType::ENUM, &CrossPointSettings::fontFamily, {"Aleo", "Noto Sans", "Open Dyslexic"}},
+    {"Reader Font Family",
+     SettingType::ENUM,
+     &CrossPointSettings::fontFamily,
+     {"Bookerly", "Noto Sans", "Open Dyslexic"}},
     {"Reader Font Size", SettingType::ENUM, &CrossPointSettings::fontSize, {"Small", "Medium", "Large", "X Large"}},
     {"Reader Line Spacing", SettingType::ENUM, &CrossPointSettings::lineSpacing, {"Tight", "Normal", "Wide"}},
     {"Check for updates", SettingType::ACTION, nullptr, {}},

src/fontIds.h

@@ -1,10 +1,10 @@
 // The contents of this file are generated by ./lib/EpdFont/scripts/build-font-ids.sh
 #pragma once
 
-#define ALEO_12_FONT_ID (2101191384)
-#define ALEO_14_FONT_ID (-1834656672)
-#define ALEO_16_FONT_ID (-1982848762)
-#define ALEO_18_FONT_ID (-365302307)
+#define BOOKERLY_12_FONT_ID (-142329172)
+#define BOOKERLY_14_FONT_ID (104246423)
+#define BOOKERLY_16_FONT_ID (1909382491)
+#define BOOKERLY_18_FONT_ID (2056549737)
 #define NOTOSANS_12_FONT_ID (-1646794343)
 #define NOTOSANS_14_FONT_ID (-890242897)
 #define NOTOSANS_16_FONT_ID (241925189)
@@ -15,4 +15,4 @@
 #define OPENDYSLEXIC_14_FONT_ID (-1851285286)
 #define UI_10_FONT_ID (-823541435)
 #define UI_12_FONT_ID (-126318184)
-#define SMALL_FONT_ID (-706443385)
+#define SMALL_FONT_ID (-874196069)

src/main.cpp

@@ -40,26 +40,30 @@ GfxRenderer renderer(einkDisplay);
 Activity* currentActivity;
 
 // Fonts
-EpdFont aleo12RegularFont(&aleo_12_regular);
-EpdFont aleo12BoldFont(&aleo_12_bold);
-EpdFont aleo12ItalicFont(&aleo_12_italic);
-EpdFont aleo12BoldItalicFont(&aleo_12_bolditalic);
-EpdFontFamily aleo12FontFamily(&aleo12RegularFont, &aleo12BoldFont, &aleo12ItalicFont, &aleo12BoldItalicFont);
-EpdFont aleo14RegularFont(&aleo_14_regular);
-EpdFont aleo14BoldFont(&aleo_14_bold);
-EpdFont aleo14ItalicFont(&aleo_14_italic);
-EpdFont aleo14BoldItalicFont(&aleo_14_bolditalic);
-EpdFontFamily aleo14FontFamily(&aleo14RegularFont, &aleo14BoldFont, &aleo14ItalicFont, &aleo14BoldItalicFont);
-EpdFont aleo16RegularFont(&aleo_16_regular);
-EpdFont aleo16BoldFont(&aleo_16_bold);
-EpdFont aleo16ItalicFont(&aleo_16_italic);
-EpdFont aleo16BoldItalicFont(&aleo_16_bolditalic);
-EpdFontFamily aleo16FontFamily(&aleo16RegularFont, &aleo16BoldFont, &aleo16ItalicFont, &aleo16BoldItalicFont);
-EpdFont aleo18RegularFont(&aleo_18_regular);
-EpdFont aleo18BoldFont(&aleo_18_bold);
-EpdFont aleo18ItalicFont(&aleo_18_italic);
-EpdFont aleo18BoldItalicFont(&aleo_18_bolditalic);
-EpdFontFamily aleo18FontFamily(&aleo18RegularFont, &aleo18BoldFont, &aleo18ItalicFont, &aleo18BoldItalicFont);
+EpdFont bookerly12RegularFont(&bookerly_12_regular);
+EpdFont bookerly12BoldFont(&bookerly_12_bold);
+EpdFont bookerly12ItalicFont(&bookerly_12_italic);
+EpdFont bookerly12BoldItalicFont(&bookerly_12_bolditalic);
+EpdFontFamily bookerly12FontFamily(&bookerly12RegularFont, &bookerly12BoldFont, &bookerly12ItalicFont,
+                                   &bookerly12BoldItalicFont);
+EpdFont bookerly14RegularFont(&bookerly_14_regular);
+EpdFont bookerly14BoldFont(&bookerly_14_bold);
+EpdFont bookerly14ItalicFont(&bookerly_14_italic);
+EpdFont bookerly14BoldItalicFont(&bookerly_14_bolditalic);
+EpdFontFamily bookerly14FontFamily(&bookerly14RegularFont, &bookerly14BoldFont, &bookerly14ItalicFont,
+                                   &bookerly14BoldItalicFont);
+EpdFont bookerly16RegularFont(&bookerly_16_regular);
+EpdFont bookerly16BoldFont(&bookerly_16_bold);
+EpdFont bookerly16ItalicFont(&bookerly_16_italic);
+EpdFont bookerly16BoldItalicFont(&bookerly_16_bolditalic);
+EpdFontFamily bookerly16FontFamily(&bookerly16RegularFont, &bookerly16BoldFont, &bookerly16ItalicFont,
+                                   &bookerly16BoldItalicFont);
+EpdFont bookerly18RegularFont(&bookerly_18_regular);
+EpdFont bookerly18BoldFont(&bookerly_18_bold);
+EpdFont bookerly18ItalicFont(&bookerly_18_italic);
+EpdFont bookerly18BoldItalicFont(&bookerly_18_bolditalic);
+EpdFontFamily bookerly18FontFamily(&bookerly18RegularFont, &bookerly18BoldFont, &bookerly18ItalicFont,
+                                   &bookerly18BoldItalicFont);
 
 EpdFont notosans12RegularFont(&notosans_12_regular);
 EpdFont notosans12BoldFont(&notosans_12_bold);
@@ -111,7 +115,7 @@ EpdFont opendyslexic14BoldItalicFont(&opendyslexic_14_bolditalic);
 EpdFontFamily opendyslexic14FontFamily(&opendyslexic14RegularFont, &opendyslexic14BoldFont, &opendyslexic14ItalicFont,
                                        &opendyslexic14BoldItalicFont);
 
-EpdFont smallFont(&spacegrotesk);
+EpdFont smallFont(&notosans_8_regular);
 EpdFontFamily smallFontFamily(&smallFont);
 
 EpdFont ui10RegularFont(&ubuntu_10_regular);
@@ -227,10 +231,10 @@ void onGoHome() {
 void setupDisplayAndFonts() {
   einkDisplay.begin();
   Serial.printf("[%lu] [   ] Display initialized\n", millis());
-  renderer.insertFont(ALEO_12_FONT_ID, aleo12FontFamily);
-  renderer.insertFont(ALEO_14_FONT_ID, aleo14FontFamily);
-  renderer.insertFont(ALEO_16_FONT_ID, aleo16FontFamily);
-  renderer.insertFont(ALEO_18_FONT_ID, aleo18FontFamily);
+  renderer.insertFont(BOOKERLY_12_FONT_ID, bookerly12FontFamily);
+  renderer.insertFont(BOOKERLY_14_FONT_ID, bookerly14FontFamily);
+  renderer.insertFont(BOOKERLY_16_FONT_ID, bookerly16FontFamily);
+  renderer.insertFont(BOOKERLY_18_FONT_ID, bookerly18FontFamily);
   renderer.insertFont(NOTOSANS_12_FONT_ID, notosans12FontFamily);
   renderer.insertFont(NOTOSANS_14_FONT_ID, notosans14FontFamily);
   renderer.insertFont(NOTOSANS_16_FONT_ID, notosans16FontFamily);