diff options
| author | あく <alleteam@gmail.com> | 2021-07-07 11:57:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 11:57:49 +0300 |
| commit | a7283280eff93f22c8fc1b65573ae0a6447e94bf (patch) | |
| tree | 89501b407baf96f3070de9e893ab1be467201d16 /applications/bt | |
| parent | 607e873404d746c692c38482f03c54ed3edce26c (diff) | |
GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon Api (#566)
* GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon API.
* Gui: icon and animation draw now do not accept null pointer
* Format Sources
* Fix no debug build
* Furi: stricter checks in memmgr
Diffstat (limited to 'applications/bt')
| -rw-r--r-- | applications/bt/bt.c | 4 | ||||
| -rw-r--r-- | applications/bt/bt_i.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/bt/bt.c b/applications/bt/bt.c index 3eaf86cd..5a27b31c 100644 --- a/applications/bt/bt.c +++ b/applications/bt/bt.c @@ -45,7 +45,7 @@ Bt* bt_alloc() { view_port_enabled_set(bt->statusbar_view_port, false); gui_add_view_port(bt->gui, bt->statusbar_view_port, GuiLayerStatusBarLeft); - bt->menu_icon = assets_icons_get(A_Bluetooth_14); + bt->menu_icon = icon_animation_alloc(&A_Bluetooth_14); bt->menu_item = menu_item_alloc_menu("Bluetooth", bt->menu_icon); menu_item_subitem_add( bt->menu_item, menu_item_alloc_function("Carrier test", NULL, bt_menu_test_carrier, bt)); @@ -104,7 +104,7 @@ Bt* bt_alloc() { } void bt_draw_statusbar_callback(Canvas* canvas, void* context) { - canvas_draw_icon_name(canvas, 0, 0, I_Bluetooth_5x8); + canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_5x8); } void bt_menu_test_carrier(void* context) { diff --git a/applications/bt/bt_i.h b/applications/bt/bt_i.h index 1d102fdb..8d45836b 100644 --- a/applications/bt/bt_i.h +++ b/applications/bt/bt_i.h @@ -27,7 +27,7 @@ struct Bt { // Status bar ViewPort* statusbar_view_port; // Menu - Icon* menu_icon; + IconAnimation* menu_icon; MenuItem* menu_item; View* view_test_carrier; View* view_test_packet_tx; |