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

32
applications/dolphin/passport/passport.c
View File

@@ -23,19 +23,19 @@ typedef struct {
// Moods, corresponding to butthurt level. (temp, unclear about max level)
static const char* mood_strings[MOODS_TOTAL] = {[0] = "Happy", [1] = "Ok", [2] = "Bad"};
static const IconName portrait_happy[BUTTHURT_MAX] = {
I_passport_happy1_43x45,
I_passport_happy2_43x45,
I_passport_happy3_43x45};
static const IconName portrait_ok[BUTTHURT_MAX] = {
I_passport_okay1_43x45,
I_passport_okay2_43x45,
I_passport_okay3_43x45};
static const IconName portrait_bad[BUTTHURT_MAX] = {
I_passport_bad1_43x45,
I_passport_bad2_43x45,
I_passport_bad3_43x45};
static const IconName* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
static const Icon* portrait_happy[BUTTHURT_MAX] = {
&I_passport_happy1_43x45,
&I_passport_happy2_43x45,
&I_passport_happy3_43x45};
static const Icon* portrait_ok[BUTTHURT_MAX] = {
&I_passport_okay1_43x45,
&I_passport_okay2_43x45,
&I_passport_okay3_43x45};
static const Icon* portrait_bad[BUTTHURT_MAX] = {
&I_passport_bad1_43x45,
&I_passport_bad2_43x45,
&I_passport_bad3_43x45};
static const Icon** portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
static void input_callback(InputEvent* input_event, void* ctx) {
osMessageQueueId_t event_queue = ctx;
@@ -61,8 +61,8 @@ static void render_callback(Canvas* canvas, void* ctx) {
canvas_clear(canvas);
// multipass
canvas_draw_icon_name(canvas, 0, 0, I_PassportLeft_6x47);
canvas_draw_icon_name(canvas, 0, 47, I_PassportBottom_128x17);
canvas_draw_icon(canvas, 0, 0, &I_PassportLeft_6x47);
canvas_draw_icon(canvas, 0, 47, &I_PassportBottom_128x17);
canvas_draw_line(canvas, 6, 0, 125, 0);
canvas_draw_line(canvas, 127, 2, 127, 47);
canvas_draw_dot(canvas, 126, 1);
@@ -75,7 +75,7 @@ static void render_callback(Canvas* canvas, void* ctx) {
canvas_draw_line(canvas, 53, 5, 55, 7);
// portrait
canvas_draw_icon_name(canvas, 10, 9, portraits[butthurt][portrait_level]);
canvas_draw_icon(canvas, 10, 9, portraits[butthurt][portrait_level]);
canvas_draw_line(canvas, 59, 18, 124, 18);
canvas_draw_line(canvas, 59, 31, 124, 31);
canvas_draw_line(canvas, 59, 44, 124, 44);