mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-16 04:24:45 -07:00
Ddesktop service and events cleanup
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
#include <input/input.h>
|
||||
#include <stdint.h>
|
||||
#include <core/dangerous_defines.h>
|
||||
#include <loader/loader.h>
|
||||
|
||||
#define ACTIVE_SHIFT 2
|
||||
|
||||
@@ -129,15 +128,11 @@ static bool bubble_animation_input_callback(InputEvent* event, void* context) {
|
||||
|
||||
if(event->key == InputKeyRight) {
|
||||
/* Right button reserved for animation activation, so consume */
|
||||
consumed = true;
|
||||
if(event->type == InputTypeShort) {
|
||||
if(animation_view->interact_callback) {
|
||||
consumed = true;
|
||||
animation_view->interact_callback(animation_view->interact_callback_context);
|
||||
}
|
||||
} else if(event->type == InputTypeLong) {
|
||||
Loader* loader = furi_record_open(RECORD_LOADER);
|
||||
loader_start(loader, "Power", "about_battery", NULL);
|
||||
furi_record_close(RECORD_LOADER);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <gui/view.h>
|
||||
#include <gui/icon_i.h>
|
||||
#include <stdint.h>
|
||||
#include <loader/loader.h>
|
||||
|
||||
typedef void (*OneShotInteractCallback)(void*);
|
||||
|
||||
@@ -66,15 +65,11 @@ static bool one_shot_view_input(InputEvent* event, void* context) {
|
||||
if(!consumed) {
|
||||
if(event->key == InputKeyRight) {
|
||||
/* Right button reserved for animation activation, so consume */
|
||||
consumed = true;
|
||||
if(event->type == InputTypeShort) {
|
||||
if(view->interact_callback) {
|
||||
consumed = true;
|
||||
view->interact_callback(view->interact_callback_context);
|
||||
}
|
||||
} else if(event->type == InputTypeLong) {
|
||||
Loader* loader = furi_record_open(RECORD_LOADER);
|
||||
loader_start(loader, "Power", "about_battery", NULL);
|
||||
furi_record_close(RECORD_LOADER);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user