Desktop settings menu code cleanup

This commit is contained in:
Willy-JL
2023-06-27 18:03:06 +02:00
parent 4e6e8ece07
commit 1c0daf5d5d
@@ -7,7 +7,6 @@
#define SCENE_EVENT_SELECT_FAVORITE_PRIMARY 0
#define SCENE_EVENT_SELECT_FAVORITE_SECONDARY 1
// #define SCENE_EVENT_SELECT_FAVORITE_GAME 2
#define SCENE_EVENT_SELECT_PIN_SETUP 2
#define SCENE_EVENT_SELECT_AUTO_LOCK_DELAY 3
#define SCENE_EVENT_SELECT_AUTO_LOCK_PIN 4
@@ -76,8 +75,6 @@ void desktop_settings_scene_start_on_enter(void* context) {
variable_item_list_add(variable_item_list, "Secondary Fav App (Down)", 1, NULL, NULL);
// variable_item_list_add(variable_item_list, "Favorite Game", 1, NULL, NULL);
variable_item_list_add(variable_item_list, "PIN Setup", 1, NULL, NULL);
item = variable_item_list_add(
@@ -120,29 +117,22 @@ void desktop_settings_scene_start_on_enter(void* context) {
view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewVarItemList);
}
bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent sme) {
bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
DesktopSettingsApp* app = context;
bool consumed = false;
if(sme.type == SceneManagerEventTypeCustom) {
switch(sme.event) {
if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) {
case SCENE_EVENT_SELECT_FAVORITE_PRIMARY:
scene_manager_set_scene_state(
app->scene_manager, DesktopSettingsAppSceneFavorite, true);
scene_manager_set_scene_state(app->scene_manager, DesktopSettingsAppSceneFavorite, 1);
scene_manager_next_scene(app->scene_manager, DesktopSettingsAppSceneFavorite);
consumed = true;
break;
case SCENE_EVENT_SELECT_FAVORITE_SECONDARY:
scene_manager_set_scene_state(
app->scene_manager, DesktopSettingsAppSceneFavorite, false);
scene_manager_set_scene_state(app->scene_manager, DesktopSettingsAppSceneFavorite, 0);
scene_manager_next_scene(app->scene_manager, DesktopSettingsAppSceneFavorite);
consumed = true;
break;
// case SCENE_EVENT_SELECT_FAVORITE_GAME:
// scene_manager_set_scene_state(app->scene_manager, DesktopSettingsAppSceneFavorite, 2);
// scene_manager_next_scene(app->scene_manager, DesktopSettingsAppSceneFavorite);
// consumed = true;
// break;
case SCENE_EVENT_SELECT_PIN_SETUP:
scene_manager_next_scene(app->scene_manager, DesktopSettingsAppScenePinMenu);
consumed = true;
@@ -162,9 +152,4 @@ void desktop_settings_scene_start_on_exit(void* context) {
DesktopSettingsApp* app = context;
variable_item_list_reset(app->variable_item_list);
DESKTOP_SETTINGS_SAVE(&app->settings);
// Trigger UI update in case we changed battery layout
Power* power = furi_record_open(RECORD_POWER);
power_trigger_ui_update(power);
furi_record_close(RECORD_POWER);
}