Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorあく <alleteam@gmail.com>2021-02-03 12:52:54 +0300
committerGitHub <noreply@github.com>2021-02-03 12:52:54 +0300
commitcb4fb8e4aed62fcf7e456df2434fd414ae822910 (patch)
treeb4c70ebd15ff17d60900a3b13857fbaaf8aa9b29 /applications/dolphin
parent7481cfd6eb7fb593a04807ebd19cf6b166a7659c (diff)
FL-819 new first start screen, add multiline text (#318)
* GUI Canvas: get current font height routine * Dolphin: new start screen. GUI: new multiline element. * Dolphin: up state version to reset it for everyone * Dolphin: take maximum of idle screen height * Dolphin: frames on first start screen.
Diffstat (limited to 'applications/dolphin')
-rw-r--r--applications/dolphin/dolphin.c7
-rw-r--r--applications/dolphin/dolphin_state.c2
-rw-r--r--applications/dolphin/dolphin_views.c48
3 files changed, 45 insertions, 12 deletions
diff --git a/applications/dolphin/dolphin.c b/applications/dolphin/dolphin.c
index cae109c3..33e08ebf 100644
--- a/applications/dolphin/dolphin.c
+++ b/applications/dolphin/dolphin.c
@@ -5,7 +5,12 @@ bool dolphin_view_first_start_input(InputEvent* event, void* context) {
furi_assert(context);
Dolphin* dolphin = context;
if(event->state) {
- if(event->input == InputRight) {
+ if(event->input == InputLeft) {
+ with_view_model(
+ dolphin->idle_view_first_start, (DolphinViewFirstStartModel * model) {
+ if(model->page > 0) model->page--;
+ });
+ } else if(event->input == InputRight) {
uint32_t page;
with_view_model(
dolphin->idle_view_first_start,
diff --git a/applications/dolphin/dolphin_state.c b/applications/dolphin/dolphin_state.c
index 77344c65..f7945234 100644
--- a/applications/dolphin/dolphin_state.c
+++ b/applications/dolphin/dolphin_state.c
@@ -14,7 +14,7 @@ typedef struct {
#define DOLPHIN_DATA_DATA_ADDRESS (DOLPHIN_DATA_HEADER_ADDRESS + sizeof(DolphinDataHeader))
#define DOLPHIN_DATA_HEADER_MAGIC 0xD0
-#define DOLPHIN_DATA_HEADER_VERSION 0x00
+#define DOLPHIN_DATA_HEADER_VERSION 0x01
typedef struct {
uint32_t limit_ibutton;
diff --git a/applications/dolphin/dolphin_views.c b/applications/dolphin/dolphin_views.c
index 55f67075..bda3be5d 100644
--- a/applications/dolphin/dolphin_views.c
+++ b/applications/dolphin/dolphin_views.c
@@ -1,35 +1,63 @@
#include "dolphin_views.h"
#include <gui/view.h>
+#include <gui/gui.h>
+#include <gui/elements.h>
void dolphin_view_first_start_draw(Canvas* canvas, void* model) {
DolphinViewFirstStartModel* m = model;
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
+ canvas_set_font(canvas, FontSecondary);
+ uint8_t font_height = canvas_current_font_height(canvas);
+ uint8_t width = canvas_width(canvas);
+ uint8_t height = canvas_height(canvas);
if(m->page == 0) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart0_128x54);
+ canvas_draw_icon_name(canvas, 0, height - 53, I_DolphinFirstStart0_70x53);
+ elements_multiline_text(canvas, 75, 20, "Hey m8,\npress > to\ncontinue");
+ elements_frame(canvas, 72, 20 - font_height, width - 70 - 4, font_height * 3 + 4);
} else if(m->page == 1) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart1_128x54);
+ canvas_draw_icon_name(canvas, 0, height - 53, I_DolphinFirstStart1_59x53);
+ elements_multiline_text(canvas, 64, 20, "First Of All,\n... >");
+ elements_frame(canvas, 61, 20 - font_height, width - 59 - 4, font_height * 2 + 4);
} else if(m->page == 2) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart2_128x54);
+ canvas_draw_icon_name(canvas, 0, height - 51, I_DolphinFirstStart2_59x51);
+ elements_multiline_text(canvas, 64, 20, "Thank you\nfor your\nsupport! >");
+ elements_frame(canvas, 61, 20 - font_height, width - 59 - 4, font_height * 3 + 4);
} else if(m->page == 3) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart3_128x54);
+ canvas_draw_icon_name(canvas, width - 57, height - 48, I_DolphinFirstStart3_57x48);
+ elements_multiline_text(canvas, 5, 20, "Kickstarter\ncampaign\nwas INSANE! >");
+ elements_frame(canvas, 2, 20 - font_height, width - 57 - 4, font_height * 3 + 4);
} else if(m->page == 4) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart4_128x54);
+ canvas_draw_icon_name(canvas, width - 67, height - 53, I_DolphinFirstStart4_67x53);
+ elements_multiline_text(canvas, 5, 10, "Now\nallow me\nto introduce\nmyself >");
+ elements_frame(canvas, 2, 10 - font_height, width - 67 - 4, font_height * 4 + 4);
} else if(m->page == 5) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart5_128x54);
+ canvas_draw_icon_name(canvas, 0, height - 53, I_DolphinFirstStart5_45x53);
+ elements_multiline_text(
+ canvas, 50, 20, "I am Flipper,\ncyberdolphin\nliving in your\npocket >");
+ elements_frame(canvas, 47, 20 - font_height, width - 45 - 4, font_height * 4 + 4);
} else if(m->page == 6) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart6_128x54);
+ canvas_draw_icon_name(canvas, 0, height - 54, I_DolphinFirstStart6_58x54);
+ elements_multiline_text(
+ canvas, 63, 20, "I can grow\n smart'n'cool\nif you use me\noften >");
+ elements_frame(canvas, 60, 20 - font_height, width - 58 - 4, font_height * 4 + 4);
} else if(m->page == 7) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart7_128x54);
+ canvas_draw_icon_name(canvas, width - 61, height - 51, I_DolphinFirstStart7_61x51);
+ elements_multiline_text(canvas, 5, 10, "As long as\nyou read, write\nand emulate >");
+ elements_frame(canvas, 2, 10 - font_height, width - 54 - 4, font_height * 3 + 4);
} else if(m->page == 8) {
- canvas_draw_icon_name(canvas, 0, 1, I_DolphinFirstStart8_128x54);
+ canvas_draw_icon_name(canvas, width - 56, height - 51, I_DolphinFirstStart8_56x51);
+ elements_multiline_text(
+ canvas, 5, 10, "You can check\nmy level and\nmood in the\nPassport menu");
+ elements_frame(canvas, 2, 10 - font_height, width - 56 - 4, font_height * 4 + 4);
}
}
void dolphin_view_idle_main_draw(Canvas* canvas, void* model) {
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
- canvas_draw_icon_name(canvas, 128 - 80, 0, I_Flipper_young_80x60);
+ 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");