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

[FL-2403] Changed (Name and save) buttons name (#1094)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Dmitry Pavlov 2022-04-06 21:34:51 +03:00 committed by GitHub
parent b43dcbd74f
commit 321f36d113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/ibutton/scene/ibutton_scene_readed_key_menu.cpp
View File

@ -4,7 +4,7 @@
typedef enum { typedef enum {
SubmenuIndexWrite, SubmenuIndexWrite,
SubmenuIndexEmulate, SubmenuIndexEmulate,
SubmenuIndexNameAndSave, SubmenuIndexSave,
SubmenuIndexReadNewKey, SubmenuIndexReadNewKey,
} SubmenuIndex; } SubmenuIndex;
@ -26,7 +26,7 @@ void iButtonSceneReadedKeyMenu::on_enter(iButtonApp* app) {
if(ibutton_key_get_type(app->get_key()) == iButtonKeyDS1990) { if(ibutton_key_get_type(app->get_key()) == iButtonKeyDS1990) {
submenu_add_item(submenu, "Write", SubmenuIndexWrite, submenu_callback, app); submenu_add_item(submenu, "Write", SubmenuIndexWrite, submenu_callback, app);
} }
submenu_add_item(submenu, "Name and save", SubmenuIndexNameAndSave, submenu_callback, app); submenu_add_item(submenu, "Save", SubmenuIndexSave, submenu_callback, app);
submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app); submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app);
submenu_add_item(submenu, "Read new key", SubmenuIndexReadNewKey, submenu_callback, app); submenu_add_item(submenu, "Read new key", SubmenuIndexReadNewKey, submenu_callback, app);
submenu_set_selected_item(submenu, submenu_item_selected); submenu_set_selected_item(submenu, submenu_item_selected);
@ -46,7 +46,7 @@ bool iButtonSceneReadedKeyMenu::on_event(iButtonApp* app, iButtonEvent* event) {
case SubmenuIndexEmulate: case SubmenuIndexEmulate:
app->switch_to_next_scene(iButtonApp::Scene::SceneEmulate); app->switch_to_next_scene(iButtonApp::Scene::SceneEmulate);
break; break;
case SubmenuIndexNameAndSave: case SubmenuIndexSave:
app->switch_to_next_scene(iButtonApp::Scene::SceneSaveName); app->switch_to_next_scene(iButtonApp::Scene::SceneSaveName);
break; break;
case SubmenuIndexReadNewKey: case SubmenuIndexReadNewKey:

6
applications/lfrfid/scene/lfrfid_app_scene_readed_menu.cpp
View File

@ -2,7 +2,7 @@
typedef enum { typedef enum {
SubmenuWrite, SubmenuWrite,
SubmenuNameAndSave, SubmenuSave,
SubmenuEmulate, SubmenuEmulate,
} SubmenuIndex; } SubmenuIndex;
@ -10,7 +10,7 @@ void LfRfidAppSceneReadedMenu::on_enter(LfRfidApp* app, bool need_restore) {
auto submenu = app->view_controller.get<SubmenuVM>(); auto submenu = app->view_controller.get<SubmenuVM>();
submenu->add_item("Write", SubmenuWrite, submenu_callback, app); submenu->add_item("Write", SubmenuWrite, submenu_callback, app);
submenu->add_item("Name and Save", SubmenuNameAndSave, submenu_callback, app); submenu->add_item("Save", SubmenuSave, submenu_callback, app);
submenu->add_item("Emulate", SubmenuEmulate, submenu_callback, app); submenu->add_item("Emulate", SubmenuEmulate, submenu_callback, app);
if(need_restore) { if(need_restore) {
@ -29,7 +29,7 @@ bool LfRfidAppSceneReadedMenu::on_event(LfRfidApp* app, LfRfidApp::Event* event)
case SubmenuWrite: case SubmenuWrite:
app->scene_controller.switch_to_next_scene(LfRfidApp::SceneType::Write); app->scene_controller.switch_to_next_scene(LfRfidApp::SceneType::Write);
break; break;
case SubmenuNameAndSave: case SubmenuSave:
app->scene_controller.switch_to_next_scene(LfRfidApp::SceneType::SaveName); app->scene_controller.switch_to_next_scene(LfRfidApp::SceneType::SaveName);
break; break;
case SubmenuEmulate: case SubmenuEmulate: