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

[FL-1448], [FL-1529] Introducing Scene Manager, NFC App refactoring and bug fixes (#575)

Browse Source 
* gui: refactore ViewNavigator -> SceneManager
* view_dispatcher: remove scene controller, add custom and navigation cb
* scene_manager: rework scene controller, move AppScene from lib
* nfc: rework nfc scenes with new scene controller API
* view_dispatcher: crash on free if not all views were freed
* nfc: introduce scene declaration
* scene_manager: allocate and configure application scenes
* nfc: rework nfc with new Scene Manager API
* scene_manager: remove dublicated scene handlers allocation
* nfc: rework nfc app with new scene manager API
* view_dispatcher: add tick event
* scene_manager: add tick event type and handler
* nfc: rework notifications with tick event
* scene_manager: remove scene id from scene structure
* scene_manager: rename array -> stack, add documentation
* api-hal-nfc: remove listen activation processing
* nfc_scene_start: shorter submenu call
* nfc: fix nfc file name
* nfc: fix Retry in mifare ul success read
* nfc_cli: fix read timeout in nfc_detect CLI command

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-07-12 21:56:14 +03:00
committed by GitHub
parent 5ae3d60101
commit 3571b58d0a
65 changed files with 753 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
applications/nfc/scenes/nfc_scene_set_sak.c
View File

@@ -1,11 +1,5 @@
#include <nfc/scenes/nfc_scene_set_sak.h>
#include <furi.h>
#include "../nfc_i.h"
#include <gui/view_dispatcher.h>
#define SCENE_SET_SAK_CUSTOM_EVENT (0UL)
void nfc_scene_set_sak_byte_input_callback(void* context) {
@@ -25,14 +19,14 @@ const void nfc_scene_set_sak_on_enter(void* context) {
view_dispatcher_switch_to_view(nfc->nfc_common.view_dispatcher, NfcViewByteInput);
}
const bool nfc_scene_set_sak_on_event(void* context, uint32_t event) {
const bool nfc_scene_set_sak_on_event(void* context, SceneManagerEvent event) {
Nfc* nfc = (Nfc*)context;
if(event == SCENE_SET_SAK_CUSTOM_EVENT) {
view_dispatcher_add_scene(nfc->nfc_common.view_dispatcher, nfc->scene_set_atqa);
view_dispatcher_send_navigation_event(
nfc->nfc_common.view_dispatcher, ViewNavigatorEventNext);
return true;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SCENE_SET_SAK_CUSTOM_EVENT) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneSetAtqua);
return true;
}
}
return false;
}
@@ -44,17 +38,3 @@ const void nfc_scene_set_sak_on_exit(void* context) {
byte_input_set_result_callback(nfc->byte_input, NULL, NULL, NULL, NULL, 0);
byte_input_set_header_text(nfc->byte_input, "");
}
AppScene* nfc_scene_set_sak_alloc() {
AppScene* scene = furi_alloc(sizeof(AppScene));
scene->id = NfcSceneSetSak;
scene->on_enter = nfc_scene_set_sak_on_enter;
scene->on_event = nfc_scene_set_sak_on_event;
scene->on_exit = nfc_scene_set_sak_on_exit;
return scene;
}
void nfc_scene_set_sak_free(AppScene* scene) {
free(scene);
}