From a71d05a11401ad72afab6f2f570a58e8d64d35a5 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Mon, 19 Sep 2022 18:39:38 -0400 Subject: [PATCH 1/4] Update archive_browser.h --- applications/main/archive/helpers/archive_browser.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/main/archive/helpers/archive_browser.h b/applications/main/archive/helpers/archive_browser.h index ad64a9845..de4bb9382 100644 --- a/applications/main/archive/helpers/archive_browser.h +++ b/applications/main/archive/helpers/archive_browser.h @@ -16,6 +16,7 @@ static const char* tab_default_paths[] = { [ArchiveTabInfrared] = ANY_PATH("infrared"), [ArchiveTabBadUsb] = ANY_PATH("badusb"), [ArchiveTabU2f] = "/app:u2f", + [ArchiveTabApps] = ANY_PATH("apps"), [ArchiveTabBrowser] = STORAGE_ANY_PATH_PREFIX, }; @@ -27,6 +28,7 @@ static const char* known_ext[] = { [ArchiveFileTypeInfrared] = ".ir", [ArchiveFileTypeBadUsb] = ".txt", [ArchiveFileTypeU2f] = "?", + [ArchiveFileTypeApps] = ".fap", [ArchiveFileTypeUpdateManifest] = ".fuf", [ArchiveFileTypeFolder] = "?", [ArchiveFileTypeUnknown] = "*", @@ -41,6 +43,7 @@ static const ArchiveFileTypeEnum known_type[] = { [ArchiveTabInfrared] = ArchiveFileTypeInfrared, [ArchiveTabBadUsb] = ArchiveFileTypeBadUsb, [ArchiveTabU2f] = ArchiveFileTypeU2f, + [ArchiveTabApps] = ArchiveFileTypeApps, [ArchiveTabBrowser] = ArchiveFileTypeUnknown, }; From 82e1e8af6a219f32f32a5b20ee9c1dc09f07a1a9 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Mon, 19 Sep 2022 18:47:22 -0400 Subject: [PATCH 2/4] Enable fap support on Archive app --- applications/main/archive/helpers/archive_files.h | 1 + .../main/archive/scenes/archive_scene_browser.c | 1 + .../main/archive/views/archive_browser_view.c | 2 ++ .../main/archive/views/archive_browser_view.h | 1 + assets/icons/Archive/Apps_10px.png | Bin 0 -> 179 bytes firmware/targets/f7/api_symbols.csv | 1 + 6 files changed, 6 insertions(+) create mode 100644 assets/icons/Archive/Apps_10px.png diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h index d4df327a9..de07a2e19 100644 --- a/applications/main/archive/helpers/archive_files.h +++ b/applications/main/archive/helpers/archive_files.h @@ -13,6 +13,7 @@ typedef enum { ArchiveFileTypeInfrared, ArchiveFileTypeBadUsb, ArchiveFileTypeU2f, + ArchiveFileTypeApps, ArchiveFileTypeUpdateManifest, ArchiveFileTypeFolder, ArchiveFileTypeUnknown, diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index 3e7ac231d..23722e30b 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -19,6 +19,7 @@ static const char* flipper_app_name[] = { [ArchiveFileTypeInfrared] = "Infrared", [ArchiveFileTypeBadUsb] = "Bad USB", [ArchiveFileTypeU2f] = "U2F", + [ArchiveFileTypeApps] = "Applications", [ArchiveFileTypeUpdateManifest] = "UpdaterApp", }; diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index 5fa21d150..99e801ab1 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -16,6 +16,7 @@ static const char* ArchiveTabNames[] = { [ArchiveTabInfrared] = "Infrared", [ArchiveTabBadUsb] = "Bad USB", [ArchiveTabU2f] = "U2F", + [ArchiveTabApps] = "Applications", [ArchiveTabBrowser] = "Browser", }; @@ -27,6 +28,7 @@ static const Icon* ArchiveItemIcons[] = { [ArchiveFileTypeInfrared] = &I_ir_10px, [ArchiveFileTypeBadUsb] = &I_badusb_10px, [ArchiveFileTypeU2f] = &I_u2f_10px, + [ArchiveFileTypeApps] = &I_Apps_10px, [ArchiveFileTypeUpdateManifest] = &I_update_10px, [ArchiveFileTypeFolder] = &I_dir_10px, [ArchiveFileTypeUnknown] = &I_unknown_10px, diff --git a/applications/main/archive/views/archive_browser_view.h b/applications/main/archive/views/archive_browser_view.h index e20bd62d3..c19ccab84 100644 --- a/applications/main/archive/views/archive_browser_view.h +++ b/applications/main/archive/views/archive_browser_view.h @@ -27,6 +27,7 @@ typedef enum { ArchiveTabIButton, ArchiveTabBadUsb, ArchiveTabU2f, + ArchiveTabApps, ArchiveTabBrowser, ArchiveTabTotal, } ArchiveTabEnum; diff --git a/assets/icons/Archive/Apps_10px.png b/assets/icons/Archive/Apps_10px.png new file mode 100644 index 0000000000000000000000000000000000000000..e659f31f4e4f6bdc680882f27ac4e28a9e0c083d GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}25AX?b1=9cj|Nr~<@4tWlK7al^ZF+krP>8d@BeIx*fm;xS8S7KxCjtd^ zJzX3_B*K#u5)xXH6i#xaG$=4L3paJDoI1gi?({=}ErxNz@umc&PN$hYJq%or8O-(1 RD1scr;OXk;vd$@?2>?IsH9G(R literal 0 HcmV?d00001 diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 481c76b9f..9e3f957c4 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -4098,6 +4098,7 @@ Variable,+,A_iButton_14,const Icon, Variable,-,ITM_RxBuffer,volatile int32_t, Variable,+,I_125_10px,const Icon, Variable,+,I_ActiveConnection_50x64,const Icon, +Variable,+,I_Apps_10px,const Icon, Variable,+,I_ArrowC_1_36x36,const Icon, Variable,+,I_ArrowDownEmpty_14x15,const Icon, Variable,+,I_ArrowDownFilled_14x15,const Icon, From 8659becc9dc1a5939c761ca20b2899aef08e4bd5 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 20 Sep 2022 03:19:31 +0300 Subject: [PATCH 3/4] fix tab name and add new icon icon by @Svaarich --- .../main/archive/views/archive_browser_view.c | 4 ++-- assets/icons/Archive/Apps_10px.png | Bin 179 -> 2376 bytes firmware/targets/f7/api_symbols.csv | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index 99e801ab1..a49712df0 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -16,7 +16,7 @@ static const char* ArchiveTabNames[] = { [ArchiveTabInfrared] = "Infrared", [ArchiveTabBadUsb] = "Bad USB", [ArchiveTabU2f] = "U2F", - [ArchiveTabApps] = "Applications", + [ArchiveTabApps] = "Apps", [ArchiveTabBrowser] = "Browser", }; @@ -28,7 +28,7 @@ static const Icon* ArchiveItemIcons[] = { [ArchiveFileTypeInfrared] = &I_ir_10px, [ArchiveFileTypeBadUsb] = &I_badusb_10px, [ArchiveFileTypeU2f] = &I_u2f_10px, - [ArchiveFileTypeApps] = &I_Apps_10px, + [ArchiveFileTypeApps] = &I_apps_10px, [ArchiveFileTypeUpdateManifest] = &I_update_10px, [ArchiveFileTypeFolder] = &I_dir_10px, [ArchiveFileTypeUnknown] = &I_unknown_10px, diff --git a/assets/icons/Archive/Apps_10px.png b/assets/icons/Archive/Apps_10px.png index e659f31f4e4f6bdc680882f27ac4e28a9e0c083d..cb3a2e688defa4b3e744494dfda517e5169e2a4d 100644 GIT binary patch literal 2376 zcmcImOKjsr7&es<-J2~2NJvP_0XXb&rDdFl8+My*mq#SWmdQFKq4prfwJFjkgm`d-~bzdP4jBi%Xie_;t|U zO?R7b5+=d|^@Pg{!!TB8O}nx>j49jWDR6lwh^qP@-+ixxz^m#zRueVj8t(=hhmvm} zZnoLs9&^(weBB+5X@QwoM*FG|R;s*mgvHO{6D9gHC9UR7Vq9D?2E7N`lyfn7k5 zA%sEMDVTPtRH?iMFv7?{Wy3@eV}fjA6~W}ED{s>CNvnQ+;!8bM^=_KR#4rYfL19oV z2-z`A$8ijV4UC~ez~mrG=@3TA<*9`_PnZniG!PNUEK*nOr&V1s9d99wbF)!0kx2<= z3~6kb1(a=R1oT*ri}z)3qYcvtgK{lXShW7)|zeDmrN& z#N24{MC?n(*Za!j z0x&Kh@bXR&d18>fl2M#2;B}hvs;)wgA#xx_ZG;JSi0QnFiUgrCw5gKFqbYqDtS}}i zS$_iyFYph}gnEqlLWWdH9E7yPjX3IzyfvGo5hW>&7;n_8x}sVL0*|;wT=6MJ&@n3v zQm2F&KPg38rl1x{;DurheIF&@z1+TC_x=YguLJ zb8K3c?{nt6Q)@S6po)?9X02wdyo^7?ba3Lg zCVE0Pg{L$x&dxV#wJj<9pr>9WtsB=sW4&gZj%`C+FteH&5*6cvNfmDMcP67= z07mIbD9b9UsKK;yUYe5H Xhw3%^&WIZzj1H-O2_WeMLu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP}k zkpBPw|KGoV|NZ;-`Sa&#)7v|NLYxI2k;M!Q+=3v?Sf3I<5h$qZ>Eak75uTiokkFE( zaFQdXL4lcBxT#a+)Crz+rymMzF^m(AHzi0bbvn)L>0#h{%wVp6MiJy122WQ%mvv4F FO#mLVH4^{; diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 9e3f957c4..4767cde2f 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -4098,7 +4098,7 @@ Variable,+,A_iButton_14,const Icon, Variable,-,ITM_RxBuffer,volatile int32_t, Variable,+,I_125_10px,const Icon, Variable,+,I_ActiveConnection_50x64,const Icon, -Variable,+,I_Apps_10px,const Icon, +Variable,+,I_apps_10px,const Icon, Variable,+,I_ArrowC_1_36x36,const Icon, Variable,+,I_ArrowDownEmpty_14x15,const Icon, Variable,+,I_ArrowDownFilled_14x15,const Icon, From 672e27f2585b9fac0fcdef740b4cdc75ceb6526e Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 20 Sep 2022 03:23:22 +0300 Subject: [PATCH 4/4] fix icon name --- applications/main/archive/views/archive_browser_view.c | 2 +- firmware/targets/f7/api_symbols.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index a49712df0..d82145bea 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -28,7 +28,7 @@ static const Icon* ArchiveItemIcons[] = { [ArchiveFileTypeInfrared] = &I_ir_10px, [ArchiveFileTypeBadUsb] = &I_badusb_10px, [ArchiveFileTypeU2f] = &I_u2f_10px, - [ArchiveFileTypeApps] = &I_apps_10px, + [ArchiveFileTypeApps] = &I_Apps_10px, [ArchiveFileTypeUpdateManifest] = &I_update_10px, [ArchiveFileTypeFolder] = &I_dir_10px, [ArchiveFileTypeUnknown] = &I_unknown_10px, diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 4767cde2f..9e3f957c4 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -4098,7 +4098,7 @@ Variable,+,A_iButton_14,const Icon, Variable,-,ITM_RxBuffer,volatile int32_t, Variable,+,I_125_10px,const Icon, Variable,+,I_ActiveConnection_50x64,const Icon, -Variable,+,I_apps_10px,const Icon, +Variable,+,I_Apps_10px,const Icon, Variable,+,I_ArrowC_1_36x36,const Icon, Variable,+,I_ArrowDownEmpty_14x15,const Icon, Variable,+,I_ArrowDownFilled_14x15,const Icon,