[FL-2150] Dolphin animation refactoring (#938)
* Dolphin Animation Refactoring, part 1 * Remove animations from desktop * Remove excess, first start * Split animation_manager with callbacks * allocate view inside animation_view * Work on ViewComposed * Draw white rectangles under bubble corners * Fix bubbles sequence * RPC: remove obsolete include "status.pb.h" * Add animations manifest decoding * Flipper file: add strict mode * FFF: Animation structures parsing * Assembling structure of animation * Lot of view fixes: Add multi-line bubbles Add support for passive bubbles (frame_order values starts from passive now) Add hard-coded delay (active_shift) for active state enabling Fix active state handling Fix leaks Fix parsing uncorrect bubble_animation meta file Fix bubble rules of showing * Animation load/unload & view freeze/unfreeze * Blocking & system animations, fixes: View correct activation Refactoring + blocking animation Freeze first passive/active frames Many insert/eject SD tests fixes Add system animations Add Loader events app started/finished Add system no_sd animation * Assets: dolphin packer. Scripts: minor refactoring. * Desktop: update logging tags. Scripts: add metadata to dolphin bundling process, extra sorting for fs traversing. Make: phony assets rules. * Github: rebuild assets on build * Docker: add missing dependencies for assets compilation * Docker: fix run command syntax * ReadMe: update naming rules with link to source * Assets: recompile icons * Loader: add loader event * Desktop, Gui, Furi Core: const shenanigans macros Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
@@ -7,17 +7,11 @@
|
||||
#include <furi.h>
|
||||
#include <storage/storage.h>
|
||||
#include <time.h>
|
||||
|
||||
typedef enum {
|
||||
DesktopDebugEventDeed,
|
||||
DesktopDebugEventWrongDeed,
|
||||
DesktopDebugEventSaveState,
|
||||
DesktopDebugEventExit,
|
||||
} DesktopDebugEvent;
|
||||
#include "desktop_events.h"
|
||||
|
||||
typedef struct DesktopDebugView DesktopDebugView;
|
||||
|
||||
typedef void (*DesktopDebugViewCallback)(DesktopDebugEvent event, void* context);
|
||||
typedef void (*DesktopDebugViewCallback)(DesktopEvent event, void* context);
|
||||
|
||||
// Debug info
|
||||
typedef enum {
|
||||
@@ -51,4 +45,4 @@ DesktopDebugView* desktop_debug_alloc();
|
||||
void desktop_debug_free(DesktopDebugView* debug_view);
|
||||
|
||||
void desktop_debug_get_dolphin_data(DesktopDebugView* debug_view);
|
||||
void desktop_debug_reset_screen_idx(DesktopDebugView* debug_view);
|
||||
void desktop_debug_reset_screen_idx(DesktopDebugView* debug_view);
|
||||
|
30
applications/desktop/views/desktop_events.h
Normal file
30
applications/desktop/views/desktop_events.h
Normal file
@@ -0,0 +1,30 @@
|
||||
#pragma once
|
||||
|
||||
typedef enum {
|
||||
DesktopMainEventOpenLockMenu,
|
||||
DesktopMainEventOpenArchive,
|
||||
DesktopMainEventOpenFavorite,
|
||||
DesktopMainEventOpenMenu,
|
||||
DesktopMainEventOpenDebug,
|
||||
DesktopMainEventUnlocked,
|
||||
DesktopMainEventRightShort,
|
||||
DesktopMainEventCheckAnimation,
|
||||
DesktopMainEventNewIdleAnimation,
|
||||
DesktopMainEventInteractAnimation,
|
||||
DesktopMainEventBeforeAppStarted,
|
||||
DesktopMainEventAfterAppFinished,
|
||||
DesktopLockedEventUnlock,
|
||||
DesktopLockedEventUpdate,
|
||||
DesktopLockedEventInputReset,
|
||||
DesktopLockedEventCheckAnimation,
|
||||
DesktopLockedEventMax,
|
||||
DesktopDebugEventDeed,
|
||||
DesktopDebugEventWrongDeed,
|
||||
DesktopDebugEventSaveState,
|
||||
DesktopDebugEventExit,
|
||||
DesktopFirstStartCompleted,
|
||||
DesktopFirstStartPoweroff,
|
||||
DesktopLockMenuEventLock,
|
||||
DesktopLockMenuEventPinLock,
|
||||
DesktopLockMenuEventExit,
|
||||
} DesktopEvent;
|
@@ -5,15 +5,11 @@
|
||||
#include <gui/canvas.h>
|
||||
#include <gui/elements.h>
|
||||
#include <furi.h>
|
||||
|
||||
typedef enum {
|
||||
DesktopFirstStartCompleted,
|
||||
DesktopFirstStartPoweroff,
|
||||
} DesktopFirstStartEvent;
|
||||
#include "desktop_events.h"
|
||||
|
||||
typedef struct DesktopFirstStartView DesktopFirstStartView;
|
||||
|
||||
typedef void (*DesktopFirstStartViewCallback)(DesktopFirstStartEvent event, void* context);
|
||||
typedef void (*DesktopFirstStartViewCallback)(DesktopEvent event, void* context);
|
||||
|
||||
DesktopFirstStartView* desktop_first_start_alloc();
|
||||
|
||||
|
@@ -5,18 +5,13 @@
|
||||
#include <gui/canvas.h>
|
||||
#include <gui/elements.h>
|
||||
#include <furi.h>
|
||||
#include "desktop_events.h"
|
||||
|
||||
#define HINT_TIMEOUT 2
|
||||
|
||||
typedef enum {
|
||||
DesktopLockMenuEventLock,
|
||||
DesktopLockMenuEventPinLock,
|
||||
DesktopLockMenuEventExit,
|
||||
} DesktopLockMenuEvent;
|
||||
|
||||
typedef struct DesktopLockMenuView DesktopLockMenuView;
|
||||
|
||||
typedef void (*DesktopLockMenuViewCallback)(DesktopLockMenuEvent event, void* context);
|
||||
typedef void (*DesktopLockMenuViewCallback)(DesktopEvent event, void* context);
|
||||
|
||||
struct DesktopLockMenuView {
|
||||
View* view;
|
||||
|
@@ -17,21 +17,6 @@ void locked_view_timer_callback(void* context) {
|
||||
locked_view->callback(DesktopLockedEventUpdate, locked_view->context);
|
||||
}
|
||||
|
||||
void desktop_locked_set_dolphin_animation(
|
||||
DesktopLockedView* locked_view,
|
||||
const Icon* icon,
|
||||
bool status_bar_background_black) {
|
||||
with_view_model(
|
||||
locked_view->view, (DesktopLockedViewModel * model) {
|
||||
if(model->animation) icon_animation_free(model->animation);
|
||||
model->animation = icon_animation_alloc(icon);
|
||||
view_tie_icon_animation(locked_view->view, model->animation);
|
||||
icon_animation_start(model->animation);
|
||||
model->status_bar_background_black = status_bar_background_black;
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
void desktop_locked_update_hint_timeout(DesktopLockedView* locked_view) {
|
||||
with_view_model(
|
||||
locked_view->view, (DesktopLockedViewModel * model) {
|
||||
@@ -95,7 +80,6 @@ void desktop_locked_with_pin(DesktopLockedView* locked_view, bool locked) {
|
||||
void desktop_locked_render(Canvas* canvas, void* model) {
|
||||
DesktopLockedViewModel* m = model;
|
||||
uint32_t now = osKernelGetTickCount();
|
||||
canvas_clear(canvas);
|
||||
canvas_set_color(canvas, ColorBlack);
|
||||
|
||||
if(!m->animation_seq_end) {
|
||||
|
@@ -5,6 +5,7 @@
|
||||
#include <gui/canvas.h>
|
||||
#include <gui/elements.h>
|
||||
#include <furi.h>
|
||||
#include "desktop_events.h"
|
||||
|
||||
#define UNLOCK_RST_TIMEOUT 300
|
||||
#define UNLOCK_CNT 2 // 3 actually
|
||||
@@ -14,12 +15,6 @@
|
||||
#define DOOR_R_POS 115
|
||||
#define DOOR_R_POS_MIN 60
|
||||
|
||||
typedef enum {
|
||||
DesktopLockedEventUnlock = 10U,
|
||||
DesktopLockedEventUpdate = 11U,
|
||||
DesktopLockedEventInputReset = 12U,
|
||||
} DesktopLockedEvent;
|
||||
|
||||
typedef enum {
|
||||
DesktopLockedWithPin,
|
||||
DesktopLockedNoPin,
|
||||
@@ -27,7 +22,7 @@ typedef enum {
|
||||
|
||||
typedef struct DesktopLockedView DesktopLockedView;
|
||||
|
||||
typedef void (*DesktopLockedViewCallback)(DesktopLockedEvent event, void* context);
|
||||
typedef void (*DesktopLockedViewCallback)(DesktopEvent event, void* context);
|
||||
|
||||
struct DesktopLockedView {
|
||||
View* view;
|
||||
@@ -57,10 +52,6 @@ void desktop_locked_set_callback(
|
||||
DesktopLockedViewCallback callback,
|
||||
void* context);
|
||||
|
||||
void desktop_locked_set_dolphin_animation(
|
||||
DesktopLockedView* locked_view,
|
||||
const Icon* icon,
|
||||
bool status_bar_background_black);
|
||||
void desktop_locked_update_hint_timeout(DesktopLockedView* locked_view);
|
||||
void desktop_locked_reset_counter(DesktopLockedView* locked_view);
|
||||
void desktop_locked_reset_door_pos(DesktopLockedView* locked_view);
|
||||
|
@@ -1,8 +1,13 @@
|
||||
#include "dolphin/dolphin.h"
|
||||
#include "furi/record.h"
|
||||
#include "gui/canvas.h"
|
||||
#include "gui/view.h"
|
||||
#include "gui/view_composed.h"
|
||||
#include "input/input.h"
|
||||
#include <furi.h>
|
||||
#include "../desktop_i.h"
|
||||
#include "desktop_main.h"
|
||||
//#include "../animations/views/bubble_animation_view.h"
|
||||
|
||||
void desktop_main_set_callback(
|
||||
DesktopMainView* main_view,
|
||||
@@ -49,7 +54,6 @@ void desktop_main_switch_dolphin_icon(DesktopMainView* main_view, const Icon* ic
|
||||
}
|
||||
|
||||
void desktop_main_render(Canvas* canvas, void* model) {
|
||||
canvas_clear(canvas);
|
||||
DesktopMainViewModel* m = model;
|
||||
uint32_t now = osKernelGetTickCount();
|
||||
|
||||
@@ -78,6 +82,7 @@ bool desktop_main_input(InputEvent* event, void* context) {
|
||||
furi_assert(context);
|
||||
|
||||
DesktopMainView* main_view = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event->key == InputKeyOk && event->type == InputTypeShort) {
|
||||
main_view->callback(DesktopMainEventOpenMenu, main_view->context);
|
||||
@@ -91,11 +96,13 @@ bool desktop_main_input(InputEvent* event, void* context) {
|
||||
main_view->callback(DesktopMainEventOpenFavorite, main_view->context);
|
||||
} else if(event->key == InputKeyRight && event->type == InputTypeShort) {
|
||||
main_view->callback(DesktopMainEventRightShort, main_view->context);
|
||||
} else if(event->key == InputKeyBack && event->type == InputTypeShort) {
|
||||
consumed = true;
|
||||
}
|
||||
|
||||
desktop_main_reset_hint(main_view);
|
||||
|
||||
return true;
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void desktop_main_enter(void* context) {
|
||||
@@ -119,6 +126,7 @@ void desktop_main_exit(void* context) {
|
||||
|
||||
DesktopMainView* desktop_main_alloc() {
|
||||
DesktopMainView* main_view = furi_alloc(sizeof(DesktopMainView));
|
||||
|
||||
main_view->view = view_alloc();
|
||||
view_allocate_model(main_view->view, ViewModelTypeLocking, sizeof(DesktopMainViewModel));
|
||||
view_set_context(main_view->view, main_view);
|
||||
|
@@ -1,26 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include "gui/view_composed.h"
|
||||
#include <gui/gui_i.h>
|
||||
#include <gui/view.h>
|
||||
#include <gui/canvas.h>
|
||||
#include <gui/elements.h>
|
||||
#include <furi.h>
|
||||
|
||||
typedef enum {
|
||||
DesktopMainEventOpenLockMenu,
|
||||
DesktopMainEventOpenArchive,
|
||||
DesktopMainEventOpenFavorite,
|
||||
DesktopMainEventOpenMenu,
|
||||
DesktopMainEventOpenDebug,
|
||||
DesktopMainEventUnlocked,
|
||||
DesktopMainEventRightShort,
|
||||
DesktopMainEventUpdateAnimation,
|
||||
DesktopMainEventUpdateOneShotAnimation,
|
||||
} DesktopMainEvent;
|
||||
#include "desktop_events.h"
|
||||
|
||||
typedef struct DesktopMainView DesktopMainView;
|
||||
|
||||
typedef void (*DesktopMainViewCallback)(DesktopMainEvent event, void* context);
|
||||
typedef void (*DesktopMainViewCallback)(DesktopEvent event, void* context);
|
||||
|
||||
struct DesktopMainView {
|
||||
View* view;
|
||||
|
Reference in New Issue
Block a user