From efe6dbf008a0005d11337e3339cbede547a58651 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 9 May 2023 18:11:05 +0100 Subject: [PATCH] Revert "Formatting" This reverts commit a441feec83d3482633640eae3829e0d13861465e. --- .../desktop/animations/animation_manager.c | 28 ++++++------------ .../desktop/animations/animation_storage.c | 17 +++++------ .../desktop/animations/animation_storage.h | 2 +- .../external/L3_Sunflower_128x64/frame_0.png | Bin 585 -> 0 bytes .../external/L3_Sunflower_128x64/frame_1.png | Bin 4838 -> 0 bytes .../external/L3_Sunflower_128x64/frame_2.png | Bin 5016 -> 0 bytes .../external/L3_Sunflower_128x64/frame_3.png | Bin 125 -> 0 bytes .../external/L3_Sunflower_128x64/frame_4.png | Bin 954 -> 0 bytes .../external/L3_Sunflower_128x64/frame_5.png | Bin 5139 -> 0 bytes .../external/L3_Sunflower_128x64/frame_6.png | Bin 1139 -> 0 bytes .../external/L3_Sunflower_128x64/meta.txt | 14 --------- assets/dolphin/external/manifest.txt | 7 ----- 12 files changed, 18 insertions(+), 50 deletions(-) delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_0.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_1.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_2.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_3.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_4.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_5.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/frame_6.png delete mode 100644 assets/dolphin/external/L3_Sunflower_128x64/meta.txt diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 394ffee30..77884f2c1 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -217,25 +217,25 @@ static bool animation_manager_check_blocking(AnimationManager* animation_manager FS_Error sd_status = storage_sd_status(storage); if(sd_status == FSE_INTERNAL) { - blocking_animation = animation_storage_find_animation(BAD_SD_ANIMATION_NAME, false); + blocking_animation = animation_storage_find_animation(BAD_SD_ANIMATION_NAME); furi_assert(blocking_animation); } else if(sd_status == FSE_NOT_READY) { animation_manager->sd_shown_sd_ok = false; animation_manager->sd_shown_no_db = false; } else if(sd_status == FSE_OK) { if(!animation_manager->sd_shown_sd_ok) { - blocking_animation = animation_storage_find_animation(SD_OK_ANIMATION_NAME, false); + blocking_animation = animation_storage_find_animation(SD_OK_ANIMATION_NAME); furi_assert(blocking_animation); animation_manager->sd_shown_sd_ok = true; } else if(!animation_manager->sd_shown_no_db) { if(!storage_file_exists(storage, EXT_PATH("Manifest"))) { - blocking_animation = animation_storage_find_animation(NO_DB_ANIMATION_NAME, false); + blocking_animation = animation_storage_find_animation(NO_DB_ANIMATION_NAME); furi_assert(blocking_animation); animation_manager->sd_shown_no_db = true; animation_manager->sd_show_url = true; } } else if(animation_manager->sd_show_url) { - blocking_animation = animation_storage_find_animation(URL_ANIMATION_NAME, false); + blocking_animation = animation_storage_find_animation(URL_ANIMATION_NAME); furi_assert(blocking_animation); animation_manager->sd_show_url = false; } @@ -245,7 +245,7 @@ static bool animation_manager_check_blocking(AnimationManager* animation_manager DolphinStats stats = dolphin_stats(dolphin); furi_record_close(RECORD_DOLPHIN); if(!blocking_animation && stats.level_up_is_pending) { - blocking_animation = animation_storage_find_animation(NEW_MAIL_ANIMATION_NAME, false); + blocking_animation = animation_storage_find_animation(NEW_MAIL_ANIMATION_NAME); furi_check(blocking_animation); animation_manager->levelup_pending = true; } @@ -446,22 +446,12 @@ static StorageAnimation* /* cache animation, if failed - choose reliable animation */ if(selected == NULL) { FURI_LOG_E(TAG, "Can't find valid animation in manifest"); - selected = animation_storage_find_animation(HARDCODED_ANIMATION_NAME, false); + selected = animation_storage_find_animation(HARDCODED_ANIMATION_NAME); } else if(!animation_storage_get_bubble_animation(selected)) { const char* name = animation_storage_get_meta(selected)->name; FURI_LOG_E(TAG, "Can't upload animation described in manifest: \'%s\'", name); animation_storage_free_storage_animation(&selected); - selected = animation_storage_find_animation(HARDCODED_ANIMATION_NAME, false); - } else { - FuriHalRtcDateTime date; - furi_hal_rtc_get_datetime(&date); - if(date.month == 4 && date.day == 1 && furi_hal_random_get() % 2) { - animation_storage_free_storage_animation(&selected); - selected = animation_storage_find_animation("L3_Sunflower_128x64", true); - if(selected == NULL) { - selected = animation_storage_find_animation(HARDCODED_ANIMATION_NAME, false); - } - } + selected = animation_storage_find_animation(HARDCODED_ANIMATION_NAME); } furi_assert(selected); @@ -520,7 +510,7 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m if(animation_manager->state == AnimationManagerStateFreezedBlocked) { StorageAnimation* restore_animation = animation_storage_find_animation( - furi_string_get_cstr(animation_manager->freezed_animation_name), false); + furi_string_get_cstr(animation_manager->freezed_animation_name)); /* all blocked animations must be in flipper -> we can * always find blocking animation */ furi_assert(restore_animation); @@ -532,7 +522,7 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m if(!blocked) { /* if no blocking - try restore last one idle */ StorageAnimation* restore_animation = animation_storage_find_animation( - furi_string_get_cstr(animation_manager->freezed_animation_name), false); + furi_string_get_cstr(animation_manager->freezed_animation_name)); if(restore_animation) { Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN); DolphinStats stats = dolphin_stats(dolphin); diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c index 0905a6d43..b412d175b 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/applications/services/desktop/animations/animation_storage.c @@ -30,11 +30,11 @@ static void animation_storage_free_frames(BubbleAnimation* animation); static void animation_storage_free_animation(BubbleAnimation** storage_animation); static BubbleAnimation* animation_storage_load_animation(const char* name); -void animation_handler_select_manifest(bool force_stock) { +void animation_handler_select_manifest() { XtremeSettings* xtreme_settings = XTREME_SETTINGS(); FuriString* anim_dir = furi_string_alloc(); FuriString* manifest = furi_string_alloc(); - bool use_asset_pack = !force_stock && xtreme_settings->asset_pack[0] != '\0'; + bool use_asset_pack = xtreme_settings->asset_pack[0] != '\0'; if(use_asset_pack) { furi_string_printf( anim_dir, "%s/%s/Anims", XTREME_ASSETS_PATH, xtreme_settings->asset_pack); @@ -61,10 +61,9 @@ void animation_handler_select_manifest(bool force_stock) { static bool animation_storage_load_single_manifest_info( StorageAnimationManifestInfo* manifest_info, - const char* name, - bool force_stock) { + const char* name) { furi_assert(manifest_info); - animation_handler_select_manifest(force_stock); + animation_handler_select_manifest(); bool result = false; Storage* storage = furi_record_open(RECORD_STORAGE); FlipperFormat* file = flipper_format_file_alloc(storage); @@ -120,7 +119,7 @@ static bool animation_storage_load_single_manifest_info( void animation_storage_fill_animation_list(StorageAnimationList_t* animation_list) { furi_assert(sizeof(StorageAnimationList_t) == sizeof(void*)); furi_assert(!StorageAnimationList_size(*animation_list)); - animation_handler_select_manifest(false); + animation_handler_select_manifest(); Storage* storage = furi_record_open(RECORD_STORAGE); FlipperFormat* file = flipper_format_file_alloc(storage); @@ -176,7 +175,7 @@ void animation_storage_fill_animation_list(StorageAnimationList_t* animation_lis furi_record_close(RECORD_STORAGE); } -StorageAnimation* animation_storage_find_animation(const char* name, bool force_stock) { +StorageAnimation* animation_storage_find_animation(const char* name) { furi_assert(name); furi_assert(strlen(name)); StorageAnimation* storage_animation = NULL; @@ -203,8 +202,8 @@ StorageAnimation* animation_storage_find_animation(const char* name, bool force_ storage_animation->external = true; bool result = false; - result = animation_storage_load_single_manifest_info( - &storage_animation->manifest_info, name, force_stock); + result = + animation_storage_load_single_manifest_info(&storage_animation->manifest_info, name); if(result) { storage_animation->animation = animation_storage_load_animation(name); result = !!storage_animation->animation; diff --git a/applications/services/desktop/animations/animation_storage.h b/applications/services/desktop/animations/animation_storage.h index 55512e008..16c0feab4 100644 --- a/applications/services/desktop/animations/animation_storage.h +++ b/applications/services/desktop/animations/animation_storage.h @@ -61,7 +61,7 @@ void animation_storage_cache_animation(StorageAnimation* storage_animation); * @name name of animation * @return found animation. NULL if nothing found. */ -StorageAnimation* animation_storage_find_animation(const char* name, bool force_stock); +StorageAnimation* animation_storage_find_animation(const char* name); /** * Get meta information of storage animation. diff --git a/assets/dolphin/external/L3_Sunflower_128x64/frame_0.png b/assets/dolphin/external/L3_Sunflower_128x64/frame_0.png deleted file mode 100644 index 023da26d51428c1317946eb8e0f2e9cfd3134924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 585 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 cHNA~~0pP;2~&b^rhX07*qoM6N<$f*XdkM*si- diff --git a/assets/dolphin/external/L3_Sunflower_128x64/frame_5.png b/assets/dolphin/external/L3_Sunflower_128x64/frame_5.png deleted file mode 100644 index e8303b575e8f147ca2432c5cad493e6496618f24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5139 zcmeHKdpMM78y~SHm6b{d+TI+rw10A;HduOP0?OxaSbzR^7*Id_odY<3?d+z)9-1mLW zlg3-&HO*q41qy|l#_?wRA3G^^X43uBXY&O%s1?4LG@FGM@JNZ_m%J`>hG!Bx8zu zGc^unVHsCyx|iP1D~x`y$NFD68}-iS{!%yay4_MpdVO5YXxY81+3ib+fx>v-&=*J1kCrv3@15G<81rp(5+zAL*eoMTiqqa z$;E(qLgML4nscRh+K7(@C~&1cxLg&tqbep*UqWc?=b&;G`}Xqv8hQh3s{_rZ*P3^y z);AFT?chA^=A)<`sC5I~u2)BXEfDg+psD7mmnMt%P##Tu)bO2L)#YS)@$rrHem1ABj2R^048Dy^ReszD}$4o4q)+;mUW*T)B4sgSGU zJ=m$U2D9MOmhI>iPZ#$j^G~AqycBNysspE^@Bg{)Z}0ub5t}sHw?qUlX_B$frxQE0^CyP5QbK&_w{bN_~g|QJrx(MyI#KKj_KnUcp76No~ znL@+RG0{d|2J&tg#-afuL>s|G2XT1-OR0td5{87qfu1^PGy%QD0&rD}#0)?7vM~ze zi-``?YE=v@HYO$p6GOx()e*18@A3tGL{^^a{38y|pk%Ad$*d zMk_?@_mEnt_?=kq`DU0ghBMv~#QZJqd+0Z@8^H*Q%Vn^Y!YG4#95xeeSf3$M3Z){3 z@f9y1lVF;F2tp8v4w7&}2&9okc#tlH=mZLtK&6sMU&TfEPm`i9#lWbR3Ne!W5c_D5ld0M4EUU#Y(jl$x28z-YWx@2%&;#A}UQR#)B|S z7Jwu&g$6<}4F&~bI$cZ_&>*T1XQUDd8OxMvIfQJdR1QgCtV$sH20|`WLAHlVFNKL?MABnve*RNCGNI zhp9x6MkC;H6g-uVhp6wfYm{Pb45WtLC5VoQR!DjpwE`9zH_G{abW9j**abu|5Jv?6 zEEskyV635MyouNq`zK9Yjev1Y2C*9*Lz)-T3$bsT;h1KIw(~ds#`fZGTmhl}xX1_T z`%$isa($2j9|ZoGT_5H8AO$`M{4u-!Z*p0@J5Iq0a#*spAI;shtgmNZEQg3xzVRHm5=n~!Rb zO1XNc;MM9E&wK}U68X)*bo%AcHTa^zGo^Q*Ty-8E-tX4Z@0suA*b>gl?d$vU3FUEQ zPJG{^(nA%A>IqiaIUP04R>3cO1wBK4%SYl5$2PxwJn#bjI=|g2cG6EHcYPv)bYS&`%52WWxg_vApLx*Jm`|g3B)%w&yRH1a zy#%~{LxT^nRi%c@zdGk+8+UPXq9rfWjyu$w8I+xof6)4C87q71lc$?RRZZJ3UuXZL z+{9|AeYv9?A6Fg2-sg1ir)e7}bS011N0L|7i7&%Pn?#(c3nMnS&2c4Ttp`e((PzDEo)NuDkrX=`DrYum$!_ z9&+`$%I4>X6Jn=qF^faT@9m!WE$@`yCB6MR`RTdCZu7d++4o#4W`qVc?hlzaY0kNv z9KXQqll@r|RPdK;7q<1!M$gG0WCGr|!)DdLJV}q8-(J{Ub)w){hjfo^>Sy&~ky`eN zSi4uPb2g`zmCxBVeT}^!=qX{skvfyY&s#%1W`>oTWPTbcvs)j~DzDJX8q;oa);m1x zJuUH0|H8Ar>soUF|HP>+Hmx*PviP6ZC!GDH#fEyKFQ8||%P!&hw*F^8o6ANCrh0Z~ zF{fF^AvAtr!*xvSp+3kpBY2t~sPk_bsB6swqtGfaZt19mF&-X#` zYYUH72V}J!4J{s7^}4)iAnV2jJyfU@o+|eMU?NCwNtj9-kkqOtIO-XYf=5_ zx=G}gpYECuOx??CzP0>?`P|^L^cGD${5^QN&f+6mcqjT diff --git a/assets/dolphin/external/L3_Sunflower_128x64/frame_6.png b/assets/dolphin/external/L3_Sunflower_128x64/frame_6.png deleted file mode 100644 index aaaa2a5cdfcf7c706c97b62845cdbaba432442f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1139 zcmV-(1dRKMP)pJB}qg5uF1Ssvc3M~hJgONbcR3wq3 zP&8_Q0!9+W#49gEB0&RfIsHy=G``NzX4>5?OSgw@`@MNCNV7BjX5O6x-_F+IAdyJr zlC$2Tb&>&OKzZB5Rs0jPRk3nLrPtexLk5rmWmJ#98~pkEJICtkOJJs#QmGRlmu=;; zGEu1E0Fdj9Mu&l!vWtuJKrY+HW$Wq7@9zP51|*h%nX<>nzkpoU&1EH?;b;WNb;d@9 zfr&xmm|u7S^bBy40c3zd*j-(nKn^;Gi>q)NX3WQ>Tg18nce!*cZ|Bk$332Hb$xey( zor0WRuCud@Hu{h{0D{4R+${!z!NAbaeIQ?%PM?6&(=_99P_j)^46U)G;Z8BryF@OP7iFkymisC&<{RC#>dHe1)KohJlMPxwp8IaT5 z+zVi)!Qn^&C| zZ#r)zqewED6v(9!OUoqM#{lQT!W=L&=SCu7Q0b74jt+sDcoK;fQ12sv45*PrrX?I! zKkV)R?Ie48mICtUlT(jDB%)Sg;EN=css^G%dQ=I2G|<^>pK}udjdG{|e-0#N$snarye`>8Y8SIFPU0+S&xk z|I6Z|i2%$pA7y(rqq-q~p~# zzo1)12D|73nbJMz>+1!&m3z1f{%e84;XzQR4`dwvJ3T-S`qSPn=OiSGEV)OUp<71$j zmJ1Zc2cWutAEx9ksOCFjMZ##7jVT$>oCXvgXCnh>1dst_fXCx$ZEXS74?~|USt3nP^k@x&0?a=G>KFL{R5*6#PriTRQdn_002ovPDHLk FV1g;35jFq- diff --git a/assets/dolphin/external/L3_Sunflower_128x64/meta.txt b/assets/dolphin/external/L3_Sunflower_128x64/meta.txt deleted file mode 100644 index f93fdaae7..000000000 --- a/assets/dolphin/external/L3_Sunflower_128x64/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 16 -Active frames: 0 -Frames order: 0 1 2 3 4 5 5 5 6 6 6 6 6 6 3 3 -Active cycles: 0 -Frame rate: 1 -Duration: 360 -Active cooldown: 0 - -Bubble slots: 0 diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index 52cc88a7e..f9303a6ff 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -133,10 +133,3 @@ Max butthurt: 10 Min level: 27 Max level: 30 Weight: 3 - -Name: L3_Sunflower_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 0