diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 14e06cdf2..0808a3618 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -569,9 +569,6 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m static void animation_manager_switch_to_one_shot_view(AnimationManager* animation_manager) { furi_assert(animation_manager); furi_assert(!animation_manager->one_shot_view); - Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN); - DolphinStats stats = dolphin_stats(dolphin); - furi_record_close(RECORD_DOLPHIN); animation_manager->one_shot_view = one_shot_view_alloc(); one_shot_view_set_interact_callback( @@ -580,19 +577,8 @@ 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(XTREME_ASSETS()->is_nsfw) { - one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64); - } 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); - } - } + one_shot_view_start_animation( + animation_manager->one_shot_view, XTREME_ASSETS()->A_Levelup_128x64); } static void animation_manager_switch_to_animation_view(AnimationManager* animation_manager) { diff --git a/applications/settings/xtreme_settings/xtreme_assets.c b/applications/settings/xtreme_settings/xtreme_assets.c index 651e680bc..5ae22aab0 100644 --- a/applications/settings/xtreme_settings/xtreme_assets.c +++ b/applications/settings/xtreme_settings/xtreme_assets.c @@ -56,6 +56,7 @@ void XTREME_ASSETS_LOAD() { xtreme_assets = malloc(sizeof(XtremeAssets)); XtremeSettings* xtreme_settings = XTREME_SETTINGS(); + xtreme_assets->A_Levelup_128x64 = &A_Levelup_128x64; xtreme_assets->I_BLE_Pairing_128x64 = &I_BLE_Pairing_128x64; xtreme_assets->I_DolphinCommon_56x48 = &I_DolphinCommon_56x48; xtreme_assets->I_DolphinMafia_115x62 = &I_DolphinMafia_115x62; diff --git a/applications/settings/xtreme_settings/xtreme_assets.h b/applications/settings/xtreme_settings/xtreme_assets.h index 6a9b48dce..8fa5d1cde 100644 --- a/applications/settings/xtreme_settings/xtreme_assets.h +++ b/applications/settings/xtreme_settings/xtreme_assets.h @@ -8,6 +8,7 @@ typedef struct { bool is_nsfw; + const Icon* A_Levelup_128x64; const Icon* I_BLE_Pairing_128x64; const Icon* I_DolphinCommon_56x48; const Icon* I_DolphinMafia_115x62; diff --git a/assets/icons/Animations/Levelup1_128x64/frame_00.png b/assets/icons/Animations/Levelup1_128x64/frame_00.png deleted file mode 100644 index a6589b0c7..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_00.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_01.png b/assets/icons/Animations/Levelup1_128x64/frame_01.png deleted file mode 100644 index 95696370b..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_01.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_02.png b/assets/icons/Animations/Levelup1_128x64/frame_02.png deleted file mode 100644 index 19a5121a9..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_02.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_03.png b/assets/icons/Animations/Levelup1_128x64/frame_03.png deleted file mode 100644 index e4576c864..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_03.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_04.png b/assets/icons/Animations/Levelup1_128x64/frame_04.png deleted file mode 100644 index dc107d2e8..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_04.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_05.png b/assets/icons/Animations/Levelup1_128x64/frame_05.png deleted file mode 100644 index 146a708fa..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_05.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_06.png b/assets/icons/Animations/Levelup1_128x64/frame_06.png deleted file mode 100644 index 398f92da6..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_06.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_07.png b/assets/icons/Animations/Levelup1_128x64/frame_07.png deleted file mode 100644 index a7c826438..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_07.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_08.png b/assets/icons/Animations/Levelup1_128x64/frame_08.png deleted file mode 100644 index 79a86e03e..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_08.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_09.png b/assets/icons/Animations/Levelup1_128x64/frame_09.png deleted file mode 100644 index 28f45382c..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_09.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_10.png b/assets/icons/Animations/Levelup1_128x64/frame_10.png deleted file mode 100644 index e4576c864..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_10.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_11.png b/assets/icons/Animations/Levelup1_128x64/frame_11.png deleted file mode 100644 index dc107d2e8..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_11.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_12.png b/assets/icons/Animations/Levelup1_128x64/frame_12.png deleted file mode 100644 index 146a708fa..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_12.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_13.png b/assets/icons/Animations/Levelup1_128x64/frame_13.png deleted file mode 100644 index 398f92da6..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_13.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_14.png b/assets/icons/Animations/Levelup1_128x64/frame_14.png deleted file mode 100644 index a7c826438..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_14.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_15.png b/assets/icons/Animations/Levelup1_128x64/frame_15.png deleted file mode 100644 index 79a86e03e..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_15.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_16.png b/assets/icons/Animations/Levelup1_128x64/frame_16.png deleted file mode 100644 index 28f45382c..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_16.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_17.png b/assets/icons/Animations/Levelup1_128x64/frame_17.png deleted file mode 100644 index a6589b0c7..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_17.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_18.png b/assets/icons/Animations/Levelup1_128x64/frame_18.png deleted file mode 100644 index 95696370b..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_18.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_19.png b/assets/icons/Animations/Levelup1_128x64/frame_19.png deleted file mode 100644 index 19a5121a9..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_19.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_20.png b/assets/icons/Animations/Levelup1_128x64/frame_20.png deleted file mode 100644 index a6589b0c7..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_20.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_21.png b/assets/icons/Animations/Levelup1_128x64/frame_21.png deleted file mode 100644 index 95696370b..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_21.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_22.png b/assets/icons/Animations/Levelup1_128x64/frame_22.png deleted file mode 100644 index 19a5121a9..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_22.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_23.png b/assets/icons/Animations/Levelup1_128x64/frame_23.png deleted file mode 100644 index e4576c864..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_23.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_24.png b/assets/icons/Animations/Levelup1_128x64/frame_24.png deleted file mode 100644 index dc107d2e8..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_24.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_25.png b/assets/icons/Animations/Levelup1_128x64/frame_25.png deleted file mode 100644 index 146a708fa..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_25.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_26.png b/assets/icons/Animations/Levelup1_128x64/frame_26.png deleted file mode 100644 index 398f92da6..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_26.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_27.png b/assets/icons/Animations/Levelup1_128x64/frame_27.png deleted file mode 100644 index a7c826438..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_27.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_28.png b/assets/icons/Animations/Levelup1_128x64/frame_28.png deleted file mode 100644 index 79a86e03e..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_28.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_29.png b/assets/icons/Animations/Levelup1_128x64/frame_29.png deleted file mode 100644 index 28f45382c..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_29.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_30.png b/assets/icons/Animations/Levelup1_128x64/frame_30.png deleted file mode 100644 index e4576c864..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_30.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_31.png b/assets/icons/Animations/Levelup1_128x64/frame_31.png deleted file mode 100644 index 1fd028cff..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64/frame_31.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64/frame_rate b/assets/icons/Animations/Levelup1_128x64/frame_rate deleted file mode 100644 index c7930257d..000000000 --- a/assets/icons/Animations/Levelup1_128x64/frame_rate +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index bf97f8d6e..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_00.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png deleted file mode 100644 index 39c910d3a..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_01.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png deleted file mode 100644 index 4975adf86..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_02.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png deleted file mode 100644 index 5a05529c5..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_03.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png deleted file mode 100644 index e6c88df92..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_04.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png deleted file mode 100644 index e7bae4d6c..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_05.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png deleted file mode 100644 index 489bce368..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_06.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png deleted file mode 100644 index 32e864e98..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_07.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png deleted file mode 100644 index c692f4895..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_08.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png deleted file mode 100644 index fb1c8bb90..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_09.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png b/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png deleted file mode 100644 index 3b0205a48..000000000 Binary files a/assets/icons/Animations/Levelup1_128x64_sfw/frame_10.png and /dev/null differ diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate b/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate deleted file mode 100644 index 0cfbf0888..000000000 --- a/assets/icons/Animations/Levelup2_128x64_sfw/frame_rate +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_00.png b/assets/icons/Animations/Levelup_128x64/frame_00.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_00.png rename to assets/icons/Animations/Levelup_128x64/frame_00.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_01.png b/assets/icons/Animations/Levelup_128x64/frame_01.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_01.png rename to assets/icons/Animations/Levelup_128x64/frame_01.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_02.png b/assets/icons/Animations/Levelup_128x64/frame_02.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_02.png rename to assets/icons/Animations/Levelup_128x64/frame_02.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_03.png b/assets/icons/Animations/Levelup_128x64/frame_03.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_03.png rename to assets/icons/Animations/Levelup_128x64/frame_03.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_04.png b/assets/icons/Animations/Levelup_128x64/frame_04.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_04.png rename to assets/icons/Animations/Levelup_128x64/frame_04.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_05.png b/assets/icons/Animations/Levelup_128x64/frame_05.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_05.png rename to assets/icons/Animations/Levelup_128x64/frame_05.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_06.png b/assets/icons/Animations/Levelup_128x64/frame_06.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_06.png rename to assets/icons/Animations/Levelup_128x64/frame_06.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_07.png b/assets/icons/Animations/Levelup_128x64/frame_07.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_07.png rename to assets/icons/Animations/Levelup_128x64/frame_07.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_08.png b/assets/icons/Animations/Levelup_128x64/frame_08.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_08.png rename to assets/icons/Animations/Levelup_128x64/frame_08.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_09.png b/assets/icons/Animations/Levelup_128x64/frame_09.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_09.png rename to assets/icons/Animations/Levelup_128x64/frame_09.png diff --git a/assets/icons/Animations/Levelup2_128x64_sfw/frame_10.png b/assets/icons/Animations/Levelup_128x64/frame_10.png similarity index 100% rename from assets/icons/Animations/Levelup2_128x64_sfw/frame_10.png rename to assets/icons/Animations/Levelup_128x64/frame_10.png diff --git a/assets/icons/Animations/Levelup1_128x64_sfw/frame_rate b/assets/icons/Animations/Levelup_128x64/frame_rate similarity index 100% rename from assets/icons/Animations/Levelup1_128x64_sfw/frame_rate rename to assets/icons/Animations/Levelup_128x64/frame_rate