liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1549] Gui Widget module (#598)

Browse Source 
* gui_widget: rework with mlib container
* widget: rename gui_widget-> widget; gui_element->widget_element
* gui: move widget from nfc to gui/modules
* nfc: rework widget usage
* nfc: return to ReadEmvAppSuccess scene after ReadEmvDataSuccess exit

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-07-23 16:09:34 +03:00
committed by GitHub
parent ad421a81bc
commit 3f640e8f1c
18 changed files with 326 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/nfc/nfc.c Executable file → Normal file
View File

@@ -69,9 +69,8 @@ Nfc* nfc_alloc() {
string_init(nfc->text_box_store);
// Custom Widget
nfc->widget = gui_widget_alloc();
view_dispatcher_add_view(
nfc->view_dispatcher, NfcViewWidget, gui_widget_get_view(nfc->widget));
nfc->widget = widget_alloc();
view_dispatcher_add_view(nfc->view_dispatcher, NfcViewWidget, widget_get_view(nfc->widget));
// Bank Card
nfc->bank_card = bank_card_alloc();
@@ -111,7 +110,7 @@ void nfc_free(Nfc* nfc) {
// Custom Widget
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewWidget);
gui_widget_free(nfc->widget);
widget_free(nfc->widget);
// Bank Card
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewBankCard);