[FL-2937] Remove resources from API to prevent frequent API version increase (#1935)

* Remove all icons from API * Music player: icons * Signal generator: icons * Bt hid: icons * Weather station: icons * Picopass: icons * File browser test: icons * Example images: documentation * Remove global assets header * Fix picopass Co-authored-by: あく <alleteam@gmail.com>
2022-10-29 00:08:50 +10:00
parent 492f147568
commit 3434305630
73 changed files with 74 additions and 195 deletions
--- a/applications/debug/file_browser_test/application.fam
+++ b/applications/debug/file_browser_test/application.fam
@@ -8,4 +8,5 @@ App(
    stack_size=2 * 1024,
    order=150,
    fap_category="Debug",
+    fap_icon_assets="icons",
 )
--- a/applications/debug/file_browser_test/file_browser_app.c
+++ b/applications/debug/file_browser_test/file_browser_app.c
@@ -1,4 +1,4 @@
-#include "assets_icons.h"
+#include <file_browser_test_icons.h>
 #include "file_browser_app_i.h"
 #include "gui/modules/file_browser.h"
 #include <furi.h>
--- a/applications/debug/file_browser_test/icons/badusb_10px.png
+++ b/applications/debug/file_browser_test/icons/badusb_10px.png
--- a/applications/examples/example_images/ReadMe.md
+++ b/applications/examples/example_images/ReadMe.md
@@ -0,0 +1,24 @@
+# Application icons
+To use icons, do the following:
+* add a line to the application manifest: `fap_icon_assets="folder"`, where `folder` points to the folder where your icons are located
+* add `#include "application_id_icons.h"` to the application code, where `application_id` is the appid from the manifest
+* every icon in the folder will be available as a `I_icon_name` variable, where `icon_name` is the name of the icon file without the extension
+
+## Example
+We have an application with the following manifest:
+```
+App(
+    appid="example_images",
+    ...
+    fap_icon_assets="images",
+)
+```
+
+So the icons are in the `images` folder and will be available in the generated `example_images_icons.h` file.
+
+The example code is located in `example_images_main.c` and contains the following line:
+```
+#include "example_images_icons.h"
+```
+
+Image `dolphin_71x25.png` is available as `I_dolphin_71x25`.
--- a/applications/main/bad_usb/bad_usb_app_i.h
+++ b/applications/main/bad_usb/bad_usb_app_i.h
@@ -5,6 +5,7 @@
 #include "bad_usb_script.h"

 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -1,6 +1,7 @@
 #include "bad_usb_view.h"
 #include "../bad_usb_script.h"
 #include <gui/elements.h>
+#include <assets_icons.h>

 #define MAX_NAME_LEN 64

--- a/applications/main/fap_loader/fap_loader_app.c
+++ b/applications/main/fap_loader/fap_loader_app.c
@@ -1,5 +1,6 @@
 #include <furi.h>
 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <storage/storage.h>
 #include <gui/modules/loading.h>
--- a/applications/main/gpio/gpio_app_i.h
+++ b/applications/main/gpio/gpio_app_i.h
@@ -15,6 +15,7 @@
 #include <gui/modules/widget.h>
 #include "views/gpio_test.h"
 #include "views/gpio_usb_uart.h"
+#include <assets_icons.h>

 struct GpioApp {
    Gui* gui;
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -4,6 +4,7 @@

 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <notification/notification_messages.h>
--- a/applications/main/infrared/infrared_i.h
+++ b/applications/main/infrared/infrared_i.h
@@ -2,6 +2,7 @@

 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_stack.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -5,6 +5,7 @@

 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>
--- a/applications/main/lfrfid/views/lfrfid_view_read.c
+++ b/applications/main/lfrfid/views/lfrfid_view_read.c
@@ -1,5 +1,6 @@
 #include "lfrfid_view_read.h"
 #include <gui/elements.h>
+#include <assets_icons.h>

 #define TEMP_STR_LEN 128

--- a/applications/main/nfc/nfc_i.h
+++ b/applications/main/nfc/nfc_i.h
@@ -7,6 +7,7 @@

 #include <gui/gui.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>
--- a/applications/main/nfc/views/detect_reader.c
+++ b/applications/main/nfc/views/detect_reader.c
@@ -1,5 +1,5 @@
 #include "detect_reader.h"
-
+#include <assets_icons.h>
 #include <gui/elements.h>

 struct DetectReader {
--- a/applications/main/subghz/subghz_i.h
+++ b/applications/main/subghz/subghz_i.h
@@ -13,6 +13,7 @@
 #include "views/subghz_test_packet.h"

 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <dialogs/dialogs.h>
 #include <gui/scene_manager.h>
 #include <notification/notification_messages.h>
--- a/applications/main/u2f/u2f_app_i.h
+++ b/applications/main/u2f/u2f_app_i.h
@@ -4,6 +4,7 @@
 #include "scenes/u2f_scene.h"

 #include <gui/gui.h>
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -1,5 +1,6 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
+#include <assets_icons.h>

 struct U2fView {
    View* view;
--- a/applications/plugins/bt_hid_app/assets/ButtonDown_7x4.png
+++ b/applications/plugins/bt_hid_app/assets/ButtonDown_7x4.png
--- a/applications/plugins/bt_hid_app/assets/ButtonLeft_4x7.png
+++ b/applications/plugins/bt_hid_app/assets/ButtonLeft_4x7.png
--- a/applications/plugins/bt_hid_app/assets/ButtonRight_4x7.png
+++ b/applications/plugins/bt_hid_app/assets/ButtonRight_4x7.png
--- a/applications/plugins/bt_hid_app/assets/ButtonUp_7x4.png
+++ b/applications/plugins/bt_hid_app/assets/ButtonUp_7x4.png
--- a/applications/plugins/bt_hid_app/assets/Ok_btn_9x9.png
+++ b/applications/plugins/bt_hid_app/assets/Ok_btn_9x9.png
--- a/applications/plugins/bt_hid_app/assets/Pin_arrow_down_7x9.png
+++ b/applications/plugins/bt_hid_app/assets/Pin_arrow_down_7x9.png
--- a/applications/plugins/bt_hid_app/assets/Pin_arrow_left_9x7.png
+++ b/applications/plugins/bt_hid_app/assets/Pin_arrow_left_9x7.png
--- a/applications/plugins/bt_hid_app/assets/Pin_arrow_right_9x7.png
+++ b/applications/plugins/bt_hid_app/assets/Pin_arrow_right_9x7.png
--- a/applications/plugins/bt_hid_app/assets/Pin_arrow_up_7x9.png
+++ b/applications/plugins/bt_hid_app/assets/Pin_arrow_up_7x9.png
--- a/applications/plugins/bt_hid_app/assets/Pin_back_arrow_10x8.png
+++ b/applications/plugins/bt_hid_app/assets/Pin_back_arrow_10x8.png
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -11,8 +11,9 @@ App(
    provides=["music_player_start"],
    stack_size=2 * 1024,
    order=20,
-    fap_icon="../../../assets/icons/Archive/music_10px.png",
+    fap_icon="icons/music_10px.png",
    fap_category="Misc",
+    fap_icon_assets="icons",
 )

 App(
--- a/applications/plugins/music_player/icons/music_10px.png
+++ b/applications/plugins/music_player/icons/music_10px.png
--- a/applications/plugins/music_player/music_player.c
+++ b/applications/plugins/music_player/music_player.c
@@ -3,7 +3,7 @@
 #include <furi.h>
 #include <furi_hal.h>

-#include <assets_icons.h>
+#include <music_player_icons.h>
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
--- a/applications/plugins/picopass/application.fam
+++ b/applications/plugins/picopass/application.fam
@@ -17,4 +17,5 @@ App(
            name="loclass",
        ),
    ],
+    fap_icon_assets="icons",
 )
--- a/applications/plugins/picopass/icons/DolphinMafia_115x62.png
+++ b/applications/plugins/picopass/icons/DolphinMafia_115x62.png
--- a/applications/plugins/picopass/icons/DolphinNice_96x59.png
+++ b/applications/plugins/picopass/icons/DolphinNice_96x59.png
--- a/applications/plugins/picopass/icons/Nfc_10px.png
+++ b/applications/plugins/picopass/icons/Nfc_10px.png
--- a/applications/plugins/picopass/icons/RFIDDolphinReceive_97x61.png
+++ b/applications/plugins/picopass/icons/RFIDDolphinReceive_97x61.png
--- a/applications/plugins/picopass/icons/RFIDDolphinSend_97x61.png
+++ b/applications/plugins/picopass/icons/RFIDDolphinSend_97x61.png
--- a/applications/plugins/picopass/picopass_device.c
+++ b/applications/plugins/picopass/picopass_device.c
@@ -2,6 +2,7 @@

 #include <toolbox/path.h>
 #include <flipper_format/flipper_format.h>
+#include <picopass_icons.h>

 #define TAG "PicopassDevice"

--- a/applications/plugins/picopass/picopass_i.h
+++ b/applications/plugins/picopass/picopass_i.h
@@ -24,6 +24,7 @@

 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
+#include <picopass_icons.h>

 #define PICOPASS_TEXT_STORE_SIZE 128

--- a/applications/plugins/signal_generator/application.fam
+++ b/applications/plugins/signal_generator/application.fam
@@ -9,4 +9,5 @@ App(
    order=50,
    fap_icon="signal_gen_10px.png",
    fap_category="Tools",
+    fap_icon_assets="icons",
 )
--- a/applications/plugins/signal_generator/icons/SmallArrowDown_3x5.png
+++ b/applications/plugins/signal_generator/icons/SmallArrowDown_3x5.png
--- a/applications/plugins/signal_generator/icons/SmallArrowUp_3x5.png
+++ b/applications/plugins/signal_generator/icons/SmallArrowUp_3x5.png
--- a/applications/plugins/signal_generator/views/signal_gen_pwm.c
+++ b/applications/plugins/signal_generator/views/signal_gen_pwm.c
@@ -1,6 +1,7 @@
 #include "../signal_gen_app_i.h"
 #include "furi_hal.h"
 #include <gui/elements.h>
+#include <signal_generator_icons.h>

 typedef enum {
    LineIndexChannel,
--- a/applications/plugins/weather_station/images/Lock_7x8.png
+++ b/applications/plugins/weather_station/images/Lock_7x8.png
--- a/applications/plugins/weather_station/images/Pin_back_arrow_10x8.png
+++ b/applications/plugins/weather_station/images/Pin_back_arrow_10x8.png
--- a/applications/plugins/weather_station/images/Quest_7x8.png
+++ b/applications/plugins/weather_station/images/Quest_7x8.png
--- a/applications/plugins/weather_station/images/Scanning_123x52.png
+++ b/applications/plugins/weather_station/images/Scanning_123x52.png
--- a/applications/plugins/weather_station/images/Unlock_7x8.png
+++ b/applications/plugins/weather_station/images/Unlock_7x8.png
--- a/applications/plugins/weather_station/images/WarningDolphin_45x42.png
+++ b/applications/plugins/weather_station/images/WarningDolphin_45x42.png
--- a/applications/plugins/weather_station/views/weather_station_receiver.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver.c
@@ -1,11 +1,10 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include "weather_station_icons.h"
+#include <weather_station_icons.h>
 #include <math.h>

 #include <input/input.h>
 #include <gui/elements.h>
-#include <assets_icons.h>
 #include <m-array.h>

 #define FRAME_HEIGHT 12
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -4,6 +4,7 @@

 #include <notification/notification_messages.h>
 #include <gui/elements.h>
+#include <assets_icons.h>

 #define TAG "BtSrv"

--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -1,5 +1,6 @@
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>

 #include "../desktop_i.h"
 #include "desktop_view_lock_menu.h"
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -4,6 +4,7 @@
 #include <gui/elements.h>
 #include <gui/icon.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <portmacro.h>

 #include <desktop/desktop_settings.h>
--- a/applications/services/desktop/views/desktop_view_pin_input.c
+++ b/applications/services/desktop/views/desktop_view_pin_input.c
@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <gui/view.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <stdint.h>
 #include <portmacro.h>

--- a/applications/services/dialogs/dialogs_api.c
+++ b/applications/services/dialogs/dialogs_api.c
@@ -1,6 +1,7 @@
 #include "dialogs/dialogs_message.h"
 #include "dialogs_i.h"
 #include "dialogs_api_lock.h"
+#include <assets_icons.h>

 /****************** File browser ******************/

--- a/applications/services/gui/canvas.h
+++ b/applications/services/gui/canvas.h
@@ -7,7 +7,7 @@

 #include <stdint.h>
 #include <gui/icon_animation.h>
-#include <assets_icons.h>
+#include <gui/icon.h>

 #ifdef __cplusplus
 extern "C" {
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -1,5 +1,6 @@
 #include "gui/canvas.h"
 #include "gui_i.h"
+#include <assets_icons.h>

 #define TAG "GuiSrv"

--- a/applications/services/gui/icon_animation.h
+++ b/applications/services/gui/icon_animation.h
@@ -7,7 +7,7 @@

 #include <stdint.h>
 #include <stdbool.h>
-#include <assets_icons.h>
+#include <gui/icon.h>

 #ifdef __cplusplus
 extern "C" {
--- a/applications/services/gui/modules/button_menu.c
+++ b/applications/services/gui/modules/button_menu.c
@@ -5,6 +5,7 @@
 #include <m-array.h>
 #include <furi.h>
 #include <stdint.h>
+#include <assets_icons.h>

 #define ITEM_FIRST_OFFSET 17
 #define ITEM_NEXT_OFFSET 4
--- a/applications/services/gui/modules/byte_input.c
+++ b/applications/services/gui/modules/byte_input.c
@@ -1,6 +1,7 @@
-#include "byte_input.h"
-#include <gui/elements.h>
 #include <furi.h>
+#include <gui/elements.h>
+#include <assets_icons.h>
+#include "byte_input.h"

 struct ByteInput {
    View* view;
--- a/applications/services/gui/modules/menu.c
+++ b/applications/services/gui/modules/menu.c
@@ -2,6 +2,7 @@

 #include <m-array.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>

 struct Menu {
--- a/applications/services/gui/modules/text_input.c
+++ b/applications/services/gui/modules/text_input.c
@@ -1,5 +1,6 @@
 #include "text_input.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>

 struct TextInput {
--- a/applications/services/power/power_service/power_i.h
+++ b/applications/services/power/power_service/power_i.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <gui/view_dispatcher.h>
 #include <gui/gui.h>
+#include <assets_icons.h>

 #include <gui/modules/popup.h>
 #include "views/power_off.h"
--- a/applications/services/power/power_service/views/power_off.c
+++ b/applications/services/power/power_service/views/power_off.c
@@ -1,6 +1,7 @@
 #include "power_off.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>

 struct PowerOff {
    View* view;
--- a/applications/services/power/power_service/views/power_unplug_usb.c
+++ b/applications/services/power/power_service/views/power_unplug_usb.c
@@ -1,6 +1,7 @@
 #include "power_unplug_usb.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>

 struct PowerUnplugUsb {
    View* view;
--- a/applications/services/storage/storage.c
+++ b/applications/services/storage/storage.c
@@ -5,6 +5,7 @@
 #include "storage/storage_glue.h"
 #include "storages/storage_int.h"
 #include "storages/storage_ext.h"
+#include <assets_icons.h>

 #define STORAGE_TICK 1000

--- a/applications/settings/about/about.c
+++ b/applications/settings/about/about.c
@@ -3,6 +3,7 @@
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>
 #include <gui/modules/empty_screen.h>
+#include <assets_icons.h>
 #include <furi_hal_version.h>
 #include <furi_hal_region.h>
 #include <furi_hal_bt.h>
--- a/applications/settings/bt_settings_app/bt_settings_app.h
+++ b/applications/settings/bt_settings_app/bt_settings_app.h
@@ -6,6 +6,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>

 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/dialog_ex.h>
--- a/applications/settings/desktop_settings/desktop_settings_app.h
+++ b/applications/settings/desktop_settings/desktop_settings_app.h
@@ -7,6 +7,7 @@
 #include <gui/modules/submenu.h>
 #include <gui/modules/variable_item_list.h>
 #include <dialogs/dialogs.h>
+#include <assets_icons.h>

 #include <desktop/desktop_settings.h>
 #include <desktop/views/desktop_view_pin_input.h>
--- a/applications/settings/power_settings_app/power_settings_app.h
+++ b/applications/settings/power_settings_app/power_settings_app.h
@@ -6,6 +6,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>

 #include "views/battery_info.h"
 #include <gui/modules/submenu.h>
--- a/applications/settings/power_settings_app/views/battery_info.c
+++ b/applications/settings/power_settings_app/views/battery_info.c
@@ -1,6 +1,7 @@
 #include "battery_info.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>

 struct BatteryInfo {
    View* view;
--- a/applications/settings/storage_settings/storage_settings.h
+++ b/applications/settings/storage_settings/storage_settings.h
@@ -4,6 +4,7 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
+#include <assets_icons.h>
 #include <notification/notification_messages.h>

 #include <gui/modules/submenu.h>
--- a/applications/system/updater/views/updater_main.c
+++ b/applications/system/updater/views/updater_main.c
@@ -2,6 +2,7 @@
 #include <gui/view.h>
 #include <gui/elements.h>
 #include <gui/canvas.h>
+#include <assets_icons.h>
 #include <furi.h>
 #include <input/input.h>