DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-11-29 22:49:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'RebornedBrain/reborned/scene_freeze' into dev

Browse Source
This commit is contained in:
MX 2024-10-05 04:47:24 +03:00
commit 6b9d5d786b
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
View File

@ -559,6 +559,7 @@ static void nfc_protocol_support_scene_save_name_on_exit(NfcApp* instance) {
*/ */
enum { enum {
NfcSceneEmulateStateWidget, /**< Widget view is displayed. */ NfcSceneEmulateStateWidget, /**< Widget view is displayed. */
NfcSceneEmulateStateWidgetLog, /**< Widget view with Log button is displayed */
NfcSceneEmulateStateTextBox, /**< TextBox view is displayed. */ NfcSceneEmulateStateTextBox, /**< TextBox view is displayed. */
}; };
@ -637,12 +638,14 @@ static bool
"Log", "Log",
nfc_protocol_support_common_widget_callback, nfc_protocol_support_common_widget_callback,
instance); instance);
scene_manager_set_scene_state(
instance->scene_manager, NfcSceneEmulate, NfcSceneEmulateStateWidgetLog);
} }
// Update TextBox data // Update TextBox data
text_box_set_text(instance->text_box, furi_string_get_cstr(instance->text_box_store)); text_box_set_text(instance->text_box, furi_string_get_cstr(instance->text_box_store));
consumed = true; consumed = true;
} else if(event.event == GuiButtonTypeCenter) { } else if(event.event == GuiButtonTypeCenter) {
if(state == NfcSceneEmulateStateWidget) { if(state == NfcSceneEmulateStateWidgetLog) {
view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewTextBox); view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewTextBox);
scene_manager_set_scene_state( scene_manager_set_scene_state(
instance->scene_manager, NfcSceneEmulate, NfcSceneEmulateStateTextBox); instance->scene_manager, NfcSceneEmulate, NfcSceneEmulateStateTextBox);
@ -653,7 +656,7 @@ static bool
if(state == NfcSceneEmulateStateTextBox) { if(state == NfcSceneEmulateStateTextBox) {
view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewWidget); view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewWidget);
scene_manager_set_scene_state( scene_manager_set_scene_state(
instance->scene_manager, NfcSceneEmulate, NfcSceneEmulateStateWidget); instance->scene_manager, NfcSceneEmulate, NfcSceneEmulateStateWidgetLog);
consumed = true; consumed = true;
} }
} }