diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 9fe415ca9..041ef2d11 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -13,6 +13,8 @@ #include "animation_storage.h" #include "animation_manager.h" +#include "../../../settings/desktop_settings/desktop_settings_app.h" + #define TAG "AnimationManager" #define HARDCODED_ANIMATION_NAME "thank_you_128x64" @@ -544,6 +546,8 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN); DolphinStats stats = dolphin_stats(dolphin); furi_record_close(RECORD_DOLPHIN); + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + DESKTOP_SETTINGS_LOAD(settings); animation_manager->one_shot_view = one_shot_view_alloc(); one_shot_view_set_interact_callback( @@ -552,13 +556,20 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio View* next_view = one_shot_view_get_view(animation_manager->one_shot_view); view_stack_remove_view(animation_manager->view_stack, prev_view); view_stack_add_view(animation_manager->view_stack, next_view); - if(stats.level <= 20) { + if (settings->sfw_mode) { one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64); - } else if(stats.level >= 21) { - one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup2_128x64); - } else { - furi_assert(0); + }else { + if (stats.level <= 20) { + one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64_sfw); + } + else if (stats.level >= 21) { + one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup2_128x64_sfw); + } + else { + furi_assert(0); + } } + free(settings); } static void animation_manager_switch_to_animation_view(AnimationManager* animation_manager) { diff --git a/assets/icons/Animations/Levelup1_128x64/frame_10.png b/assets/icons/Animations/Levelup1_128x64/frame_10.png index 1fd028cff..e4576c864 100644 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_10.png and b/assets/icons/Animations/Levelup1_128x64/frame_10.png differ diff --git a/assets/icons/Animations/Levelup2_128x64/frame_04.png b/assets/icons/Animations/Levelup1_128x64/frame_11.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_04.png rename to assets/icons/Animations/Levelup1_128x64/frame_11.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_05.png b/assets/icons/Animations/Levelup1_128x64/frame_12.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_05.png rename to assets/icons/Animations/Levelup1_128x64/frame_12.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_06.png b/assets/icons/Animations/Levelup1_128x64/frame_13.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_06.png rename to assets/icons/Animations/Levelup1_128x64/frame_13.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_07.png b/assets/icons/Animations/Levelup1_128x64/frame_14.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_07.png rename to assets/icons/Animations/Levelup1_128x64/frame_14.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_08.png b/assets/icons/Animations/Levelup1_128x64/frame_15.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_08.png rename to assets/icons/Animations/Levelup1_128x64/frame_15.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_09.png b/assets/icons/Animations/Levelup1_128x64/frame_16.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_09.png rename to assets/icons/Animations/Levelup1_128x64/frame_16.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_00.png b/assets/icons/Animations/Levelup1_128x64/frame_17.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_00.png rename to assets/icons/Animations/Levelup1_128x64/frame_17.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_01.png b/assets/icons/Animations/Levelup1_128x64/frame_18.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_01.png rename to assets/icons/Animations/Levelup1_128x64/frame_18.png diff --git a/assets/icons/Animations/Levelup2_128x64/frame_02.png b/assets/icons/Animations/Levelup1_128x64/frame_19.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_02.png rename to assets/icons/Animations/Levelup1_128x64/frame_19.png diff --git a/assets/icons/Animations/Levelup1_128x64/frame_20.png b/assets/icons/Animations/Levelup1_128x64/frame_20.png new file mode 100644 index 000000000..a6589b0c7 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_20.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_21.png b/assets/icons/Animations/Levelup1_128x64/frame_21.png new file mode 100644 index 000000000..95696370b Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_21.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_22.png b/assets/icons/Animations/Levelup1_128x64/frame_22.png new file mode 100644 index 000000000..19a5121a9 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_22.png differ diff --git a/assets/icons/Animations/Levelup2_128x64/frame_03.png b/assets/icons/Animations/Levelup1_128x64/frame_23.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_03.png rename to assets/icons/Animations/Levelup1_128x64/frame_23.png diff --git a/assets/icons/Animations/Levelup1_128x64/frame_24.png b/assets/icons/Animations/Levelup1_128x64/frame_24.png new file mode 100644 index 000000000..dc107d2e8 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_24.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_25.png b/assets/icons/Animations/Levelup1_128x64/frame_25.png new file mode 100644 index 000000000..146a708fa Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_25.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_26.png b/assets/icons/Animations/Levelup1_128x64/frame_26.png new file mode 100644 index 000000000..398f92da6 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_26.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_27.png b/assets/icons/Animations/Levelup1_128x64/frame_27.png new file mode 100644 index 000000000..a7c826438 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_27.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_28.png b/assets/icons/Animations/Levelup1_128x64/frame_28.png new file mode 100644 index 000000000..79a86e03e Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_28.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_29.png b/assets/icons/Animations/Levelup1_128x64/frame_29.png new file mode 100644 index 000000000..28f45382c Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_29.png differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_30.png b/assets/icons/Animations/Levelup1_128x64/frame_30.png new file mode 100644 index 000000000..e4576c864 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64/frame_30.png differ diff --git a/assets/icons/Animations/Levelup2_128x64/frame_10.png b/assets/icons/Animations/Levelup1_128x64/frame_31.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_10.png rename to assets/icons/Animations/Levelup1_128x64/frame_31.png diff --git a/assets/icons/Animations/Levelup1_128x64/frame_rate b/assets/icons/Animations/Levelup1_128x64/frame_rate index 0cfbf0888..c7930257d 100644 --- a/assets/icons/Animations/Levelup1_128x64/frame_rate +++ b/assets/icons/Animations/Levelup1_128x64/frame_rate @@ -1 +1 @@ -2 +7 \ No newline at end of file diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_00.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_00.png new file mode 100644 index 000000000..bf97f8d6e Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_00.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png new file mode 100644 index 000000000..39c910d3a Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png new file mode 100644 index 000000000..4975adf86 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png new file mode 100644 index 000000000..5a05529c5 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png new file mode 100644 index 000000000..e6c88df92 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png new file mode 100644 index 000000000..e7bae4d6c Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png new file mode 100644 index 000000000..489bce368 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png new file mode 100644 index 000000000..32e864e98 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png new file mode 100644 index 000000000..c692f4895 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png new file mode 100644 index 000000000..fb1c8bb90 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png new file mode 100644 index 000000000..3b0205a48 Binary files /dev/null and b/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png differ diff --git a/assets/icons/Animations/Levelup2_128x64/frame_rate b/assets/icons/Animations/Levelup1_128x64_sfw/frame_rate similarity index 100% rename from assets/icons/Animations/Levelup2_128x64/frame_rate rename to assets/icons/Animations/Levelup1_128x64_sfw/frame_rate diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_00.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_00.png new file mode 100644 index 000000000..77b531076 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_00.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_01.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_01.png new file mode 100644 index 000000000..b53437265 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_01.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_02.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_02.png new file mode 100644 index 000000000..9623af7d8 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_02.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_03.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_03.png new file mode 100644 index 000000000..f18269019 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_03.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_04.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_04.png new file mode 100644 index 000000000..677a3367e Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_04.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_05.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_05.png new file mode 100644 index 000000000..fb58fed1e Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_05.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_06.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_06.png new file mode 100644 index 000000000..b2cbd699b Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_06.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_07.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_07.png new file mode 100644 index 000000000..4f3dfc8c4 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_07.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_08.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_08.png new file mode 100644 index 000000000..3a5a28805 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_08.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_09.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_09.png new file mode 100644 index 000000000..76267a2a8 Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_09.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_10.png b/assets/icons/Animations/Levelup2_128x64_sfw/frame_10.png new file mode 100644 index 000000000..bda1bf44c Binary files /dev/null and b/assets/icons/Animations/Levelup2_128x64_sfw/frame_10.png differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate b/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate @@ -0,0 +1 @@ +2