Переглянути джерело

T5577Multiwriter: Use system icons and tweak display name

Willy-JL 1 рік тому
батько
коміт
0e0ee7444b

+ 1 - 1
t5577_multiwriter/application.fam

@@ -1,6 +1,6 @@
 App(
     appid="t5577_multiwriter",
-    name="T5577 multiwriter",
+    name="T5577 Multiwriter",
     apptype=FlipperAppType.EXTERNAL,
     targets=["f7"],
     entry_point="t5577_multiwriter_app",

+ 0 - 109
t5577_multiwriter/assets/assets_icons.c

@@ -1,109 +0,0 @@
-#include "assets_icons.h"
-
-#include <gui/icon_i.h>
-
-const uint8_t _I_125_10px_0[] = {
-    0x00, 0xe0, 0x00, 0x00, 0x01, 0x0e, 0x02, 0x31, 0x02, 0x45, 0x02,
-    0x91, 0x00, 0xaa, 0x00, 0x92, 0x00, 0x44, 0x00, 0x38, 0x00,
-};
-const uint8_t* const _I_125_10px[] = {_I_125_10px_0};
-
-const uint8_t _I_DolphinSuccess_91x55_0[] = {
-    0x01, 0x00, 0xb4, 0x01, 0x00, 0x0f, 0x03, 0xfe, 0x0b, 0x9d, 0xc4, 0x02, 0x1e, 0x0b, 0x88, 0x34,
-    0x02, 0x60, 0x0a, 0x7c, 0x04, 0x2c, 0x4a, 0x20, 0xb7, 0xb0, 0x40, 0x40, 0x63, 0x03, 0x05, 0xb6,
-    0xc2, 0x04, 0x03, 0x18, 0x20, 0x2d, 0xab, 0x00, 0x32, 0x84, 0x02, 0xdb, 0x58, 0x03, 0x28, 0x80,
-    0x2d, 0xa2, 0xc0, 0x32, 0x90, 0x02, 0xda, 0x56, 0x0b, 0xa8, 0x28, 0x0c, 0xa8, 0x05, 0xe6, 0x95,
-    0x02, 0xe8, 0x2e, 0x33, 0xe0, 0x5b, 0xf0, 0x21, 0x58, 0x0e, 0x08, 0x40, 0x41, 0x05, 0x44, 0x32,
-    0x0d, 0x02, 0x03, 0x40, 0xbe, 0x40, 0x41, 0x6c, 0x17, 0x19, 0x06, 0x7a, 0x06, 0x0b, 0x2a, 0x05,
-    0x22, 0x84, 0x8e, 0x29, 0x04, 0x3d, 0x1c, 0x29, 0x31, 0xc0, 0x52, 0x24, 0x50, 0x0d, 0x04, 0x2a,
-    0x21, 0x0f, 0x83, 0x82, 0xc8, 0x04, 0x27, 0xc1, 0x0b, 0x8e, 0x43, 0x3e, 0x0b, 0x40, 0x01, 0x05,
-    0xc7, 0x21, 0xff, 0x1a, 0x8f, 0xc4, 0x4c, 0x3b, 0xc8, 0x1c, 0x1a, 0xa1, 0x00, 0xc8, 0x6f, 0xdb,
-    0x23, 0x0f, 0x86, 0x46, 0x20, 0x58, 0x48, 0x0e, 0xc0, 0x2e, 0x50, 0x7e, 0x00, 0xb0, 0x6c, 0x18,
-    0x28, 0x4c, 0x00, 0x2e, 0x32, 0x0b, 0xfc, 0x0e, 0x70, 0x9d, 0x28, 0x14, 0x49, 0xac, 0x25, 0xf1,
-    0xff, 0xc0, 0xc7, 0x82, 0x0b, 0x1c, 0x14, 0x54, 0x2e, 0x54, 0x08, 0x1b, 0xb8, 0xa4, 0x17, 0x8c,
-    0x16, 0x56, 0x0e, 0x17, 0x1c, 0x04, 0x05, 0xdc, 0x53, 0xf1, 0x18, 0x81, 0x04, 0x2e, 0x28, 0xc3,
-    0xf0, 0x0b, 0xc8, 0xd6, 0x21, 0x72, 0x05, 0x94, 0x60, 0x16, 0x81, 0x71, 0x00, 0x1c, 0x1a, 0x41,
-    0x60, 0x81, 0x64, 0x0b, 0xe4, 0xd0, 0x35, 0x00, 0x9a, 0xc6, 0x21, 0x06, 0xac, 0x3e, 0x4e, 0xc1,
-    0x00, 0x10, 0x0f, 0xf2, 0x1f, 0x00, 0xd4, 0x05, 0xc4, 0x16, 0x31, 0x88, 0x04, 0x21, 0xe8, 0x61,
-    0x72, 0x02, 0x0a, 0x40, 0x60, 0x84, 0x11, 0x00, 0x88, 0x5c, 0x9e, 0x02, 0xb2, 0x18, 0x1d, 0x01,
-    0xc6, 0x30, 0x10, 0xb9, 0x40, 0x27, 0xc6, 0x33, 0x77, 0x90, 0x5c, 0x80, 0x04, 0x3c, 0x18, 0x05,
-    0x08, 0x64, 0x35, 0xc2, 0xfa, 0x11, 0x84, 0x16, 0x7a, 0xc9, 0x50, 0x2c, 0xe1, 0x81, 0x14, 0xaf,
-    0x3a, 0x91, 0x30, 0x33, 0xc0, 0x29, 0x6b, 0x82, 0xe7, 0xc0, 0x5a, 0x8d, 0x09, 0xb6, 0x30, 0x0a,
-    0xfc, 0x14, 0x16, 0x5f, 0x80, 0x58, 0xe0, 0x66, 0x01, 0xb1, 0xd7, 0xea, 0x81, 0x65, 0xff, 0x81,
-    0x60, 0x30, 0x10, 0x82, 0x98, 0x85, 0xcf, 0x80, 0x0b, 0x1b, 0x06, 0x02, 0x08, 0x0b, 0x10, 0xb8,
-    0xb4, 0x0a, 0x7e, 0xa4, 0x1c, 0x04, 0x08, 0x2e, 0x8e, 0x22, 0x83, 0x42, 0x1d, 0x26, 0x2f, 0x25,
-    0x28, 0xc0, 0x21, 0xd0, 0x64, 0x28, 0x87, 0xc6, 0xae, 0x4a, 0x14, 0x01, 0x7f, 0xa0, 0x2a, 0xc1,
-    0x23, 0x91, 0x7c, 0x43, 0xc3, 0x00, 0xbf, 0x2e, 0x08, 0x2e, 0x45, 0x22, 0x87, 0x40, 0x1a, 0x62,
-    0xd0, 0x10, 0x88, 0x85, 0xca, 0x01, 0xf0, 0xff, 0xba, 0x0c, 0x16, 0x21, 0x73, 0x54, 0xa3, 0x08,
-    0xb5, 0xeb, 0xf4, 0x05, 0x90, 0xc0, 0x60, 0x11, 0x70, 0xbb, 0x4a, 0x01, 0x65, 0xab, 0x0b, 0xb5,
-    0x50, 0x60, 0x21, 0x78, 0xd5, 0x44, 0x80, 0x62,
-};
-const uint8_t* const _I_DolphinSuccess_91x55[] = {_I_DolphinSuccess_91x55_0};
-
-const uint8_t _I_WarningDolphinFlip_45x42_0[] = {
-    0x01, 0x00, 0xc0, 0x00, 0x84, 0x40, 0x80, 0xb5, 0x01, 0xfe, 0x47, 0xc0, 0xa7, 0x03, 0xb0, 0x01,
-    0x47, 0x11, 0xc0, 0x80, 0x60, 0x20, 0x20, 0x51, 0x90, 0x02, 0x44, 0x34, 0x51, 0x00, 0x10, 0xc1,
-    0x20, 0x14, 0x88, 0x40, 0x6c, 0x80, 0x48, 0x0e, 0x40, 0x29, 0x4f, 0x00, 0xa3, 0x1e, 0x10, 0x0f,
-    0x08, 0x40, 0x32, 0x10, 0x28, 0x8d, 0x07, 0x01, 0x5e, 0xa0, 0x01, 0x46, 0x19, 0x40, 0xdd, 0x81,
-    0x46, 0x1f, 0x30, 0xa0, 0x6e, 0x40, 0xa3, 0x3e, 0xe0, 0x50, 0x37, 0xe0, 0x51, 0xbe, 0x40, 0x00,
-    0xa3, 0x80, 0x80, 0x7e, 0x20, 0x21, 0xd1, 0x02, 0x8f, 0xc0, 0x46, 0x32, 0xf0, 0x28, 0xf8, 0x20,
-    0xf4, 0x08, 0x80, 0x14, 0x78, 0x10, 0xf8, 0x04, 0x80, 0x0a, 0x38, 0x03, 0x79, 0x01, 0x47, 0xfd,
-    0x61, 0x02, 0x9d, 0xe4, 0xde, 0x36, 0x00, 0x28, 0xe0, 0x7f, 0xf1, 0xfc, 0x80, 0x14, 0x4f, 0x23,
-    0x00, 0x02, 0x8c, 0x04, 0xf2, 0x40, 0x52, 0x86, 0x01, 0x4e, 0x07, 0x70, 0x38, 0x14, 0x3c, 0x7e,
-    0x3f, 0xf0, 0x58, 0xc4, 0x20, 0xf0, 0x09, 0xfc, 0x02, 0xe1, 0x20, 0x02, 0x88, 0x90, 0x69, 0x12,
-    0x08, 0x70, 0x14, 0xe5, 0x00, 0x55, 0x8f, 0x01, 0x4b, 0x11, 0x27, 0x8e, 0x01, 0x4a, 0x21, 0x47,
-    0x02, 0x9c, 0x82, 0x81, 0x1c, 0x24, 0x89, 0xf8, 0x70, 0x11, 0x80, 0x2c, 0xc0, 0x23, 0x20, 0x54,
-    0x88, 0x81, 0x52, 0x24,
-};
-const uint8_t* const _I_WarningDolphinFlip_45x42[] = {_I_WarningDolphinFlip_45x42_0};
-
-const uint8_t _I_RFIDDolphinSend_97x61_0[] = {
-    0x01, 0x00, 0x8d, 0x01, 0x00, 0x0f, 0xfa, 0x3e, 0x04, 0x2a, 0x00, 0x2d, 0x78, 0x10, 0x1f, 0x04,
-    0x04, 0x0a, 0x38, 0x00, 0x62, 0xcc, 0x00, 0x43, 0x06, 0x06, 0x44, 0x30, 0x04, 0x31, 0x80, 0x31,
-    0x07, 0x48, 0x00, 0x50, 0x20, 0x10, 0xc8, 0x01, 0x64, 0x0c, 0x1d, 0x04, 0x28, 0x24, 0x83, 0xd2,
-    0x81, 0x04, 0xc4, 0x18, 0x42, 0xc3, 0x01, 0x90, 0x30, 0xbe, 0x05, 0x51, 0x29, 0xa0, 0x74, 0x60,
-    0x80, 0xc1, 0x84, 0x0b, 0x44, 0x5e, 0x43, 0x73, 0x82, 0x41, 0x20, 0x1e, 0x4a, 0x68, 0x31, 0x27,
-    0x90, 0x48, 0x84, 0x20, 0x18, 0x31, 0x7e, 0x64, 0x06, 0x20, 0x0c, 0x2a, 0x14, 0x12, 0x40, 0x0c,
-    0x28, 0xa0, 0xc4, 0x41, 0x87, 0x81, 0x17, 0x08, 0x30, 0xa0, 0xfd, 0x08, 0x0c, 0x20, 0xfc, 0x38,
-    0x08, 0xc4, 0x24, 0x32, 0x95, 0x02, 0x18, 0xc2, 0x61, 0x18, 0x09, 0x20, 0x31, 0x03, 0x25, 0x84,
-    0x1d, 0x88, 0x30, 0x62, 0x21, 0x96, 0xe2, 0x44, 0x22, 0x00, 0xc2, 0x26, 0xa0, 0x64, 0x68, 0x80,
-    0xc4, 0x33, 0x9e, 0x92, 0x9f, 0x00, 0xa3, 0x48, 0x24, 0x00, 0xc4, 0x40, 0xa4, 0xa8, 0x18, 0xa9,
-    0xb5, 0x9b, 0x48, 0x28, 0x05, 0xa1, 0x06, 0x22, 0xd4, 0xa3, 0x7e, 0x05, 0x98, 0xe0, 0x4f, 0x22,
-    0xcf, 0x58, 0x6f, 0x80, 0x10, 0x34, 0x24, 0x31, 0x3a, 0x52, 0x0f, 0xe0, 0x03, 0x0c, 0xf1, 0xee,
-    0x2d, 0x63, 0x00, 0x0c, 0x0f, 0xe0, 0x13, 0x28, 0xa0, 0x31, 0xa0, 0x3f, 0x08, 0x18, 0x10, 0x45,
-    0xa2, 0xe3, 0x40, 0x00, 0xf4, 0x3f, 0xe1, 0xa1, 0x84, 0x02, 0x94, 0x18, 0xb0, 0xc0, 0x63, 0xc6,
-    0x3f, 0xe0, 0x31, 0x87, 0x03, 0x1e, 0x11, 0x3c, 0x80, 0x47, 0xc1, 0x90, 0x56, 0x1b, 0x06, 0x01,
-    0xc0, 0x20, 0x06, 0x17, 0x88, 0xf8, 0x60, 0xa0, 0xc7, 0x31, 0x8a, 0x58, 0x60, 0xe1, 0x99, 0x00,
-    0x08, 0x9a, 0x01, 0x06, 0xd9, 0x10, 0x03, 0x1f, 0x44, 0x19, 0x43, 0xc3, 0x40, 0xc4, 0x2c, 0x19,
-    0x58, 0x08, 0x29, 0xa0, 0x60, 0x0c, 0xf2, 0x00, 0x27, 0x02, 0x05, 0x20, 0x06, 0x4d, 0x02, 0x0b,
-    0xc0, 0x02, 0x08, 0x3c, 0x80, 0x09, 0xa0, 0x39, 0x0a, 0xd4, 0x41, 0x8f, 0x50, 0x05, 0x09, 0xa4,
-    0x5b, 0x4d, 0x00, 0xd8, 0x23, 0xc4, 0x96, 0x20, 0xc7, 0xac, 0x40, 0x2d, 0x53, 0x00, 0x64, 0x6b,
-    0x20, 0x1d, 0x4a, 0x08, 0x32, 0x2a, 0x90, 0x0d, 0x46, 0x0e, 0x02, 0x0c, 0x79, 0x51, 0x08, 0x61,
-    0xf0, 0x20, 0x63, 0xc5, 0x4b, 0x83, 0x1e, 0xfe, 0x57, 0xd3, 0x51, 0x40, 0xbe, 0xc0, 0x08, 0x42,
-    0x00, 0x53, 0x30, 0xe8, 0x3f, 0x50, 0x14, 0x73, 0x80, 0x0b, 0xeb, 0x07, 0x61, 0x40, 0x00, 0x7d,
-    0x5f, 0xf8, 0x38, 0x32, 0x7a, 0x03, 0xf7, 0x55, 0xa6, 0x78, 0x19, 0x54, 0x0c, 0xa8, 0x32, 0xa0,
-    0x19, 0xa0, 0x65, 0xc4, 0x0b, 0xe2, 0x00, 0x98, 0x40, 0x33, 0xc1, 0x92, 0xfa, 0x10, 0x67, 0x80,
-    0x08,
-};
-const uint8_t* const _I_RFIDDolphinSend_97x61[] = {_I_RFIDDolphinSend_97x61_0};
-
-const Icon I_DolphinSuccess_91x55 = {
-    .width = 91,
-    .height = 55,
-    .frame_count = 1,
-    .frame_rate = 0,
-    .frames = _I_DolphinSuccess_91x55};
-const Icon I_WarningDolphinFlip_45x42 = {
-    .width = 45,
-    .height = 42,
-    .frame_count = 1,
-    .frame_rate = 0,
-    .frames = _I_WarningDolphinFlip_45x42};
-const Icon I_RFIDDolphinSend_97x61 = {
-    .width = 97,
-    .height = 61,
-    .frame_count = 1,
-    .frame_rate = 0,
-    .frames = _I_RFIDDolphinSend_97x61};
-const Icon I_125_10px =
-    {.width = 10, .height = 10, .frame_count = 1, .frame_rate = 0, .frames = _I_125_10px};

+ 0 - 8
t5577_multiwriter/assets/assets_icons.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gui/icon.h>
-
-extern const Icon I_125_10px;
-extern const Icon I_DolphinSuccess_91x55;
-extern const Icon I_WarningDolphinFlip_45x42;
-extern const Icon I_RFIDDolphinSend_97x61;

+ 1 - 1
t5577_multiwriter/t5577_multiwriter_i.h

@@ -5,7 +5,7 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
-#include "assets/assets_icons.h"
+#include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <cli/cli.h>