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

Fix minor UI inconsistencies and bugs (#2361)

Browse Source 
* Changed blue LED to cyan in NFC Magic and Picopass apps.
* Fix capitalization of ATQA and UID in NFC Add Manually wizard.
* Fix reselection of "Saved" menu item in NFC and RFID apps.
* Fix double back press after deleting a file in the SubGhz browser.
* Make NFC app behave like other apps: return to the file browser after deleting a file.
* Rename NfcSceneSetAtqua to NfcSceneSetAtqa.
* Save selected menu items in NFC Magic and Picopass apps in a way that always works.
* Restore previous selection in Universal Remotes menu.
* Other way to do universal remote menu saving, and NFC Extra Actions saves last selection.

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Liam Hays
2023-02-08 01:08:50 -07:00
committed by GitHub
parent 7a3a1aaf0d
commit 111c7557b3
14 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/plugins/nfc_magic/nfc_magic.c
View File

@@ -136,9 +136,9 @@ void nfc_magic_free(NfcMagic* nfc_magic) {
free(nfc_magic);
}
static const NotificationSequence nfc_magic_sequence_blink_start_blue = {
static const NotificationSequence nfc_magic_sequence_blink_start_cyan = {
&message_blink_start_10,
&message_blink_set_color_blue,
&message_blink_set_color_cyan,
&message_do_not_reset,
NULL,
};
@@ -149,7 +149,7 @@ static const NotificationSequence nfc_magic_sequence_blink_stop = {
};
void nfc_magic_blink_start(NfcMagic* nfc_magic) {
notification_message(nfc_magic->notifications, &nfc_magic_sequence_blink_start_blue);
notification_message(nfc_magic->notifications, &nfc_magic_sequence_blink_start_cyan);
}
void nfc_magic_blink_stop(NfcMagic* nfc_magic) {

10
applications/plugins/nfc_magic/scenes/nfc_magic_scene_start.c
View File

@@ -40,16 +40,24 @@ bool nfc_magic_scene_start_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubmenuIndexCheck) {
scene_manager_set_scene_state(
nfc_magic->scene_manager, NfcMagicSceneStart, SubmenuIndexCheck);
scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneCheck);
consumed = true;
} else if(event.event == SubmenuIndexWriteGen1A) {
// Explicitly save state in each branch so that the
// correct option is reselected if the user cancels
// loading a file.
scene_manager_set_scene_state(
nfc_magic->scene_manager, NfcMagicSceneStart, SubmenuIndexWriteGen1A);
scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneFileSelect);
consumed = true;
} else if(event.event == SubmenuIndexWipe) {
scene_manager_set_scene_state(
nfc_magic->scene_manager, NfcMagicSceneStart, SubmenuIndexWipe);
scene_manager_next_scene(nfc_magic->scene_manager, NfcMagicSceneWipe);
consumed = true;
}
scene_manager_set_scene_state(nfc_magic->scene_manager, NfcMagicSceneStart, event.event);
}
return consumed;

6
applications/plugins/picopass/picopass.c
View File

@@ -137,9 +137,9 @@ void picopass_text_store_clear(Picopass* picopass) {
memset(picopass->text_store, 0, sizeof(picopass->text_store));
}
static const NotificationSequence picopass_sequence_blink_start_blue = {
static const NotificationSequence picopass_sequence_blink_start_cyan = {
&message_blink_start_10,
&message_blink_set_color_blue,
&message_blink_set_color_cyan,
&message_do_not_reset,
NULL,
};
@@ -150,7 +150,7 @@ static const NotificationSequence picopass_sequence_blink_stop = {
};
void picopass_blink_start(Picopass* picopass) {
notification_message(picopass->notifications, &picopass_sequence_blink_start_blue);
notification_message(picopass->notifications, &picopass_sequence_blink_start_cyan);
}
void picopass_blink_stop(Picopass* picopass) {

7
applications/plugins/picopass/scenes/picopass_scene_start.c
View File

@@ -32,13 +32,18 @@ bool picopass_scene_start_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubmenuIndexRead) {
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneStart, SubmenuIndexRead);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneReadCard);
consumed = true;
} else if(event.event == SubmenuIndexSaved) {
// Explicitly save state so that the correct item is
// reselected if the user cancels loading a file.
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneStart, SubmenuIndexSaved);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneFileSelect);
consumed = true;
}
scene_manager_set_scene_state(picopass->scene_manager, PicopassSceneStart, event.event);
}
return consumed;