Merge branch 'icons'

RogueMaster · Oct 28, 2022 · ed49dcb · ed49dcb
2 parents 936023c + 7c2863d
commit ed49dcb
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 1 deletion.
diff --git a/application.fam b/application.fam
@@ -9,4 +9,5 @@ App(
     order=11,
     fap_icon="subbrute_10px.png",
     fap_category="Tools",
+    fap_icon_assets="images",
 )
diff --git a/images/ButtonDown_7x4.png b/images/ButtonDown_7x4.png
diff --git a/images/ButtonUp_7x4.png b/images/ButtonUp_7x4.png
diff --git a/images/DolphinNice_96x59.png b/images/DolphinNice_96x59.png
diff --git a/images/Sub1ghz_14/frame_01.png b/images/Sub1ghz_14/frame_01.png
diff --git a/images/Sub1ghz_14/frame_02.png b/images/Sub1ghz_14/frame_02.png
diff --git a/images/Sub1ghz_14/frame_03.png b/images/Sub1ghz_14/frame_03.png
diff --git a/images/Sub1ghz_14/frame_04.png b/images/Sub1ghz_14/frame_04.png
diff --git a/images/Sub1ghz_14/frame_05.png b/images/Sub1ghz_14/frame_05.png
diff --git a/images/Sub1ghz_14/frame_06.png b/images/Sub1ghz_14/frame_06.png
diff --git a/images/Sub1ghz_14/frame_rate b/images/Sub1ghz_14/frame_rate
@@ -0,0 +1 @@
+3
diff --git a/images/sub1_10px.png b/images/sub1_10px.png
diff --git a/subbrute_i.h b/subbrute_i.h
@@ -16,6 +16,8 @@
 #include <gui/modules/widget.h>
 #include <gui/modules/loading.h>
 
+#include <SubGHz_Bruteforcer_icons.h>
+
 #include <dialogs/dialogs.h>
 
 #include <notification/notification.h>

diff --git a/views/subbrute_main_view.c b/views/subbrute_main_view.c
@@ -5,7 +5,6 @@
 #include <input/input.h>
 #include <gui/elements.h>
 #include <gui/icon.h>
-#include <assets_icons.h>
 
 #define STATUS_BAR_Y_SHIFT 14
 #define TAG "SubBruteMainView"