Fix minor UI inconsistencies and bugs (#2361)
* 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:
@@ -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) {
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user