From 6c3dfdb1e114c9e576b8ab18a8c8ff89220bcbf1 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sat, 4 Mar 2023 00:05:26 +0000 Subject: [PATCH] Make subplaylist external --- applications/main/application.fam | 1 - applications/main/sub_playlist/application.fam | 9 +++++---- applications/main/sub_playlist/playlist.c | 7 ++----- .../main/sub_playlist/playlist_10px.png | Bin 137 -> 1756 bytes .../MainMenu/Sub_Playlist_14/frame_01.png | Bin 119 -> 0 bytes .../MainMenu/Sub_Playlist_14/frame_02.png | Bin 119 -> 0 bytes .../MainMenu/Sub_Playlist_14/frame_03.png | Bin 120 -> 0 bytes .../MainMenu/Sub_Playlist_14/frame_04.png | Bin 119 -> 0 bytes .../MainMenu/Sub_Playlist_14/frame_05.png | Bin 119 -> 0 bytes .../icons/MainMenu/Sub_Playlist_14/frame_rate | 1 - 10 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_01.png delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_02.png delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_03.png delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_04.png delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_05.png delete mode 100644 assets/icons/MainMenu/Sub_Playlist_14/frame_rate diff --git a/applications/main/application.fam b/applications/main/application.fam index e47c0f2a1..a19fc156d 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -6,7 +6,6 @@ App( "fap_loader", "subghz", "unirfremix", - "sub_playlist", "lfrfid", "nfc", "infrared", diff --git a/applications/main/sub_playlist/application.fam b/applications/main/sub_playlist/application.fam index 3a6de14da..06357e24b 100644 --- a/applications/main/sub_playlist/application.fam +++ b/applications/main/sub_playlist/application.fam @@ -1,12 +1,13 @@ App( - appid="sub_playlist", + appid="SubGHz_Playlist", name="Sub-GHz Playlist", - apptype=FlipperAppType.APP, + apptype=FlipperAppType.EXTERNAL, entry_point="playlist_app", cdefines=["APP_PLAYLIST"], requires=["storage", "gui", "dialogs", "subghz"], stack_size=2 * 1024, - order=12, + order=14, fap_icon="playlist_10px.png", - icon="A_Sub_Playlist_14", + fap_category="Sub-GHz", + fap_icon_assets="images", ) diff --git a/applications/main/sub_playlist/playlist.c b/applications/main/sub_playlist/playlist.c index 7bf433d09..0ebd06953 100644 --- a/applications/main/sub_playlist/playlist.c +++ b/applications/main/sub_playlist/playlist.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -591,8 +591,6 @@ static void render_callback(Canvas* canvas, void* ctx) { } } break; - default: - break; } furi_string_free(temp_str); @@ -683,9 +681,8 @@ int32_t playlist_app(void* p) { dialog_file_browser_set_basic_options(&browser_options, PLAYLIST_EXT, &I_sub1_10px); browser_options.base_path = PLAYLIST_FOLDER; - bool res = + const bool res = dialog_file_browser_show(dialogs, app->file_path, app->file_path, &browser_options); - furi_record_close(RECORD_DIALOGS); // check if a file was selected if(!res) { diff --git a/applications/main/sub_playlist/playlist_10px.png b/applications/main/sub_playlist/playlist_10px.png index 94ad885c3b24745b3b2b717774d797d5b32860ba..fc33471f7786a6e035cc94b1a4c37bffbd12b57b 100644 GIT binary patch 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 delta 88 zcmV-e0H^=l4T%AeI8gvQNkl#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBS}NNkT(V1*6!~8@z`@x-Q4Xcq#IvtakTZdL|@Ed71#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBS}NNkT(V1*6!~8@z`@x-Q4Xcq#IvtX`S;$|KAx=ZFw9L*mB6-b)pX+JTxF NJYD@<);T3K0RSmKAS(a> diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png deleted file mode 100644 index 14f6daaff3c69fc898ea81c67c6aebb4f7bc7516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&M> z;uunKEBS}NNkT(V1*6!~8@z`@x-Q4Xcq#IvtY%-o(%D&aqo6kr14GW`?cu(=oI`=S O7(8A5T-G@yGywoBdmn%R diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png deleted file mode 100644 index fb525d309e807985d2c8ed50d9dd1f0987e75e3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBS}NNkT(V1*6!~8@z`@x-Q4Xcq#IvtahKZ@=BOj&JiJIh8oS)$%pnmbq8u< N@O1TaS?83{1OPRPAr1fl diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png deleted file mode 100644 index 09bf26f72664375520066d127856fdf00970a66c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3oCO|{#S9F3${@^GvDCf{D5&Y_ z;uunKEBS}NNkT(V1*6!~8@z`@x-Q4Xcq#IvtakTZdL|@Ed71