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

Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)

Browse Source 
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner

Co-authored-by: aanper <mail@s3f.ru>
This commit is contained in:
DrZlo13
2021-02-05 09:35:06 +10:00
committed by GitHub
parent 9642f0d529
commit 4341da90dc
35 changed files with 1768 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
applications/gui/modules/dialog.c
View File

@@ -1,4 +1,5 @@
#include "dialog.h"
#include <gui/elements.h>
#include <furi.h>
struct Dialog {
@@ -16,34 +17,43 @@ typedef struct {
static void dialog_view_draw_callback(Canvas* canvas, void* _model) {
DialogModel* model = _model;
uint8_t canvas_center = canvas_width(canvas) / 2;
// Prepare canvas
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
// Draw header
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 2, 10, model->header_text);
canvas_draw_str_aligned(
canvas, canvas_center, 17, AlignCenter, AlignBottom, model->header_text);
// Draw text
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 5, 22, model->text);
elements_multiline_text_aligned(
canvas, canvas_center, 32, AlignCenter, AlignCenter, model->text);
// Draw buttons
uint8_t bottom_base_line = canvas_height(canvas) - 2;
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 5, bottom_base_line, model->left_text);
canvas_draw_str(canvas, 69, bottom_base_line, model->right_text);
elements_button_left(canvas, model->left_text);
elements_button_right(canvas, model->right_text);
}
static bool dialog_view_input_callback(InputEvent* event, void* context) {
Dialog* dialog = context;
bool consumed = false;
// Process key presses only
if(event->state && dialog->callback) {
if(event->input == InputLeft) {
dialog->callback(DialogResultLeft, dialog->context);
consumed = true;
} else if(event->input == InputRight) {
dialog->callback(DialogResultRight, dialog->context);
consumed = true;
}
}
// All input events consumed
return true;
return consumed;
}
Dialog* dialog_alloc() {