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 "submenu.h"
|
|
|
|
#include <m-array.h>
|
|
|
|
#include <furi.h>
|
|
|
|
#include <gui/elements.h>
|
|
|
|
|
|
|
|
struct SubmenuItem {
|
|
|
|
const char* label;
|
|
|
|
SubmenuItemCallback callback;
|
|
|
|
void* callback_context;
|
|
|
|
};
|
|
|
|
|
|
|
|
ARRAY_DEF(SubmenuItemArray, SubmenuItem, M_POD_OPLIST);
|
|
|
|
|
|
|
|
struct Submenu {
|
|
|
|
View* view;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
SubmenuItemArray_t items;
|
|
|
|
uint8_t position;
|
|
|
|
uint8_t window_position;
|
|
|
|
} SubmenuModel;
|
|
|
|
|
|
|
|
static void submenu_process_up(Submenu* submenu);
|
|
|
|
static void submenu_process_down(Submenu* submenu);
|
|
|
|
static void submenu_process_ok(Submenu* submenu);
|
|
|
|
|
|
|
|
static void submenu_view_draw_callback(Canvas* canvas, void* _model) {
|
|
|
|
SubmenuModel* model = _model;
|
|
|
|
|
|
|
|
const uint8_t item_height = 16;
|
|
|
|
const uint8_t item_width = 123;
|
|
|
|
|
|
|
|
canvas_clear(canvas);
|
|
|
|
canvas_set_font(canvas, FontSecondary);
|
|
|
|
|
|
|
|
uint8_t position = 0;
|
|
|
|
SubmenuItemArray_it_t it;
|
|
|
|
|
|
|
|
for(SubmenuItemArray_it(it, model->items); !SubmenuItemArray_end_p(it);
|
|
|
|
SubmenuItemArray_next(it)) {
|
|
|
|
uint8_t item_position = position - model->window_position;
|
|
|
|
|
|
|
|
if(item_position < 4) {
|
|
|
|
if(position == model->position) {
|
|
|
|
canvas_set_color(canvas, ColorBlack);
|
|
|
|
canvas_draw_box(
|
|
|
|
canvas, 0, (item_position * item_height) + 1, item_width, item_height - 2);
|
|
|
|
canvas_set_color(canvas, ColorWhite);
|
|
|
|
|
|
|
|
canvas_draw_dot(canvas, 0, (item_position * item_height) + 1);
|
|
|
|
canvas_draw_dot(canvas, 0, (item_position * item_height) + item_height - 2);
|
|
|
|
canvas_draw_dot(canvas, item_width - 1, (item_position * item_height) + 1);
|
|
|
|
canvas_draw_dot(
|
|
|
|
canvas, item_width - 1, (item_position * item_height) + item_height - 2);
|
|
|
|
} else {
|
|
|
|
canvas_set_color(canvas, ColorBlack);
|
|
|
|
}
|
|
|
|
canvas_draw_str(
|
|
|
|
canvas,
|
|
|
|
6,
|
|
|
|
(item_position * item_height) + item_height - 4,
|
|
|
|
SubmenuItemArray_cref(it)->label);
|
|
|
|
}
|
|
|
|
|
|
|
|
position++;
|
|
|
|
}
|
|
|
|
|
|
|
|
elements_scrollbar(canvas, model->position, SubmenuItemArray_size(model->items));
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool submenu_view_input_callback(InputEvent* event, void* context) {
|
|
|
|
Submenu* submenu = context;
|
|
|
|
furi_assert(submenu);
|
|
|
|
bool consumed = false;
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event->type == InputTypeShort) {
|
|
|
|
switch(event->key) {
|
|
|
|
case InputKeyUp:
|
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;
|
|
|
|
submenu_process_up(submenu);
|
|
|
|
break;
|
2021-02-10 11:56:05 +03:00
|
|
|
case InputKeyDown:
|
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;
|
|
|
|
submenu_process_down(submenu);
|
|
|
|
break;
|
2021-02-10 11:56:05 +03:00
|
|
|
case InputKeyOk:
|
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;
|
|
|
|
submenu_process_ok(submenu);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return consumed;
|
|
|
|
}
|
|
|
|
|
|
|
|
Submenu* submenu_alloc() {
|
|
|
|
Submenu* submenu = furi_alloc(sizeof(Submenu));
|
|
|
|
submenu->view = view_alloc();
|
|
|
|
view_set_context(submenu->view, submenu);
|
|
|
|
view_allocate_model(submenu->view, ViewModelTypeLocking, sizeof(SubmenuModel));
|
|
|
|
view_set_draw_callback(submenu->view, submenu_view_draw_callback);
|
|
|
|
view_set_input_callback(submenu->view, submenu_view_input_callback);
|
|
|
|
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) {
|
|
|
|
SubmenuItemArray_init(model->items);
|
|
|
|
model->position = 0;
|
|
|
|
});
|
|
|
|
|
|
|
|
return submenu;
|
|
|
|
}
|
|
|
|
|
|
|
|
void submenu_free(Submenu* submenu) {
|
|
|
|
furi_assert(submenu);
|
|
|
|
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) { SubmenuItemArray_clear(model->items); });
|
|
|
|
view_free(submenu->view);
|
|
|
|
free(submenu);
|
|
|
|
}
|
|
|
|
|
|
|
|
View* submenu_get_view(Submenu* submenu) {
|
|
|
|
furi_assert(submenu);
|
|
|
|
return submenu->view;
|
|
|
|
}
|
|
|
|
|
|
|
|
SubmenuItem* submenu_add_item(
|
|
|
|
Submenu* submenu,
|
|
|
|
const char* label,
|
|
|
|
SubmenuItemCallback callback,
|
|
|
|
void* callback_context) {
|
|
|
|
SubmenuItem* item = NULL;
|
|
|
|
furi_assert(label);
|
|
|
|
furi_assert(submenu);
|
|
|
|
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) {
|
|
|
|
item = SubmenuItemArray_push_new(model->items);
|
|
|
|
item->label = label;
|
|
|
|
item->callback = callback;
|
|
|
|
item->callback_context = callback_context;
|
|
|
|
});
|
|
|
|
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
void submenu_process_up(Submenu* submenu) {
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) {
|
|
|
|
if(model->position > 0) {
|
|
|
|
model->position--;
|
|
|
|
if((model->position - model->window_position) < 1 && model->window_position > 0) {
|
|
|
|
model->window_position--;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
model->position = SubmenuItemArray_size(model->items) - 1;
|
|
|
|
model->window_position = model->position - 3;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
void submenu_process_down(Submenu* submenu) {
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) {
|
|
|
|
if(model->position < (SubmenuItemArray_size(model->items) - 1)) {
|
|
|
|
model->position++;
|
|
|
|
if((model->position - model->window_position) > 2 &&
|
|
|
|
model->window_position < (SubmenuItemArray_size(model->items) - 4)) {
|
|
|
|
model->window_position++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
model->position = 0;
|
|
|
|
model->window_position = 0;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
void submenu_process_ok(Submenu* submenu) {
|
|
|
|
SubmenuItem* item = NULL;
|
|
|
|
|
|
|
|
with_view_model(
|
|
|
|
submenu->view, (SubmenuModel * model) {
|
|
|
|
if(model->position < (SubmenuItemArray_size(model->items))) {
|
|
|
|
item = SubmenuItemArray_get(model->items, model->position);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if(item && item->callback) {
|
|
|
|
item->callback(item->callback_context);
|
|
|
|
}
|
|
|
|
}
|