Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use stock system icons instead of assets

Browse Source
This commit is contained in:
Willy-JL
2023-05-20 20:00:02 +01:00
parent 5a63c01016
commit 7f19e16d47
39 changed files with 55 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/services/bt/bt_service/bt.c
View File

@@ -5,7 +5,6 @@
#include <notification/notification_messages.h>
#include <gui/elements.h>
#include <assets_icons.h>
#include <xtreme.h>
#define TAG "BtSrv"
@@ -36,7 +35,7 @@ static void bt_pin_code_view_port_draw_callback(Canvas* canvas, void* context) {
furi_assert(context);
Bt* bt = context;
char pin_code_info[24];
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->I_BLE_Pairing_128x64);
canvas_draw_icon(canvas, 0, 0, &I_BLE_Pairing_128x64);
snprintf(pin_code_info, sizeof(pin_code_info), "Pairing code\n%06lu", bt->pin_code);
elements_multiline_text_aligned(canvas, 64, 4, AlignCenter, AlignTop, pin_code_info);
elements_button_left(canvas, "Quit");
@@ -84,7 +83,7 @@ static bool bt_pin_code_verify_event_handler(Bt* bt, uint32_t pin) {
if(bt->suppress_pin_screen) return true;
FuriString* pin_str;
dialog_message_set_icon(bt->dialog_message, XTREME_ASSETS()->I_BLE_Pairing_128x64, 0, 0);
dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0);
pin_str = furi_string_alloc_printf("Verify code\n%06lu", pin);
dialog_message_set_text(
bt->dialog_message, furi_string_get_cstr(pin_str), 64, 4, AlignCenter, AlignTop);

3
applications/services/desktop/animations/animation_manager.c
View File

@@ -590,8 +590,7 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio
View* next_view = one_shot_view_get_view(animation_manager->one_shot_view);
view_stack_remove_view(animation_manager->view_stack, prev_view);
view_stack_add_view(animation_manager->view_stack, next_view);
one_shot_view_start_animation(
animation_manager->one_shot_view, XTREME_ASSETS()->A_Levelup_128x64);
one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup_128x64);
}
static void animation_manager_switch_to_animation_view(AnimationManager* animation_manager) {

2
applications/services/desktop/views/desktop_view_locked.c
View File

@@ -94,7 +94,7 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) {
snprintf(date_str, 14, "%.2d-%.2d-%.4d", datetime.day, datetime.month, datetime.year);
}
canvas_draw_icon(canvas, 0, 0 + y, XTREME_ASSETS()->I_Lockscreen);
canvas_draw_icon(canvas, 0, 0 + y, &I_Lockscreen);
if(xtreme_settings->lockscreen_time) {
canvas_set_font(canvas, FontBigNumbers);
canvas_draw_str(canvas, 0, 64 + y, time_str);

2
applications/services/gui/gui.c
View File

@@ -77,7 +77,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) {
canvas_draw_box(gui->canvas, 89, 3, 38, 6);
canvas_set_color(gui->canvas, ColorBlack);
canvas_set_bitmap_mode(gui->canvas, 1);
canvas_draw_icon(gui->canvas, 0, 0, XTREME_ASSETS()->I_Background_128x11);
canvas_draw_icon(gui->canvas, 0, 0, &I_Background_128x11);
} else {
canvas_set_color(gui->canvas, ColorBlack);
}