Asset packs in FAPs + cleanup unused icons

applications/debug/battery_test_app/application.fam

@@ -11,5 +11,4 @@ App(
     stack_size=1 * 1024,
     order=130,
     fap_category="Debug",
-    fap_libs=["assets"],
 )

applications/external/.mass_storage/application.fam

@@ -9,5 +9,4 @@ App(
     order=2,
     # fap_icon="",
     fap_category="Misc",
-    fap_libs=["assets"],
 )

applications/external/bpmtapper/application.fam

@@ -8,6 +8,5 @@ App(
     stack_size=2 * 1024,
     fap_icon="bpm_10px.png",
     fap_category="Media",
-    fap_icon_assets="icons",
     order=15,
 )

applications/external/bpmtapper/bpm.c

@@ -4,7 +4,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include "bpm_tapper_icons.h"
+#include "assets_icons.h"
 
 typedef enum {
     EventTypeTick,

applications/external/brainfuck/brainfuck_i.h

@@ -30,6 +30,7 @@ typedef unsigned char byte;
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
 #include <brainfuck_icons.h>
+#include <assets_icons.h>
 
 #include <storage/storage.h>
 #include <stream/stream.h>

applications/external/counter/application.fam

@@ -7,6 +7,5 @@ App(
         "gui",
     ],
     fap_category="Misc",
-    fap_icon="icons/counter_icon.png",
-    fap_icon_assets="icons",
+    fap_icon="counter_icon.png",
 )

applications/external/counter/counter.c

@@ -2,7 +2,6 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include <counter_icons.h>
 
 #define MAX_COUNT 99
 #define BOXTIME 2

applications/external/dap_link/dap_link.c

@@ -15,6 +15,7 @@
 #include "usb/dap_v2_usb.h"
 #include <dialogs/dialogs.h>
 #include "dap_link_icons.h"
+#include "assets_icons.h"
 
 /***************************************************************************/
 /****************************** DAP COMMON *********************************/
@@ -524,4 +525,4 @@ int32_t dap_link_app(void* p) {
     dap_app_free(app);
 
     return 0;
-}
+}

applications/external/esp32cam_morseflasher/application.fam

@@ -7,7 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
-    fap_icon_assets="assets",
     fap_icon="icon.png",
     fap_category="GPIO",
     fap_description="ESP32-CAM app to stream a message in morse using the powerful flashlight. [Unplug the USB cable to test with Mayhem]",

applications/external/esp32cam_morseflasher/uart_text_input.c

@@ -1,6 +1,6 @@
 #include "uart_text_input.h"
 #include <gui/elements.h>
-#include "mayhem_morseflash_icons.h"
+#include "assets_icons.h"
 #include <furi.h>
 
 struct UART_TextInput {

applications/external/etch_a_sketch/application.fam

@@ -9,5 +9,4 @@ App(
     order=175,
     fap_icon="etch-a-sketch-icon.png",
     fap_category="Media",
-    fap_libs=["assets"],
 )

applications/external/flipbip/views/flipbip_scene_1.c

@@ -7,6 +7,7 @@
 #include <storage/storage.h>
 #include <string.h>
 #include "flipbip_icons.h"
+#include "assets_icons.h"
 #include "../helpers/flipbip_haptic.h"
 #include "../helpers/flipbip_led.h"
 #include "../helpers/flipbip_string.h"

applications/external/flipbip/views/flipbip_startscreen.c

@@ -4,6 +4,7 @@
 #include <input/input.h>
 #include <gui/elements.h>
 #include "flipbip_icons.h"
+#include "assets_icons.h"
 
 struct FlipBipStartscreen {
     View* view;

applications/external/flipper_i2ctools/views/main_view.h

@@ -2,6 +2,7 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #define APP_NAME "I2C Tools"
 
 #define SCAN_MENU_TEXT "Scan"
@@ -35,4 +36,4 @@ typedef struct {
 void draw_main_view(Canvas* canvas, i2cMainView* main_view);
 
 i2cMainView* i2c_main_view_alloc();
-void i2c_main_view_free(i2cMainView* main_view);
+void i2c_main_view_free(i2cMainView* main_view);

applications/external/flipper_i2ctools/views/scanner_view.h

@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2cscanner.h"
 
 #define SCAN_TEXT "SCAN"
 
-void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);
+void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);

applications/external/flipper_i2ctools/views/sender_view.h

@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2csender.h"
 
 #define SEND_TEXT "SEND"
 
-void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);
+void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);

applications/external/flipper_i2ctools/views/sniffer_view.h

@@ -2,8 +2,9 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <i2c_tools_icons.h>
+#include <assets_icons.h>
 #include "../i2csniffer.h"
 
 #define SNIFF_TEXT "SNIFF"
 
-void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);
+void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);

applications/external/gpioreader_b/application.fam

@@ -7,7 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,
-    fap_libs=["assets"],
     fap_category="GPIO",
     fap_icon="icon.png",
 )

applications/external/hex_editor/hex_editor.c

@@ -12,7 +12,7 @@
 #include <toolbox/stream/file_stream.h>
 
 #include <hex_editor_icons.h>
-// #include <assets_icons.h>
+#include <assets_icons.h>
 
 #define TAG "HexEditor"
 
@@ -354,4 +354,4 @@ int32_t hex_editor_app(void* p) {
     hex_editor_free(hex_editor);
 
     return 0;
-}
+}

applications/external/hid_app/hid.h

@@ -25,6 +25,9 @@
 #include "views/hid_tikshorts.h"
 #include "views/hid_mouse_clicker.h"
 
