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/irda | |
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/irda')
10 files changed, 44 insertions, 18 deletions
diff --git a/applications/irda/irda_app_old.c b/applications/irda/irda_app_old.c index 991d068e..6a5d5716 100644 --- a/applications/irda/irda_app_old.c +++ b/applications/irda/irda_app_old.c @@ -285,8 +285,7 @@ void irda_rx_callback(void* ctx, bool level, uint32_t duration) { if(message) { event.value.rx = *message; - osStatus_t result = osMessageQueuePut(isr_context->event_queue, &event, 0, 0); - furi_assert(osOK == result); + furi_check(osMessageQueuePut(isr_context->event_queue, &event, 0, 0) == osOK); } } diff --git a/applications/irda/scene/irda-app-scene-edit-delete-done.cpp b/applications/irda/scene/irda-app-scene-edit-delete-done.cpp index 927ac9ea..fa5422dd 100644 --- a/applications/irda/scene/irda-app-scene-edit-delete-done.cpp +++ b/applications/irda/scene/irda-app-scene-edit-delete-done.cpp @@ -4,7 +4,7 @@ void IrdaAppSceneEditDeleteDone::on_enter(IrdaApp* app) { IrdaAppViewManager* view_manager = app->get_view_manager(); Popup* popup = view_manager->get_popup(); - popup_set_icon(popup, 0, 2, I_DolphinMafia_115x62); + popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); popup_set_text(popup, "Deleted", 83, 19, AlignLeft, AlignBottom); popup_set_callback(popup, IrdaApp::popup_callback); diff --git a/applications/irda/scene/irda-app-scene-edit-delete.cpp b/applications/irda/scene/irda-app-scene-edit-delete.cpp index 54880a92..da817cba 100644 --- a/applications/irda/scene/irda-app-scene-edit-delete.cpp +++ b/applications/irda/scene/irda-app-scene-edit-delete.cpp @@ -41,7 +41,7 @@ void IrdaAppSceneEditDelete::on_enter(IrdaApp* app) { } dialog_ex_set_text(dialog_ex, app->get_text_store(0), 64, 32, AlignCenter, AlignCenter); - dialog_ex_set_icon(dialog_ex, 0, 0, I_Empty_1x1); + dialog_ex_set_icon(dialog_ex, 0, 0, NULL); dialog_ex_set_left_button_text(dialog_ex, "Back"); dialog_ex_set_right_button_text(dialog_ex, "Delete"); dialog_ex_set_result_callback(dialog_ex, dialog_result_callback); diff --git a/applications/irda/scene/irda-app-scene-edit-rename-done.cpp b/applications/irda/scene/irda-app-scene-edit-rename-done.cpp index 7e95f2f0..8e547f94 100644 --- a/applications/irda/scene/irda-app-scene-edit-rename-done.cpp +++ b/applications/irda/scene/irda-app-scene-edit-rename-done.cpp @@ -4,7 +4,7 @@ void IrdaAppSceneEditRenameDone::on_enter(IrdaApp* app) { IrdaAppViewManager* view_manager = app->get_view_manager(); Popup* popup = view_manager->get_popup(); - popup_set_icon(popup, 32, 5, I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_text(popup, "Saved!", 13, 22, AlignLeft, AlignTop); diff --git a/applications/irda/scene/irda-app-scene-learn-done-after.cpp b/applications/irda/scene/irda-app-scene-learn-done-after.cpp index 3dec349f..b7ff57d6 100644 --- a/applications/irda/scene/irda-app-scene-learn-done-after.cpp +++ b/applications/irda/scene/irda-app-scene-learn-done-after.cpp @@ -5,7 +5,7 @@ void IrdaAppSceneLearnDoneAfter::on_enter(IrdaApp* app) { auto view_manager = app->get_view_manager(); auto popup = view_manager->get_popup(); - popup_set_icon(popup, 0, 30, I_IrdaSendShort_128x34); + popup_set_icon(popup, 0, 30, &I_IrdaSendShort_128x34); popup_set_text( popup, "Get ready!\nPoint flipper at target.", 64, 16, AlignCenter, AlignCenter); diff --git a/applications/irda/scene/irda-app-scene-learn-done.cpp b/applications/irda/scene/irda-app-scene-learn-done.cpp index 207c5616..f411af5d 100644 --- a/applications/irda/scene/irda-app-scene-learn-done.cpp +++ b/applications/irda/scene/irda-app-scene-learn-done.cpp @@ -4,7 +4,7 @@ void IrdaAppSceneLearnDone::on_enter(IrdaApp* app) { IrdaAppViewManager* view_manager = app->get_view_manager(); Popup* popup = view_manager->get_popup(); - popup_set_icon(popup, 32, 5, I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); if(app->get_learn_new_remote()) { popup_set_text(popup, "New remote\ncreated!", 5, 7, AlignLeft, AlignTop); diff --git a/applications/irda/scene/irda-app-scene-learn-success.cpp b/applications/irda/scene/irda-app-scene-learn-success.cpp index a92da097..8b20f065 100644 --- a/applications/irda/scene/irda-app-scene-learn-success.cpp +++ b/applications/irda/scene/irda-app-scene-learn-success.cpp @@ -33,7 +33,7 @@ void IrdaAppSceneLearnSuccess::on_enter(IrdaApp* app) { dialog_ex_set_left_button_text(dialog_ex, "Retry"); dialog_ex_set_right_button_text(dialog_ex, "Save"); dialog_ex_set_center_button_text(dialog_ex, "Send"); - dialog_ex_set_icon(dialog_ex, 0, 1, I_DolphinExcited_64x63); + dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinExcited_64x63); dialog_ex_set_result_callback(dialog_ex, dialog_result_callback); dialog_ex_set_context(dialog_ex, app); diff --git a/applications/irda/scene/irda-app-scene-learn.cpp b/applications/irda/scene/irda-app-scene-learn.cpp index b369df6f..890a523f 100644 --- a/applications/irda/scene/irda-app-scene-learn.cpp +++ b/applications/irda/scene/irda-app-scene-learn.cpp @@ -9,7 +9,7 @@ void IrdaAppSceneLearn::on_enter(IrdaApp* app) { auto popup = view_manager->get_popup(); - popup_set_icon(popup, 0, 32, I_IrdaLearnShort_128x31); + popup_set_icon(popup, 0, 32, &I_IrdaLearnShort_128x31); popup_set_text( popup, "Point the remote at IR port\nand push the button", 5, 10, AlignLeft, AlignCenter); popup_set_callback(popup, NULL); diff --git a/applications/irda/scene/irda-app-scene-universal-tv.cpp b/applications/irda/scene/irda-app-scene-universal-tv.cpp index ac878e07..6723990e 100644 --- a/applications/irda/scene/irda-app-scene-universal-tv.cpp +++ b/applications/irda/scene/irda-app-scene-universal-tv.cpp @@ -8,11 +8,29 @@ void IrdaAppSceneUniversalTV::on_enter(IrdaApp* app) { int i = 0; button_panel_add_item( - button_panel, i, 0, 0, 3, 19, I_Power_25x27, I_Power_hvr_25x27, irda_app_item_callback, app); + button_panel, + i, + 0, + 0, + 3, + 19, + &I_Power_25x27, + &I_Power_hvr_25x27, + irda_app_item_callback, + app); brute_force.add_record(i, "POWER"); ++i; button_panel_add_item( - button_panel, i, 1, 0, 36, 19, I_Mute_25x27, I_Mute_hvr_25x27, irda_app_item_callback, app); + button_panel, + i, + 1, + 0, + 36, + 19, + &I_Mute_25x27, + &I_Mute_hvr_25x27, + irda_app_item_callback, + app); brute_force.add_record(i, "MUTE"); ++i; button_panel_add_item( @@ -22,14 +40,14 @@ void IrdaAppSceneUniversalTV::on_enter(IrdaApp* app) { 1, 3, 66, - I_Vol_up_25x27, - I_Vol_up_hvr_25x27, + &I_Vol_up_25x27, + &I_Vol_up_hvr_25x27, irda_app_item_callback, app); brute_force.add_record(i, "VOL+"); ++i; button_panel_add_item( - button_panel, i, 1, 1, 36, 66, I_Up_25x27, I_Up_hvr_25x27, irda_app_item_callback, app); + button_panel, i, 1, 1, 36, 66, &I_Up_25x27, &I_Up_hvr_25x27, irda_app_item_callback, app); brute_force.add_record(i, "CH+"); ++i; button_panel_add_item( @@ -39,14 +57,23 @@ void IrdaAppSceneUniversalTV::on_enter(IrdaApp* app) { 2, 3, 98, - I_Vol_down_25x27, - I_Vol_down_hvr_25x27, + &I_Vol_down_25x27, + &I_Vol_down_hvr_25x27, irda_app_item_callback, app); brute_force.add_record(i, "VOL-"); ++i; button_panel_add_item( - button_panel, i, 1, 2, 36, 98, I_Down_25x27, I_Down_hvr_25x27, irda_app_item_callback, app); + button_panel, + i, + 1, + 2, + 36, + 98, + &I_Down_25x27, + &I_Down_hvr_25x27, + irda_app_item_callback, + app); brute_force.add_record(i, "CH-"); button_panel_add_label(button_panel, 6, 11, FontPrimary, "TV remote"); diff --git a/applications/irda/view/irda-app-brut-view.c b/applications/irda/view/irda-app-brut-view.c index 39cf8a62..8d53f90e 100644 --- a/applications/irda/view/irda-app-brut-view.c +++ b/applications/irda/view/irda-app-brut-view.c @@ -54,7 +54,7 @@ void popup_brut_draw_callback(Canvas* canvas, void* context) { canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, x + 15, y + 12, "Sending ..."); - canvas_draw_icon_name(canvas, x + 11, y_max - 14, I_Back_15x10); + canvas_draw_icon(canvas, x + 11, y_max - 14, &I_Back_15x10); uint8_t percent_value = 100 * popup_brut->progress / popup_brut->progress_max; snprintf( |