From 4f19b0f559d23c5187c2416b94184fabec5e65d1 Mon Sep 17 00:00:00 2001 From: jbohack Date: Thu, 5 Jan 2023 13:06:32 -0500 Subject: [PATCH] added subghz-playlist to main application menu --- applications/main/application.fam | 1 + .../sub_playlist}/application.fam | 4 ++-- .../sub_playlist}/canvas_helper.c | 0 .../sub_playlist}/canvas_helper.h | 0 .../sub_playlist}/images/ButtonRight_4x7.png | Bin .../sub_playlist}/images/sub1_10px.png | Bin .../playlist => main/sub_playlist}/playlist.c | 0 applications/main/sub_playlist/playlist_10px.png | Bin 0 -> 137 bytes .../sub_playlist}/playlist_file.c | 0 .../sub_playlist}/playlist_file.h | 0 .../main/sub_playlist_loader/application.fam | 13 +++++++++++++ .../sub_playlist_loader_app.c | 9 +++++++++ applications/plugins/playlist/playlist_10px.png | Bin 1756 -> 0 bytes .../icons/MainMenu/Sub_Playlist_14/frame_01.png | Bin 0 -> 119 bytes .../icons/MainMenu/Sub_Playlist_14/frame_02.png | Bin 0 -> 120 bytes .../icons/MainMenu/Sub_Playlist_14/frame_03.png | Bin 0 -> 120 bytes .../icons/MainMenu/Sub_Playlist_14/frame_04.png | Bin 0 -> 120 bytes .../icons/MainMenu/Sub_Playlist_14/frame_05.png | Bin 0 -> 119 bytes assets/icons/MainMenu/Sub_Playlist_14/frame_rate | 1 + 19 files changed, 26 insertions(+), 2 deletions(-) rename applications/{plugins/playlist => main/sub_playlist}/application.fam (88%) rename applications/{plugins/playlist => main/sub_playlist}/canvas_helper.c (100%) rename applications/{plugins/playlist => main/sub_playlist}/canvas_helper.h (100%) rename applications/{plugins/playlist => main/sub_playlist}/images/ButtonRight_4x7.png (100%) rename applications/{plugins/playlist => main/sub_playlist}/images/sub1_10px.png (100%) rename applications/{plugins/playlist => main/sub_playlist}/playlist.c (100%) create mode 100644 applications/main/sub_playlist/playlist_10px.png rename applications/{plugins/playlist => main/sub_playlist}/playlist_file.c (100%) rename applications/{plugins/playlist => main/sub_playlist}/playlist_file.h (100%) create mode 100644 applications/main/sub_playlist_loader/application.fam create mode 100644 applications/main/sub_playlist_loader/sub_playlist_loader_app.c delete mode 100644 applications/plugins/playlist/playlist_10px.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_01.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_02.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_03.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_04.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_05.png create mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_rate diff --git a/applications/main/application.fam b/applications/main/application.fam index ef4933630..49fc6466c 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -14,6 +14,7 @@ App( # "lfrfid_loader", "nfc", "subghz", + "sub_playlist_loader", #"bad_usb", "bad_usb_loader", # "u2f", diff --git a/applications/plugins/playlist/application.fam b/applications/main/sub_playlist/application.fam similarity index 88% rename from applications/plugins/playlist/application.fam rename to applications/main/sub_playlist/application.fam index 31acd8ea2..08e297163 100644 --- a/applications/plugins/playlist/application.fam +++ b/applications/main/sub_playlist/application.fam @@ -6,8 +6,8 @@ App( cdefines=["APP_PLAYLIST"], requires=["storage", "gui", "dialogs", "subghz"], stack_size=2 * 1024, - order=200, + order=12, fap_icon="playlist_10px.png", - fap_category="Tools", + fap_category="Main", fap_icon_assets="images", ) diff --git a/applications/plugins/playlist/canvas_helper.c b/applications/main/sub_playlist/canvas_helper.c similarity index 100% rename from applications/plugins/playlist/canvas_helper.c rename to applications/main/sub_playlist/canvas_helper.c diff --git a/applications/plugins/playlist/canvas_helper.h b/applications/main/sub_playlist/canvas_helper.h similarity index 100% rename from applications/plugins/playlist/canvas_helper.h rename to applications/main/sub_playlist/canvas_helper.h diff --git a/applications/plugins/playlist/images/ButtonRight_4x7.png b/applications/main/sub_playlist/images/ButtonRight_4x7.png similarity index 100% rename from applications/plugins/playlist/images/ButtonRight_4x7.png rename to applications/main/sub_playlist/images/ButtonRight_4x7.png diff --git a/applications/plugins/playlist/images/sub1_10px.png b/applications/main/sub_playlist/images/sub1_10px.png similarity index 100% rename from applications/plugins/playlist/images/sub1_10px.png rename to applications/main/sub_playlist/images/sub1_10px.png diff --git a/applications/plugins/playlist/playlist.c b/applications/main/sub_playlist/playlist.c similarity index 100% rename from applications/plugins/playlist/playlist.c rename to applications/main/sub_playlist/playlist.c diff --git a/applications/main/sub_playlist/playlist_10px.png b/applications/main/sub_playlist/playlist_10px.png new file mode 100644 index 0000000000000000000000000000000000000000..94ad885c3b24745b3b2b717774d797d5b32860ba GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih;M02eewJ6Z}XSC6lXO&xWB)C h$?Id!i((EkF<5%8HEO-MY#PuQ22WQ%mvv4FO#lxSFem^3 literal 0 HcmV?d00001 diff --git a/applications/plugins/playlist/playlist_file.c b/applications/main/sub_playlist/playlist_file.c similarity index 100% rename from applications/plugins/playlist/playlist_file.c rename to applications/main/sub_playlist/playlist_file.c diff --git a/applications/plugins/playlist/playlist_file.h b/applications/main/sub_playlist/playlist_file.h similarity index 100% rename from applications/plugins/playlist/playlist_file.h rename to applications/main/sub_playlist/playlist_file.h diff --git a/applications/main/sub_playlist_loader/application.fam b/applications/main/sub_playlist_loader/application.fam new file mode 100644 index 000000000..923733a4d --- /dev/null +++ b/applications/main/sub_playlist_loader/application.fam @@ -0,0 +1,13 @@ +App( + appid="sub_playlist_loader", + name="Sub-GHz Playlist", + apptype=FlipperAppType.APP, + entry_point="sub_playlist_loader_app", + requires=[ + "gui", + ], + stack_size=int(2 * 1024), + icon="A_Sub_Playlist_14", + order=12, + link="/ext/apps/Main/SubGHz_Playlist.fap", +) diff --git a/applications/main/sub_playlist_loader/sub_playlist_loader_app.c b/applications/main/sub_playlist_loader/sub_playlist_loader_app.c new file mode 100644 index 000000000..1c4eb20c9 --- /dev/null +++ b/applications/main/sub_playlist_loader/sub_playlist_loader_app.c @@ -0,0 +1,9 @@ +#include + +#define TAG "sub_playlist_loader_app" + +int32_t sub_playlist_loader_app(void* p) { + UNUSED(p); + + return 0; +} diff --git a/applications/plugins/playlist/playlist_10px.png b/applications/plugins/playlist/playlist_10px.png deleted file mode 100644 index fc33471f7786a6e035cc94b1a4c37bffbd12b57b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1756 zcmcIlPjB2r95tc6K)r z0tu-?z?l^XGNs__0!Lqn$bvmS%cL@J}v5S5ot@_P>khcsHsaxa}sGiSx`NWhw3h`nCj^W5W_H3FVM}zb+8xQ zRgr-ZG+by}!1O}f4NY5ZKbk04(KI~lKWvMMyGWZfO&LNspU?HVrSobG%^(P%fgnOa zAV7UqGB_mGwX%lHe>S_&nxuz}Z)+gZ@T;LL#x*^xp0ps{; zXr8apb+b1URa(6-B(6tiC4+~o=BE{5doxxvTV1ho!W&*s_)D~{|Nf6cO4bF-(`vf3 zhZ4x9EEn9hz?w^aWw={0-0*6|`LyfQu&bydOLx>ekFtXDdA%(awG&t$H!RX**MJcK z(;1moXgi_pe_&XlVXUCB2m-|oz8;v*eTQ8&0CY|xK1Axh6O8oH@(2Z@J) zogx<)md${ViO5spc$B0Dvyi{kCFb`zIh9Vx`K#PgP6Wr=%@AW3nHFWhqnHBEvJH?J zz6}_1{L~9PGj*Jf?c*vFuMVC*&ni_>sS5e7iyaG)l=vV)HU>URQ@}7HzGK@S@d8bK zR(F?Ac@=Xi+_f~7k}%~}jzxa59FG|+i?K|zU>B>{&uY=Sv-bTsVxP97X{Ihi7h)o_ z9%)22nNh8MoW01sYw29k&L>QeUeWv&tmbJm#}(_1h10JL7kruc8qZ!K{aTHGjnZ3N z$pjZ;CU#D!$;Cjq#jKhF|KG1?{q8c;6KR&+tXmr%;PKj!`(2nYwrGF|2A=C%AV9VU z{M1MQp(&!sGl`eFtGd&yQ?Md}S65tWeQtZ~CW}2+4%fTAxLKbUtPo4B#A)#DC%3*A zC&~7p-y6O69r@?-a_8pTe_vjH@o?km_OBNg8}EKKy!hsK?e65WKWDdkzbW|1(J$|e So_;RRpTXWi|HlVUzWf))xhL}g diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png new file mode 100644 index 0000000000000000000000000000000000000000..37f59d65f10e2dec9068c24457099ff0cdd787fe GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBVL&|Mtv+3`=@^mj2(!sN?njF@wcaC)bH@Wlg6l1+SdR#&BPT|G(6cFSCJ~ O7(8A5T-G@yGywo|mLgFA literal 0 HcmV?d00001 diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png new file mode 100644 index 0000000000000000000000000000000000000000..328e47a63e00ddc8a61b72003c9d8f88926a39f7 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&M> z;uunKEBVL&|Mtv+3`=@^mj2(!sN?njF@wcaC)bH@mo}|bj?^^0%)qcw%J??tTH OE(T9mKbLh*2~7Z!qaon{ literal 0 HcmV?d00001 diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png new file mode 100644 index 0000000000000000000000000000000000000000..21b268aa89640b6e9590e10896db5bb55e4e2650 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&M> z;uunKEBVL&|Mtv+3`=@^mj2(!sN?njF@wcaC)bH@Ww$Kj<6U~ihnZoIjr#MYzib$R Px)?lN{an^LB{Ts5nkgc5 literal 0 HcmV?d00001 diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png new file mode 100644 index 0000000000000000000000000000000000000000..6fef29f8fa048efa4a2bc9d992cb77635569a0f8 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&M> z;uunKEBVL&|Mtv+3`=@^mj2(!sN?njF@wcaC)bH@WfPYLMQfT~W?(oyN&55Y&4;^y Px)?lN{an^LB{Ts5q{Sm} literal 0 HcmV?d00001 diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png new file mode 100644 index 0000000000000000000000000000000000000000..37f59d65f10e2dec9068c24457099ff0cdd787fe GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBVL&|Mtv+3`=@^mj2(!sN?njF@wcaC)bH@Wlg6l1+SdR#&BPT|G(6cFSCJ~ O7(8A5T-G@yGywo|mLgFA literal 0 HcmV?d00001 diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_rate b/assets/icons/MainMenu/Sub_Playlist_14/frame_rate new file mode 100644 index 000000000..56a6051ca --- /dev/null +++ b/assets/icons/MainMenu/Sub_Playlist_14/frame_rate @@ -0,0 +1 @@ +1 \ No newline at end of file