Skip to content

Commit 276d34b

Browse files
Jamie C. Driverjgriffiths
authored andcommitted
ui: rearrange text on legal page for Japan compliance
1 parent be5c573 commit 276d34b

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

main/fonts/jade_symbols_16x16.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef AMALGAMATED_BUILD
2-
const unsigned char jade_symbols_16x16[4 + 32 * 31] = {
2+
const unsigned char jade_symbols_16x16[4 + 32 * 32] = {
33
0x10, 0x10, 0x30, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xC0, 0x0F, 0xC0,
44
0x0F, 0xC0, 0x0F, 0xC0, 0x0F, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
55
0x00, // 0 Battery empty
@@ -63,5 +63,7 @@ const unsigned char jade_symbols_16x16[4 + 32 * 31] = {
6363
0x0C, 0x18, 0x18, 0x5C, 0x38, 0x0F, 0xF0, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, // M Hollow Circle
6464
0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x0F, 0xF0, 0x1C, 0x38, 0x19, 0x98, 0x31, 0x8C, 0x37, 0x8C, 0x37, 0x8C, 0x30,
6565
0x0C, 0x18, 0x18, 0x5C, 0x38, 0x0F, 0xF0, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, // N Clock
66+
0x7F, 0xFE, 0x40, 0x02, 0x5F, 0xE2, 0x5F, 0xF2, 0x58, 0x1A, 0x58, 0x1A, 0x58, 0x1A, 0x5F, 0xF2, 0x5F, 0xE2, 0x59,
67+
0xC2, 0x58, 0xE2, 0x58, 0x72, 0x58, 0x3A, 0x58, 0x1A, 0x40, 0x02, 0x7F, 0xFE, // O Japan Cert "R"
6668
};
6769
#endif // AMALGAMATED_BUILD

main/ui/dashboard.c

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -749,18 +749,25 @@ static void make_legal_page(link_activity_t* page_act, int legal_page)
749749
}
750750
#if defined(CONFIG_BOARD_TYPE_JADE_V1_1) || defined(CONFIG_BOARD_TYPE_JADE_V2)
751751
case 6: {
752-
gui_view_node_t* vsplit;
753-
gui_make_vsplit(&vsplit, GUI_SPLIT_RELATIVE, 2, 80, 20);
754-
gui_set_parent(vsplit, parent);
752+
gui_view_node_t* hsplit;
753+
gui_make_hsplit(&hsplit, GUI_SPLIT_RELATIVE, 3, 36, 10, 54);
754+
gui_set_parent(hsplit, parent);
755755

756756
Picture* const pic = get_picture(telecstart, telecend);
757757
gui_make_picture(&node, pic);
758-
gui_set_parent(node, vsplit);
759-
gui_set_align(node, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
758+
gui_set_parent(node, hsplit);
759+
gui_set_align(node, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
760+
gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 8, 0, 0);
761+
762+
gui_make_text_font(&node, "O", TFT_WHITE, JADE_SYMBOLS_16x16_FONT);
763+
gui_set_parent(node, hsplit);
764+
gui_set_align(node, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
765+
gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 4, 2, 0);
760766

761767
gui_make_text(&node, "211-210802", TFT_WHITE);
762-
gui_set_parent(node, vsplit);
763-
gui_set_align(node, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
768+
gui_set_parent(node, hsplit);
769+
gui_set_align(node, GUI_ALIGN_LEFT, GUI_ALIGN_MIDDLE);
770+
gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 0, 0, 4);
764771
break;
765772
}
766773
#endif

0 commit comments

Comments
 (0)