Use aliases for fonts instead of direct font names

lib_nbgl/include/nbgl_fonts.h

@@ -22,6 +22,17 @@ extern "C" {
 #define PIC_CHAR(x) ((const nbgl_font_character_t *) PIC(x))
 #define PIC_BMP(x)  ((uint8_t const *) PIC(x))
 
+/**
+ * @brief fonts nicknames to be used for various wallet size targets (non-Nano)
+ *
+ */
+#define SMALL_REGULAR_FONT      BAGL_FONT_INTER_REGULAR_24px
+#define SMALL_BOLD_FONT         BAGL_FONT_INTER_SEMIBOLD_24px
+#define LARGE_MEDIUM_FONT       BAGL_FONT_INTER_MEDIUM_32px
+#define SMALL_REGULAR_1BPP_FONT BAGL_FONT_INTER_REGULAR_24px_1bpp
+#define SMALL_BOLD_1BPP_FONT    BAGL_FONT_INTER_SEMIBOLD_24px_1bpp
+#define LARGE_MEDIUM_1BPP_FONT  BAGL_FONT_INTER_MEDIUM_32px_1bpp
+
 /**********************
  *      TYPEDEFS
  **********************/

lib_nbgl/include/nbgl_types.h

@@ -17,27 +17,32 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include "bolos_target.h"
 
 /*********************
  *      DEFINES
  *********************/
 /**
  * Width of the front screen in pixels
  */
-#ifndef BAGL_WIDTH
+#ifdef SCREEN_SIZE_WALLET
+#ifdef TARGET_STAX
 #define SCREEN_WIDTH 400
-#else  // HAVE_SE_TOUCH
-#define SCREEN_WIDTH BAGL_WIDTH
-#endif  // HAVE_SE_TOUCH
+#endif  // TARGET_STAX
+#else   // SCREEN_SIZE_WALLET
+#define SCREEN_WIDTH 128
+#endif  // SCREEN_SIZE_WALLET
 
 /**
  * Height of the front screen in pixels
  */
-#ifndef BAGL_HEIGHT
+#ifdef SCREEN_SIZE_WALLET
+#ifdef TARGET_STAX
 #define SCREEN_HEIGHT 672
-#else  // HAVE_SE_TOUCH
-#define SCREEN_HEIGHT BAGL_HEIGHT
-#endif  // HAVE_SE_TOUCH
+#endif  // TARGET_STAX
+#else   // SCREEN_SIZE_WALLET
+#define SCREEN_HEIGHT 64
+#endif  // SCREEN_SIZE_WALLET
 
 /**
  * No transformation

lib_nbgl/serialization/Makefile

@@ -4,9 +4,7 @@ DEFINES := -DLINUX_SIMU -DHAVE_LANGUAGE_PACK -DNBGL_GENERATE_DATA_TEST
 
 ifdef TARGET_STAX
 DEFINES += -DHAVE_SE_TOUCH
-else
-DEFINES += -DBAGL_HEIGHT=64 -DBAGL_WIDTH=128
-
+DEFINES += -DSCREEN_SIZE_WALLET
 endif
 
 default: generate_data_test.c

lib_nbgl/src/nbgl_obj.c

@@ -733,9 +733,9 @@ static void draw_pageIndicator(nbgl_page_indicator_t *obj,
 
         SPRINTF(navText, "%d of %d", obj->activePage + 1, obj->nbPages);
         // force height
-        obj->obj.area.height = nbgl_getFontHeight(BAGL_FONT_INTER_REGULAR_24px);
+        obj->obj.area.height = nbgl_getFontHeight(SMALL_REGULAR_FONT);
         // the width must be at least 80
-        obj->obj.area.width = nbgl_getTextWidth(BAGL_FONT_INTER_REGULAR_24px, navText);
+        obj->obj.area.width = nbgl_getTextWidth(SMALL_REGULAR_FONT, navText);
 
         if (computePosition) {
             compute_position((nbgl_obj_t *) obj, prevObj);
@@ -760,7 +760,7 @@ static void draw_pageIndicator(nbgl_page_indicator_t *obj,
         rectArea.height          = obj->obj.area.height;
         rectArea.backgroundColor = obj->obj.area.backgroundColor;
         rectArea.bpp             = NBGL_BPP_1;
-        nbgl_drawText(&rectArea, navText, strlen(navText), BAGL_FONT_INTER_REGULAR_24px, DARK_GRAY);
+        nbgl_drawText(&rectArea, navText, strlen(navText), SMALL_REGULAR_FONT, DARK_GRAY);
     }
 }
 #endif  // HAVE_SE_TOUCH

lib_nbgl/src/nbgl_obj_keyboard.c

@@ -300,25 +300,23 @@ static void keyboardDrawLetters(nbgl_keyboard_t *keyboard)
         rectArea.x0 = keyboard->obj.area.x0 + i * NORMAL_KEY_WIDTH;
 
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // Second row: 9 letters (asdfghjkl)
     rectArea.y0 += KEYBOARD_KEY_HEIGHT;
     for (i = 10; i < 19; i++) {
         rectArea.x0 = keyboard->obj.area.x0 + SECOND_LINE_OFFSET + (i - 10) * NORMAL_KEY_WIDTH;
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // Third row: Shift key, 7 letters (zxcvbnm) and backspace
@@ -363,12 +361,11 @@ static void keyboardDrawLetters(nbgl_keyboard_t *keyboard)
     for (i = 19; i < 26; i++) {
         rectArea.x0 = offsetX + (i - 19) * NORMAL_KEY_WIDTH;
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // draw backspace
@@ -389,11 +386,9 @@ static void keyboardDrawLetters(nbgl_keyboard_t *keyboard)
 
     // 4th row, only in Full mode
     if (!keyboard->lettersOnly) {
-        rectArea.x0
-            = (SWITCH_KEY_WIDTH - nbgl_getTextWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, ".?123"))
-              / 2;
+        rectArea.x0 = (SWITCH_KEY_WIDTH - nbgl_getTextWidth(SMALL_REGULAR_1BPP_FONT, ".?123")) / 2;
         rectArea.y0 = keyboard->obj.area.y0 + KEYBOARD_KEY_HEIGHT * 3 + LETTER_OFFSET_Y;
-        nbgl_drawText(&rectArea, ".?123", 5, BAGL_FONT_INTER_REGULAR_24px_1bpp, BLACK);
+        nbgl_drawText(&rectArea, ".?123", 5, SMALL_REGULAR_1BPP_FONT, BLACK);
 
         rectArea.x0 = SWITCH_KEY_WIDTH + (SPACE_KEY_WIDTH - C_space32px.width) / 2;
         nbgl_drawIcon(
@@ -425,54 +420,49 @@ static void keyboardDrawDigits(nbgl_keyboard_t *keyboard)
     for (i = 0; i < 10; i++) {
         rectArea.x0 = keyboard->obj.area.x0 + i * NORMAL_KEY_WIDTH;
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // Second row: 9 keys ()
     rectArea.y0 += KEYBOARD_KEY_HEIGHT;
     for (i = 10; i < 19; i++) {
         rectArea.x0 = keyboard->obj.area.x0 + (i - 10) * NORMAL_KEY_WIDTH + SECOND_LINE_OFFSET;
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // Third row: special key, 5 keys and backspace
 
     // draw "#+=" key
     if (keyboard->mode == MODE_DIGITS) {
-        rectArea.x0 = (SPECIAL_CHARS_KEY_WIDTH
-                       - nbgl_getTextWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, "#+="))
-                      / 2;
+        rectArea.x0
+            = (SPECIAL_CHARS_KEY_WIDTH - nbgl_getTextWidth(SMALL_REGULAR_1BPP_FONT, "#+=")) / 2;
         rectArea.y0 = keyboard->obj.area.y0 + KEYBOARD_KEY_HEIGHT * 2 + LETTER_OFFSET_Y;
-        nbgl_drawText(&rectArea, "#+=", 3, BAGL_FONT_INTER_REGULAR_24px_1bpp, BLACK);
+        nbgl_drawText(&rectArea, "#+=", 3, SMALL_REGULAR_1BPP_FONT, BLACK);
     }
     else {
-        rectArea.x0 = (SPECIAL_CHARS_KEY_WIDTH
-                       - nbgl_getTextWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, "123"))
-                      / 2;
+        rectArea.x0
+            = (SPECIAL_CHARS_KEY_WIDTH - nbgl_getTextWidth(SMALL_REGULAR_1BPP_FONT, "123")) / 2;
         rectArea.y0 = keyboard->obj.area.y0 + KEYBOARD_KEY_HEIGHT * 2 + LETTER_OFFSET_Y;
-        nbgl_drawText(&rectArea, "123", 3, BAGL_FONT_INTER_REGULAR_24px_1bpp, BLACK);
+        nbgl_drawText(&rectArea, "123", 3, SMALL_REGULAR_1BPP_FONT, BLACK);
     }
 
     for (i = 19; i < 24; i++) {
         rectArea.x0 = SPECIAL_CHARS_KEY_WIDTH + (i - 19) * NORMAL_KEY_WIDTH;
         rectArea.x0
-            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, &keys[i]))
-               / 2;
+            += (NORMAL_KEY_WIDTH - nbgl_getCharWidth(SMALL_REGULAR_1BPP_FONT, &keys[i])) / 2;
         nbgl_drawText(&rectArea,
                       &keys[i],
                       1,
-                      BAGL_FONT_INTER_REGULAR_24px_1bpp,
+                      SMALL_REGULAR_1BPP_FONT,
                       (keyboard->keyMask & (1 << i)) ? WHITE : BLACK);
     }
     // draw backspace
@@ -486,10 +476,9 @@ static void keyboardDrawDigits(nbgl_keyboard_t *keyboard)
     nbgl_drawIcon(&rectArea, BLACK, &C_backspace32px);
 
     // 4th row
-    rectArea.x0
-        = (SWITCH_KEY_WIDTH - nbgl_getTextWidth(BAGL_FONT_INTER_REGULAR_24px_1bpp, "ABC")) / 2;
+    rectArea.x0 = (SWITCH_KEY_WIDTH - nbgl_getTextWidth(SMALL_REGULAR_1BPP_FONT, "ABC")) / 2;
     rectArea.y0 = keyboard->obj.area.y0 + KEYBOARD_KEY_HEIGHT * 3 + LETTER_OFFSET_Y;
-    nbgl_drawText(&rectArea, "ABC", 3, BAGL_FONT_INTER_REGULAR_24px_1bpp, BLACK);
+    nbgl_drawText(&rectArea, "ABC", 3, SMALL_REGULAR_1BPP_FONT, BLACK);
 
     rectArea.x0 = SWITCH_KEY_WIDTH + (SPACE_KEY_WIDTH - C_space32px.width) / 2;
     nbgl_drawIcon(

lib_nbgl/src/nbgl_obj_keypad.c

@@ -139,36 +139,27 @@ static void keypadDrawDigits(nbgl_keypad_t *keypad)
         key_value = GET_DIGIT_INDEX(keypad, (i + 1)) + 0x30;
 
         rectArea.x0 = keypad->obj.area.x0 + i * KEY_WIDTH;
-        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_MEDIUM_32px, &key_value)) / 2;
-        nbgl_drawText(&rectArea,
-                      &key_value,
-                      1,
-                      BAGL_FONT_INTER_MEDIUM_32px,
-                      keypad->enableDigits ? BLACK : WHITE);
+        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(LARGE_MEDIUM_FONT, &key_value)) / 2;
+        nbgl_drawText(
+            &rectArea, &key_value, 1, LARGE_MEDIUM_FONT, keypad->enableDigits ? BLACK : WHITE);
     }
     // Second row: 4 5 6
     rectArea.y0 += KEYPAD_KEY_HEIGHT;
     for (; i < 6; i++) {
         key_value   = GET_DIGIT_INDEX(keypad, (i + 1)) + 0x30;
         rectArea.x0 = keypad->obj.area.x0 + (i - 3) * KEY_WIDTH;
-        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_MEDIUM_32px, &key_value)) / 2;
-        nbgl_drawText(&rectArea,
-                      &key_value,
-                      1,
-                      BAGL_FONT_INTER_MEDIUM_32px,
-                      keypad->enableDigits ? BLACK : WHITE);
+        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(LARGE_MEDIUM_FONT, &key_value)) / 2;
+        nbgl_drawText(
+            &rectArea, &key_value, 1, LARGE_MEDIUM_FONT, keypad->enableDigits ? BLACK : WHITE);
     }
     // Third row: 7 8 9
     rectArea.y0 += KEYPAD_KEY_HEIGHT;
     for (; i < 9; i++) {
         key_value   = GET_DIGIT_INDEX(keypad, (i + 1)) + 0x30;
         rectArea.x0 = keypad->obj.area.x0 + (i - 6) * KEY_WIDTH;
-        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_MEDIUM_32px, &key_value)) / 2;
-        nbgl_drawText(&rectArea,
-                      &key_value,
-                      1,
-                      BAGL_FONT_INTER_MEDIUM_32px,
-                      keypad->enableDigits ? BLACK : WHITE);
+        rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(LARGE_MEDIUM_FONT, &key_value)) / 2;
+        nbgl_drawText(
+            &rectArea, &key_value, 1, LARGE_MEDIUM_FONT, keypad->enableDigits ? BLACK : WHITE);
     }
     // 4th raw, Backspace, 0 and Validate
     // draw backspace
@@ -193,13 +184,10 @@ static void keypadDrawDigits(nbgl_keypad_t *keypad)
     // draw 0
     key_value   = GET_DIGIT_INDEX(keypad, 0) + 0x30;
     rectArea.x0 = keypad->obj.area.x0 + KEY_WIDTH;
-    rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(BAGL_FONT_INTER_MEDIUM_32px, &key_value)) / 2;
+    rectArea.x0 += (KEY_WIDTH - nbgl_getCharWidth(LARGE_MEDIUM_FONT, &key_value)) / 2;
     rectArea.y0 = keypad->obj.area.y0 + KEYPAD_KEY_HEIGHT * 3 + DIGIT_OFFSET_Y;
-    nbgl_drawText(&rectArea,
-                  &key_value,
-                  1,
-                  BAGL_FONT_INTER_MEDIUM_32px,
-                  keypad->enableDigits ? BLACK : WHITE);
+    nbgl_drawText(
+        &rectArea, &key_value, 1, LARGE_MEDIUM_FONT, keypad->enableDigits ? BLACK : WHITE);
 
     // draw validate on gray with white background if not enabled
     if (!keypad->enableValidate) {

lib_nbgl/src/nbgl_page.c

@@ -90,13 +90,12 @@ static void addContent(nbgl_pageContent_t *content, nbgl_layout_t *layout)
             nbgl_layoutAddTagValueList(layout, &content->tagValueList);
             break;
         case TAG_VALUE_DETAILS: {
-            uint16_t nbLines
-                = nbgl_getTextNbLinesInWidth(content->tagValueDetails.tagValueList.smallCaseForValue
-                                                 ? BAGL_FONT_INTER_REGULAR_24px
-                                                 : BAGL_FONT_INTER_MEDIUM_32px,
-                                             content->tagValueDetails.tagValueList.pairs[0].value,
-                                             SCREEN_WIDTH - 2 * BORDER_MARGIN,
-                                             content->tagValueDetails.tagValueList.wrapping);
+            uint16_t nbLines = nbgl_getTextNbLinesInWidth(
+                content->tagValueDetails.tagValueList.smallCaseForValue ? SMALL_REGULAR_FONT
+                                                                        : LARGE_MEDIUM_FONT,
+                content->tagValueDetails.tagValueList.pairs[0].value,
+                SCREEN_WIDTH - 2 * BORDER_MARGIN,
+                content->tagValueDetails.tagValueList.wrapping);
             // automatically display a button if content is longer that nbMaxLinesForValue
             if (nbLines > (content->tagValueDetails.tagValueList.nbMaxLinesForValue)) {
                 nbgl_layoutButton_t buttonInfo;

lib_nbgl/src/nbgl_use_case.c

@@ -487,10 +487,10 @@ static const char *getDetailsPageAt(uint8_t detailsPage)
     const char *currentChar = detailsContext.value;
     while (page < detailsPage) {
         uint16_t nbLines = nbgl_getTextNbLinesInWidth(
-            BAGL_FONT_INTER_REGULAR_24px, currentChar, SCREEN_WIDTH - 2 * BORDER_MARGIN, false);
+            SMALL_REGULAR_FONT, currentChar, SCREEN_WIDTH - 2 * BORDER_MARGIN, false);
         if (nbLines > NB_MAX_LINES_IN_DETAILS) {
             uint16_t len;
-            nbgl_getTextMaxLenInNbLines(BAGL_FONT_INTER_REGULAR_24px,
+            nbgl_getTextMaxLenInNbLines(SMALL_REGULAR_FONT,
                                         currentChar,
                                         SCREEN_WIDTH - 2 * BORDER_MARGIN,
                                         NB_MAX_LINES_IN_DETAILS,
@@ -537,11 +537,11 @@ static void displayDetailsPage(uint8_t detailsPage, bool forceFullRefresh)
     }
     detailsContext.currentPage = detailsPage;
     uint16_t nbLines           = nbgl_getTextNbLinesInWidth(
-        BAGL_FONT_INTER_REGULAR_24px, currentPair.value, SCREEN_WIDTH - 2 * BORDER_MARGIN, false);
+        SMALL_REGULAR_FONT, currentPair.value, SCREEN_WIDTH - 2 * BORDER_MARGIN, false);
 
     if (nbLines > NB_MAX_LINES_IN_DETAILS) {
         uint16_t len;
-        nbgl_getTextMaxLenInNbLines(BAGL_FONT_INTER_REGULAR_24px,
+        nbgl_getTextMaxLenInNbLines(SMALL_REGULAR_FONT,
                                     currentPair.value,
                                     SCREEN_WIDTH - 2 * BORDER_MARGIN,
                                     NB_MAX_LINES_IN_DETAILS,
@@ -740,18 +740,16 @@ uint8_t nbgl_useCaseGetNbTagValuesInPage(uint8_t                          nbPair
             item            = callback_result->item;
         }
         // tag height
-        currentHeight += nbgl_getTextHeightInWidth(BAGL_FONT_INTER_REGULAR_24px,
-                                                   item,
-                                                   SCREEN_WIDTH - 2 * BORDER_MARGIN,
-                                                   tagValueList->wrapping);
+        currentHeight += nbgl_getTextHeightInWidth(
+            SMALL_REGULAR_FONT, item, SCREEN_WIDTH - 2 * BORDER_MARGIN, tagValueList->wrapping);
         // space between tag and value
         currentHeight += 4;
         // set value font
         if (tagValueList->smallCaseForValue) {
-            value_font = BAGL_FONT_INTER_REGULAR_24px;
+            value_font = SMALL_REGULAR_FONT;
         }
         else {
-            value_font = BAGL_FONT_INTER_MEDIUM_32px;
+            value_font = LARGE_MEDIUM_FONT;
         }
         // value height
         currentHeight += nbgl_getTextHeightInWidth(
@@ -885,10 +883,8 @@ void nbgl_useCaseHomeExt(const char                *appName,
 
         // If there is more than 3 lines, it means the appName was split, so we put it on the next
         // line
-        if (nbgl_getTextNbLinesInWidth(BAGL_FONT_INTER_REGULAR_24px,
-                                       appDescription,
-                                       SCREEN_WIDTH - 2 * BORDER_MARGIN,
-                                       false)
+        if (nbgl_getTextNbLinesInWidth(
+                SMALL_REGULAR_FONT, appDescription, SCREEN_WIDTH - 2 * BORDER_MARGIN, false)
             > 3) {
             snprintf(appDescription,
                      APP_DESCRIPTION_MAX_LEN,
@@ -1435,7 +1431,7 @@ void nbgl_useCaseViewDetails(const char *tag, const char *value, bool wrapping)
     memset(&detailsContext, 0, sizeof(detailsContext));
 
     uint16_t nbLines = nbgl_getTextNbLinesInWidth(
-        BAGL_FONT_INTER_REGULAR_24px, value, SCREEN_WIDTH - 2 * BORDER_MARGIN, wrapping);
+        SMALL_REGULAR_FONT, value, SCREEN_WIDTH - 2 * BORDER_MARGIN, wrapping);
 
     // initialize context
     detailsContext.tag         = tag;

lib_nbgl/src/nbgl_use_case_nanos.c

@@ -505,5 +505,5 @@ void nbgl_useCaseSpinner(const char *text)
     nbgl_refresh();
 }
 
-#endif  // TARGET_STAX
+#endif  // HAVE_SE_TOUCH
 #endif  // NBGL_USE_CASE