ui: handle up to 7 equal h/v splits to allow better grid display

Also make cell text alignment and font explicit

Author: Jamie C. Driver

main/ui.h

@@ -134,9 +134,9 @@ void populate_title_bar(
 gui_view_node_t* add_title_bar(
     gui_activity_t* activity, const char* title, btn_data_t* btns, size_t num_btns, gui_view_node_t** title_node);
 
-// Helper to create an activity which is a grid of (up to 5x5) text items
+// Helper to create an activity which is a grid of (up to 7x7) text items
 gui_activity_t* make_text_grid_activity(const char* title, btn_data_t* hdrbtns, size_t num_hdrbtns, size_t toppad,
-    uint8_t xcells, uint8_t ycells, const char* texts, size_t num_texts, const char** remaining_texts);
+    uint8_t xcells, uint8_t ycells, const char* texts, size_t num_texts, uint32_t font, const char** remaining_texts);
 
 // Helper to create a vertical menu of 2, 3 or 4 buttons
 gui_activity_t* make_menu_activity(

main/ui/confirm_address.c

@@ -11,16 +11,20 @@
 
 #if ADDRESS_STRING_GRID
 
+#define ADDR_GRID_FONT GUI_DEFAULT_FONT
 #define ADDR_GRID_TOPPAD 12
 #define ADDR_GRID_X 5
 #define ADDR_GRID_Y 5
 #define ADDR_GRID_SIZE (ADDR_GRID_X * ADDR_GRID_Y)
 #define ADDR_TEXTSPLITLEN (MAX_DISPLAY_ADDRESS_LEN / ADDR_GRID_SIZE)
 
+// The length of the required buffer to hold 'len' characters
+// with a nul-terminator injected every 'wordlen' characters, and
+// at the very end.  eg. for "abcdefhij\0" -> "abc\0def\0ghi\0j\0"
 #define SPLIT_TEXT_LEN(len, wordlen) (len + (len / wordlen) + 1)
 
 // Helper to copy text from one buffer to another, where the destination has terminators every
-// 'wordlen' chars, eg: "abc\0def\0ghi\0j\0"
+// 'wordlen' chars, eg: "abcdefghi\0" -> "abc\0def\0ghi\0j\0"
 // output 'num_words' is number of 'words' written - eg. 4
 // output 'written' is number iof bytes written, including all '\0's - eg. 14
 static void split_text(const char* src, const size_t len, const size_t wordlen, char* output, const size_t output_len,
@@ -89,8 +93,8 @@ gui_activity_t* make_display_address_activities(const char* title, const bool sh
 #if ADDRESS_STRING_GRID
         JADE_ASSERT(num_words <= ADDR_GRID_SIZE);
         const char* remaining_words = NULL;
-        act = make_text_grid_activity(
-            title, hdrbtns, 2, ADDR_GRID_TOPPAD, ADDR_GRID_X, ADDR_GRID_Y, address_words, num_words, &remaining_words);
+        act = make_text_grid_activity(title, hdrbtns, 2, ADDR_GRID_TOPPAD, ADDR_GRID_X, ADDR_GRID_Y, address_words,
+            num_words, ADDR_GRID_FONT, &remaining_words);
         JADE_ASSERT(remaining_words == address_words + words_len); // all words consumed (displayed)
 #else
         const int ret = snprintf(buf, sizeof(buf), "\n%s", address);
@@ -114,7 +118,7 @@ gui_activity_t* make_display_address_activities(const char* title, const bool sh
         JADE_ASSERT(num_words > ADDR_GRID_SIZE);
         const char* remaining_words = NULL;
         act = make_text_grid_activity(titlebuf, hdrbtns1, 2, ADDR_GRID_TOPPAD, ADDR_GRID_X, ADDR_GRID_Y, address_words,
-            ADDR_GRID_SIZE, &remaining_words);
+            ADDR_GRID_SIZE, ADDR_GRID_FONT, &remaining_words);
         JADE_ASSERT(remaining_words > address_words);
         JADE_ASSERT(remaining_words < address_words + words_len); // Some words remaining
 #else
@@ -136,7 +140,7 @@ gui_activity_t* make_display_address_activities(const char* title, const bool sh
 #if ADDRESS_STRING_GRID
         const size_t num_p2words = num_words - ADDR_GRID_SIZE;
         *actaddr2 = make_text_grid_activity(titlebuf, hdrbtns2, 2, ADDR_GRID_TOPPAD, ADDR_GRID_X, ADDR_GRID_Y,
-            remaining_words, num_p2words, &remaining_words);
+            remaining_words, num_p2words, ADDR_GRID_FONT, &remaining_words);
         JADE_ASSERT(remaining_words == address_words + words_len); // all words consumed (displayed)
 #else
         ret = snprintf(buf, sizeof(buf), "\n%s", address + MAX_DISPLAY_ADDRESS_LEN);

main/ui/dialogs.c

@@ -20,7 +20,7 @@ void update_menu_item(gui_view_node_t* node, const char* label, const char* valu
     gui_update_text(node, buf);
 }
 
-// Handles up to 5 splits, row or column.
+// Handles up to 7 splits, row or column.
 // layout == UI_ROW -> [ x | y | z ] items in a row -> an hsplit
 // layout == UI_COLUMN -> [ x / y / z ] items in a column -> a vsplit
 gui_view_node_t* make_even_split(const ui_button_layout_t layout, const uint8_t num_splits)
@@ -47,6 +47,12 @@ gui_view_node_t* make_even_split(const ui_button_layout_t layout, const uint8_t
     case 5:
         make_split(&split, GUI_SPLIT_RELATIVE, 5, 20, 20, 20, 20, 20);
         break;
+    case 6:
+        make_split(&split, GUI_SPLIT_RELATIVE, 6, 17, 16, 17, 17, 16, 17);
+        break;
+    case 7:
+        make_split(&split, GUI_SPLIT_RELATIVE, 7, 14, 15, 14, 14, 14, 15, 14);
+        break;
     default:
         JADE_ASSERT_MSG(false, "Unsupported split size");
     }
@@ -190,12 +196,12 @@ gui_view_node_t* add_title_bar(
     return vsplit;
 }
 
-// Helper to create an activity which is a grid of (up to 5x5) text items
+// Helper to create an activity which is a grid of (up to 7x7) text items
 // NOTE: the text is passed as one char large array containing embedded terminators
 // to delineate the separate texts - eg: ... , "abc\0def\0ghi\0j\0", 4)
 gui_activity_t* make_text_grid_activity(const char* title, btn_data_t* hdrbtns, const size_t num_hdrbtns,
     const size_t toppad, const uint8_t xcells, const uint8_t ycells, const char* texts, const size_t num_texts,
-    const char** remaining_texts)
+    const uint32_t font, const char** remaining_texts)
 {
     // Title and header are optional
     JADE_ASSERT(hdrbtns || !num_hdrbtns);
@@ -229,7 +235,8 @@ gui_activity_t* make_text_grid_activity(const char* title, btn_data_t* hdrbtns,
             const int itxt = (y * xcells) + x;
             if (itxt < num_texts) {
                 gui_view_node_t* node;
-                gui_make_text(&node, text_item, TFT_WHITE);
+                gui_make_text_font(&node, text_item, TFT_WHITE, font);
+                gui_set_align(node, GUI_ALIGN_LEFT, GUI_ALIGN_MIDDLE);
                 gui_set_parent(node, hsplit);
                 text_item += strlen(text_item) + 1;
             }