+#include "hid_icons.h"
+#include <assets_icons.h>
+
 #include "hid_path.h"
 
 typedef enum {

applications/external/hid_app/views/hid_keyboard.c

@@ -3,7 +3,6 @@
 #include <gui/elements.h>
 #include <gui/icon_i.h>
 #include "../hid.h"
-#include "hid_icons.h"
 
 #define TAG "HidKeyboard"
 

applications/external/hid_app/views/hid_keynote.c

@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidKeynote"
 
 struct HidKeynote {

applications/external/hid_app/views/hid_media.c

@@ -5,8 +5,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMedia"
 
 struct HidMedia {

applications/external/hid_app/views/hid_mouse.c

@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouse"
 
 struct HidMouse {

applications/external/hid_app/views/hid_mouse_clicker.c

@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouseClicker"
 #define DEFAULT_CLICK_RATE 1
 #define MAXIMUM_CLICK_RATE 60

applications/external/hid_app/views/hid_mouse_jiggler.c

@@ -2,8 +2,6 @@
 #include <gui/elements.h>
 #include "../hid.h"
 
-#include "hid_icons.h"
-
 #define TAG "HidMouseJiggler"
 
 struct HidMouseJiggler {

applications/external/hid_app/views/hid_numpad.c

@@ -3,7 +3,6 @@
 #include <gui/elements.h>
 #include <gui/icon_i.h>
 #include "../hid.h"
-#include "hid_icons.h"
 
 #define TAG "HidNumpad"
 

applications/external/hid_app/views/hid_tikshorts.c

@@ -2,8 +2,6 @@
 #include "../hid.h"
 #include <gui/elements.h>
 
-#include "hid_icons.h"
-
 #define TAG "HidTikShorts"
 
 struct HidTikShorts {

applications/external/ir_remote/application.fam

@@ -10,5 +10,4 @@ App(
     ],
     fap_category="Tools",
     fap_icon="ir_10px.png",
-    fap_icon_assets="images",
 )

applications/external/ir_remote/infrared_remote_app.c

@@ -6,7 +6,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <dialogs/dialogs.h>
-#include <ir_remote_icons.h>
+#include <assets_icons.h>
 #include <dolphin/dolphin.h>
 
 #include <notification/notification.h>

applications/external/metronome/application.fam

@@ -8,7 +8,6 @@ App(
     ],
     fap_icon="metronome_icon.png",
     fap_category="Media",
-    fap_icon_assets="images",
     stack_size=2 * 1024,
     order=20,
 )

applications/external/metronome/gui_extensions.c

@@ -1,6 +1,6 @@
 #include <gui/canvas.h>
 #include <gui/icon_i.h>
-#include <metronome_icons.h>
+#include <assets_icons.h>
 
 //lib can only do bottom left/right
 void elements_button_top_left(Canvas* canvas, const char* str) {

applications/external/mfkey32/application.fam

@@ -9,7 +9,7 @@ App(
         "storage",
     ],
     stack_size=1 * 1024,
-    fap_icon="mfkey.png",
+    fap_icon="images/mfkey.png",
     fap_category="NFC",
     fap_author="noproto",
     fap_icon_assets="images",

applications/external/mifare_fuzzer/application.fam

@@ -9,7 +9,6 @@ App(
     ],
     stack_size=4 * 1024,
     order=30,
-    fap_icon="images/mifare_fuzzer_10px.png",
+    fap_icon="mifare_fuzzer_10px.png",
     fap_category="NFC",
-    fap_icon_assets="images",
 )

applications/external/mousejacker/application.fam

@@ -11,7 +11,6 @@ App(
     order=60,
     fap_icon="mouse_10px.png",
     fap_category="GPIO",
-    fap_icon_assets="images",
     fap_private_libs=[
         Lib(
             name="nrf24",

applications/external/mousejacker/mousejacker.c

@@ -10,7 +10,7 @@
 #include <furi_hal_resources.h>
 #include <nrf24.h>
 #include "mousejacker_ducky.h"
-#include <nrf24_mouse_jacker_icons.h>
+#include <assets_icons.h>
 #include <dolphin/dolphin.h>
 
 #define TAG "mousejacker"
@@ -112,7 +112,7 @@ static bool open_ducky_script(Stream* stream, PluginState* plugin_state) {
 
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(
-        &browser_options, MOUSEJACKER_APP_PATH_EXTENSION, &I_badusb_10px);
+        &browser_options, MOUSEJACKER_APP_PATH_EXTENSION, &I_badkb_10px);
     browser_options.hide_ext = false;
 
     bool ret = dialog_file_browser_show(dialogs, path, path, &browser_options);

applications/external/multi_fuzzer/application.fam

@@ -11,7 +11,7 @@ App(
         "notification",
     ],
     stack_size=2 * 1024,
-    fap_icon="icons/ibutt_10px.png",
+    fap_icon="ibutt_10px.png",
     fap_category="Tools",
     fap_private_libs=[
         Lib(

applications/external/multi_fuzzer/fuzzer_i.h

@@ -21,6 +21,7 @@
 
 #include <flipper_format/flipper_format_i.h>
 #include "fuzzer_icons.h"
+#include <assets_icons.h>
 
 #define FUZZ_TIME_DELAY_MAX (80)
 
@@ -52,4 +53,4 @@ typedef struct {
 
     FuzzerWorker* worker;
     FuzzerPayload* payload;
-} PacsFuzzerApp;
+} PacsFuzzerApp;

applications/external/music_beeper/application.fam

@@ -12,7 +12,6 @@ App(
     stack_size=2 * 1024,
     order=45,
     fap_icon="music_10px.png",
-    fap_icon_assets="icons",
     fap_category="Media",
 )