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 000000000..94ad885c3 Binary files /dev/null and b/applications/main/sub_playlist/playlist_10px.png differ 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 fc33471f7..000000000 Binary files a/applications/plugins/playlist/playlist_10px.png and /dev/null differ 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 000000000..37f59d65f Binary files /dev/null and b/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png differ 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 000000000..328e47a63 Binary files /dev/null and b/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png differ 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 000000000..21b268aa8 Binary files /dev/null and b/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png differ 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 000000000..6fef29f8f Binary files /dev/null and b/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png differ 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 000000000..37f59d65f Binary files /dev/null and b/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png differ 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