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

[FL-1489] IRDA: move to FileWorker (#594)

Browse Source 
* [FL-1489] IRDA: move to FileWorker, fixes

* Use FileWorker
* Use file_select to select remotes
* Fix some crashes
* Add RAW parsing restrictions
* Remove excess scene (LearnDoneAfter)
* Move all file system logic to standalone object
This commit is contained in:
Albert Kharisov
2021-07-22 03:07:00 +03:00
committed by GitHub
parent b886ae17b6
commit 769ab2aef2
25 changed files with 591 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
applications/irda/scene/irda-app-scene-remote-list.cpp
View File

@@ -1,75 +1,30 @@
#include "../irda-app.hpp"
typedef enum {
SubmenuIndexPlus = -1,
} SubmenuIndex;
static void submenu_callback(void* context, uint32_t index) {
IrdaApp* app = static_cast<IrdaApp*>(context);
IrdaAppEvent event;
event.type = IrdaAppEvent::Type::MenuSelected;
event.payload.menu_index = index;
app->get_view_manager()->send_event(&event);
}
#include "irda/irda-app-event.hpp"
void IrdaAppSceneRemoteList::on_enter(IrdaApp* app) {
IrdaAppViewManager* view_manager = app->get_view_manager();
Submenu* submenu = view_manager->get_submenu();
IrdaAppFileParser file_parser;
bool success = false;
auto remote_manager = app->get_remote_manager();
int i = 0;
auto last_selected_remote = remote_manager->get_remote_name();
auto selected_file = file_parser.file_select(
last_selected_remote.size() ? last_selected_remote.c_str() : nullptr);
if(!selected_file.empty()) {
if(remote_manager->load(selected_file)) {
app->switch_to_next_scene(IrdaApp::Scene::Remote);
success = true;
}
}
bool result = remote_manager->get_remote_list(remote_names);
if(!result) {
if(!success) {
app->switch_to_previous_scene();
return;
}
for(auto& name : remote_names) {
submenu_add_item(submenu, name.c_str(), i++, submenu_callback, app);
}
submenu_add_item(
submenu, " +", SubmenuIndexPlus, submenu_callback, app);
if((SubmenuIndex)submenu_item_selected == SubmenuIndexPlus) {
submenu_set_selected_item(submenu, submenu_item_selected);
} else {
int remote_index = remote_manager->find_remote_name(remote_names);
submenu_set_selected_item(submenu, (remote_index >= 0) ? remote_index : 0);
}
submenu_item_selected = 0;
view_manager->switch_to(IrdaAppViewManager::ViewType::Submenu);
}
bool IrdaAppSceneRemoteList::on_event(IrdaApp* app, IrdaAppEvent* event) {
bool consumed = false;
if(event->type == IrdaAppEvent::Type::MenuSelected) {
switch(event->payload.menu_index) {
case SubmenuIndexPlus:
app->set_learn_new_remote(true);
app->switch_to_next_scene(IrdaApp::Scene::Learn);
submenu_item_selected = event->payload.menu_index;
break;
default:
auto remote_manager = app->get_remote_manager();
bool result = remote_manager->load(remote_names.at(event->payload.menu_index));
if(result) {
app->switch_to_next_scene(IrdaApp::Scene::Remote);
}
consumed = true;
break;
}
}
return consumed;
}
void IrdaAppSceneRemoteList::on_exit(IrdaApp* app) {
IrdaAppViewManager* view_manager = app->get_view_manager();
Submenu* submenu = view_manager->get_submenu();
submenu_clean(submenu);
}