Skip to content

Commit

Permalink
Update NBGL documentation (Layout layer)
Browse files Browse the repository at this point in the history
  • Loading branch information
nroggeman-ledger committed May 22, 2024
1 parent 25f141f commit f26446d
Show file tree
Hide file tree
Showing 24 changed files with 123 additions and 128 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ TARGET ?= stax
NBGL_DEFINES_stax := \
HAVE_SE_TOUCH \
NBGL_PAGE \
NBGL_QRCODE
NBGL_QRCODE \
SCREEN_SIZE_WALLET

NBGL_DEFINES_nano := \
NBGL_STEP \
NBGL_FLOW
NBGL_FLOW \
SCREEN_SIZE_NANO

NBGL_DEFINES := $(NBGL_DEFINES_$(TARGET))

Expand Down
237 changes: 116 additions & 121 deletions lib_nbgl/doc/nbgl_layout.dox

Large diffs are not rendered by default.

Binary file modified lib_nbgl/doc/resources/keyboard-usages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib_nbgl/doc/resources/keypad-usages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed lib_nbgl/doc/resources/layout1.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout10.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout11.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout12.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout13.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout15.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout6.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout8.png
Binary file not shown.
Binary file removed lib_nbgl/doc/resources/layout9.png
Binary file not shown.
Binary file modified lib_nbgl/doc/resources/layout_choice_buttons1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib_nbgl/doc/resources/stax_layout9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions lib_nbgl/src/nbgl_fonts.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,6 @@ uint16_t nbgl_getSingleLineTextWidthInLen(nbgl_font_id_e fontId, const char *tex
*
* @param fontId font ID
* @param text text in UTF8
* @param nb_lines_ptr pointer to a variable that will contain the number of lines used (or NULL if
* we don't care)
* @return the width in pixels of the text
*/
uint16_t nbgl_getTextWidth(nbgl_font_id_e fontId, const char *text)
Expand Down Expand Up @@ -1124,7 +1122,7 @@ void nbgl_textWrapOnNbLines(nbgl_font_id_e fontId, char *text, uint16_t maxWidth
* @note the number of line must be odd
*
* @param fontId font ID
* @param text (input) ASCII string, must be single line
* @param origText (input) ASCII string, must be single line
* @param maxWidth maximum width in pixels
* @param nbLines (input) number of lines to reduce the text to. The middle of the text is replaced
* by ...
Expand Down
2 changes: 1 addition & 1 deletion lib_nbgl/src/nbgl_layout_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ int nbgl_layoutUpdateKeypad(nbgl_layout_t *layout,
* @brief Adds a placeholder for hidden digits on top of a keypad, to represent the entered digits,
* as full circles The placeholder is "underligned" with a thin horizontal line of the expected full
* length
* @deprecated Use @ref nbgl_layouAddKeypadContent instead
* @deprecated Use @ref nbgl_layoutAddKeypadContent instead
*
* @note It must be the last added object, after potential back key, title, and keypad. Vertical
* positions of title and hidden digits will be computed here
Expand Down
2 changes: 1 addition & 1 deletion lib_nbgl/src/nbgl_step.c
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ nbgl_step_t nbgl_stepDrawText(nbgl_stepPosition_t pos,
* @param pos position of this step in the flow (first, last, single, not_first_nor_last)
* @param onActionCallback common callback for all actions on this page
* @param ticker ticker configuration, set to NULL to disable it
* @param info all information about the cenetered info to be displayed
* @param info all information about the centered info to be displayed
* @param modal if true, means this step shall be displayed on top of existing one
* @return the step context (or NULL if error)
*/
Expand Down

0 comments on commit f26446d

Please sign in to comment.