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/playlist_10px.png b/applications/main/sub_playlist/playlist_10px.png deleted file mode 100644 index 94ad885c3..000000000 Binary files a/applications/main/sub_playlist/playlist_10px.png and /dev/null differ diff --git a/applications/main/sub_playlist/application.fam b/applications/plugins/sub_playlist/application.fam similarity index 60% rename from applications/main/sub_playlist/application.fam rename to applications/plugins/sub_playlist/application.fam index 3a6de14da..06357e24b 100644 --- a/applications/main/sub_playlist/application.fam +++ b/applications/plugins/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/canvas_helper.c b/applications/plugins/sub_playlist/canvas_helper.c similarity index 100% rename from applications/main/sub_playlist/canvas_helper.c rename to applications/plugins/sub_playlist/canvas_helper.c diff --git a/applications/main/sub_playlist/canvas_helper.h b/applications/plugins/sub_playlist/canvas_helper.h similarity index 100% rename from applications/main/sub_playlist/canvas_helper.h rename to applications/plugins/sub_playlist/canvas_helper.h diff --git a/applications/main/sub_playlist/images/ButtonRight_4x7.png b/applications/plugins/sub_playlist/images/ButtonRight_4x7.png similarity index 100% rename from applications/main/sub_playlist/images/ButtonRight_4x7.png rename to applications/plugins/sub_playlist/images/ButtonRight_4x7.png diff --git a/applications/main/sub_playlist/images/sub1_10px.png b/applications/plugins/sub_playlist/images/sub1_10px.png similarity index 100% rename from applications/main/sub_playlist/images/sub1_10px.png rename to applications/plugins/sub_playlist/images/sub1_10px.png diff --git a/applications/main/sub_playlist/playlist.c b/applications/plugins/sub_playlist/playlist.c similarity index 99% rename from applications/main/sub_playlist/playlist.c rename to applications/plugins/sub_playlist/playlist.c index 7bf433d09..0ebd06953 100644 --- a/applications/main/sub_playlist/playlist.c +++ b/applications/plugins/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/plugins/sub_playlist/playlist_10px.png b/applications/plugins/sub_playlist/playlist_10px.png new file mode 100644 index 000000000..fc33471f7 Binary files /dev/null and b/applications/plugins/sub_playlist/playlist_10px.png differ diff --git a/applications/main/sub_playlist/playlist_file.c b/applications/plugins/sub_playlist/playlist_file.c similarity index 100% rename from applications/main/sub_playlist/playlist_file.c rename to applications/plugins/sub_playlist/playlist_file.c diff --git a/applications/main/sub_playlist/playlist_file.h b/applications/plugins/sub_playlist/playlist_file.h similarity index 100% rename from applications/main/sub_playlist/playlist_file.h rename to applications/plugins/sub_playlist/playlist_file.h diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png deleted file mode 100644 index 09bf26f72..000000000 Binary files a/assets/icons/MainMenu/Sub_Playlist_14/frame_01.png and /dev/null differ diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png b/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png deleted file mode 100644 index 7032e362c..000000000 Binary files a/assets/icons/MainMenu/Sub_Playlist_14/frame_02.png and /dev/null differ 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 14f6daaff..000000000 Binary files a/assets/icons/MainMenu/Sub_Playlist_14/frame_03.png and /dev/null differ 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 fb525d309..000000000 Binary files a/assets/icons/MainMenu/Sub_Playlist_14/frame_04.png and /dev/null differ 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 09bf26f72..000000000 Binary files a/assets/icons/MainMenu/Sub_Playlist_14/frame_05.png and /dev/null differ diff --git a/assets/icons/MainMenu/Sub_Playlist_14/frame_rate b/assets/icons/MainMenu/Sub_Playlist_14/frame_rate deleted file mode 100644 index 56a6051ca..000000000 --- a/assets/icons/MainMenu/Sub_Playlist_14/frame_rate +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file