liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon Api (#566)

Browse Source 
* 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
This commit is contained in:
あく
2021-07-07 11:57:49 +03:00
committed by GitHub
parent 607e873404
commit a7283280ef
82 changed files with 1093 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/bt/bt.c
View File

@@ -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) {

2
applications/bt/bt_i.h
View File

@@ -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;