2021-01-20 19:51:01 +03:00
|
|
|
#include "dialog.h"
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
#include <gui/elements.h>
|
2021-01-20 19:51:01 +03:00
|
|
|
#include <furi.h>
|
|
|
|
|
|
|
|
struct Dialog {
|
|
|
|
View* view;
|
|
|
|
void* context;
|
|
|
|
DialogResultCallback callback;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const char* header_text;
|
|
|
|
const char* text;
|
|
|
|
const char* left_text;
|
|
|
|
const char* right_text;
|
|
|
|
} DialogModel;
|
|
|
|
|
|
|
|
static void dialog_view_draw_callback(Canvas* canvas, void* _model) {
|
|
|
|
DialogModel* model = _model;
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
uint8_t canvas_center = canvas_width(canvas) / 2;
|
|
|
|
|
2021-01-20 19:51:01 +03:00
|
|
|
// Prepare canvas
|
|
|
|
canvas_clear(canvas);
|
|
|
|
canvas_set_color(canvas, ColorBlack);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
|
2021-01-20 19:51:01 +03:00
|
|
|
// Draw header
|
|
|
|
canvas_set_font(canvas, FontPrimary);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
canvas_draw_str_aligned(
|
|
|
|
canvas, canvas_center, 17, AlignCenter, AlignBottom, model->header_text);
|
|
|
|
|
2021-01-20 19:51:01 +03:00
|
|
|
// Draw text
|
|
|
|
canvas_set_font(canvas, FontSecondary);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
elements_multiline_text_aligned(
|
|
|
|
canvas, canvas_center, 32, AlignCenter, AlignCenter, model->text);
|
|
|
|
|
2021-01-20 19:51:01 +03:00
|
|
|
// Draw buttons
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
elements_button_left(canvas, model->left_text);
|
|
|
|
elements_button_right(canvas, model->right_text);
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool dialog_view_input_callback(InputEvent* event, void* context) {
|
|
|
|
Dialog* dialog = context;
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
bool consumed = false;
|
|
|
|
|
2021-01-20 19:51:01 +03:00
|
|
|
// Process key presses only
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event->type == InputTypeShort && dialog->callback) {
|
|
|
|
if(event->key == InputKeyLeft) {
|
2021-01-20 19:51:01 +03:00
|
|
|
dialog->callback(DialogResultLeft, dialog->context);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
consumed = true;
|
2021-02-10 11:56:05 +03:00
|
|
|
} else if(event->key == InputKeyRight) {
|
2021-01-20 19:51:01 +03:00
|
|
|
dialog->callback(DialogResultRight, dialog->context);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
consumed = true;
|
2021-05-21 12:33:30 +03:00
|
|
|
} else if(event->key == InputKeyBack) {
|
|
|
|
dialog->callback(DialogResultBack, dialog->context);
|
|
|
|
consumed = true;
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
}
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* 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>
2021-02-05 02:35:06 +03:00
|
|
|
|
|
|
|
return consumed;
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
Dialog* dialog_alloc() {
|
|
|
|
Dialog* dialog = furi_alloc(sizeof(Dialog));
|
|
|
|
dialog->view = view_alloc();
|
|
|
|
view_set_context(dialog->view, dialog);
|
|
|
|
view_allocate_model(dialog->view, ViewModelTypeLockFree, sizeof(DialogModel));
|
|
|
|
view_set_draw_callback(dialog->view, dialog_view_draw_callback);
|
|
|
|
view_set_input_callback(dialog->view, dialog_view_input_callback);
|
|
|
|
return dialog;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_free(Dialog* dialog) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
view_free(dialog->view);
|
|
|
|
free(dialog);
|
|
|
|
}
|
|
|
|
|
|
|
|
View* dialog_get_view(Dialog* dialog) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
return dialog->view;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_result_callback(Dialog* dialog, DialogResultCallback callback) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
dialog->callback = callback;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_context(Dialog* dialog, void* context) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
dialog->context = context;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_header_text(Dialog* dialog, const char* text) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
furi_assert(text);
|
|
|
|
with_view_model(
|
2021-02-10 12:06:29 +03:00
|
|
|
dialog->view, (DialogModel * model) {
|
|
|
|
model->header_text = text;
|
|
|
|
return true;
|
|
|
|
});
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_text(Dialog* dialog, const char* text) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
furi_assert(text);
|
|
|
|
with_view_model(
|
2021-02-10 12:06:29 +03:00
|
|
|
dialog->view, (DialogModel * model) {
|
|
|
|
model->text = text;
|
|
|
|
return true;
|
|
|
|
});
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_left_button_text(Dialog* dialog, const char* text) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
furi_assert(text);
|
|
|
|
with_view_model(
|
2021-02-10 12:06:29 +03:00
|
|
|
dialog->view, (DialogModel * model) {
|
|
|
|
model->left_text = text;
|
|
|
|
return true;
|
|
|
|
});
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_set_right_button_text(Dialog* dialog, const char* text) {
|
|
|
|
furi_assert(dialog);
|
|
|
|
furi_assert(text);
|
|
|
|
with_view_model(
|
2021-02-10 12:06:29 +03:00
|
|
|
dialog->view, (DialogModel * model) {
|
|
|
|
model->right_text = text;
|
|
|
|
return true;
|
|
|
|
});
|
2021-01-20 19:51:01 +03:00
|
|
|
}
|