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

[FL-1019] New main screen and graphics (#389)

Browse Source 
* new status bar, lock menu and dolphin activities screen

* lock icon indication 

* main screen animation, basic scene switching

* level progression calculations based on icounter value 

Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
its your bedtime
2021-03-25 20:48:58 +03:00
committed by GitHub
parent 610f4f5d73
commit 372710c31a
42 changed files with 454 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
applications/dolphin/dolphin_views.c
View File

@@ -2,9 +2,11 @@
#include <gui/view.h>
#include <gui/gui.h>
#include <gui/elements.h>
#include <api-hal.h>
static char* Lockmenu_Items[3] = {"Lock", "Set PIN", "DUMB mode"};
static char* Meta_Items[3] = {"Passport", "Games", "???"};
void dolphin_view_first_start_draw(Canvas* canvas, void* model) {
DolphinViewFirstStartModel* m = model;
canvas_clear(canvas);
@@ -57,40 +59,73 @@ void dolphin_view_first_start_draw(Canvas* canvas, void* model) {
void dolphin_view_idle_main_draw(Canvas* canvas, void* model) {
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_draw_icon_name(
canvas, canvas_width(canvas) - 80, canvas_height(canvas) - 60 + 6, I_Flipper_young_80x60);
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 10, "/\\: Stats");
canvas_draw_str(canvas, 5, 32, "OK: Menu");
canvas_draw_str(canvas, 2, 52, "\\/: Version");
DolphinViewMainModel* m = model;
if(m->animation) canvas_draw_icon(canvas, 0, 0, m->animation);
}
void dolphin_view_idle_up_draw(Canvas* canvas, void* model) {
DolphinViewIdleUpModel* m = model;
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, "Dolphin stats:");
canvas_draw_str(canvas, 2, 15, "Dolphin stats:");
char buffer[64];
canvas_set_font(canvas, FontSecondary);
snprintf(buffer, 64, "Icounter: %ld", m->icounter);
canvas_draw_str(canvas, 5, 22, buffer);
canvas_draw_str(canvas, 5, 30, buffer);
snprintf(buffer, 64, "Butthurt: %ld", m->butthurt);
canvas_draw_str(canvas, 5, 32, buffer);
canvas_draw_str(canvas, 5, 40, "< > change icounter");
canvas_draw_str(canvas, 5, 40, buffer);
canvas_draw_str(canvas, 0, 53, "[< >] icounter value [ok] save");
}
void dolphin_view_lockmenu_draw(Canvas* canvas, void* model) {
DolphinViewMenuModel* m = model;
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_draw_icon_name(canvas, 5, 0, I_DoorLeft_8x56);
canvas_draw_icon_name(canvas, 115, 0, I_DoorRight_8x56);
canvas_set_font(canvas, FontSecondary);
for(uint8_t i = 0; i < 3; ++i) {
canvas_draw_str_aligned(
canvas, 64, 13 + (i * 17), AlignCenter, AlignCenter, Lockmenu_Items[i]);
if(m->idx == i) elements_frame(canvas, 15, 5 + (i * 17), 98, 15);
}
}
void dolphin_view_idle_meta_draw(Canvas* canvas, void* model) {
DolphinViewMenuModel* m = model;
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_set_font(canvas, FontSecondary);
canvas_draw_icon_name(canvas, 20, 23, I_BigProfile_24x24);
canvas_draw_icon_name(canvas, 55, 23, I_BigGames_24x24);
canvas_draw_icon_name(canvas, 90, 23, I_BigBurger_24x24);
canvas_draw_str_aligned(canvas, 66, 12, AlignCenter, AlignCenter, Meta_Items[m->idx]);
canvas_draw_frame(canvas, 17 + (35 * m->idx), 20, 30, 30);
canvas_set_color(canvas, ColorWhite);
canvas_draw_dot(canvas, 17 + (35 * m->idx), 20);
canvas_draw_dot(canvas, 17 + (35 * m->idx), 49);
canvas_draw_dot(canvas, 46 + (35 * m->idx), 20);
canvas_draw_dot(canvas, 46 + (35 * m->idx), 49);
canvas_set_color(canvas, ColorBlack);
}
void dolphin_view_idle_down_draw(Canvas* canvas, void* model) {
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, "Version info:");
canvas_draw_str(canvas, 2, 15, "Version info:");
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 5, 22, TARGET " " BUILD_DATE);
canvas_draw_str(canvas, 5, 32, GIT_BRANCH);
canvas_draw_str(canvas, 5, 42, GIT_BRANCH_NUM " " GIT_COMMIT);
canvas_draw_str(canvas, 5, 25, TARGET " " BUILD_DATE);
canvas_draw_str(canvas, 5, 35, GIT_BRANCH);
canvas_draw_str(canvas, 5, 45, GIT_BRANCH_NUM " " GIT_COMMIT);
char buffer[64];
snprintf(
@@ -101,7 +136,7 @@ void dolphin_view_idle_down_draw(Canvas* canvas, void* model) {
api_hal_version_get_hw_target(),
api_hal_version_get_hw_body(),
api_hal_version_get_hw_connect());
canvas_draw_str(canvas, 5, 52, buffer);
canvas_draw_str(canvas, 5, 55, buffer);
}
void dolphin_view_hw_mismatch_draw(Canvas* canvas, void* model) {