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-04 23:35:06 +00:00
|
|
|
#include <furi.h>
|
|
|
|
#include <gui/gui.h>
|
|
|
|
#include <gui/view_port.h>
|
|
|
|
#include <gui/view.h>
|
|
|
|
#include <gui/view_dispatcher.h>
|
|
|
|
#include <gui/modules/dialog.h>
|
|
|
|
#include <gui/modules/dialog_ex.h>
|
|
|
|
#include <gui/modules/submenu.h>
|
|
|
|
#include <gui/modules/text_input.h>
|
|
|
|
#include <gui/modules/popup.h>
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
GuiTesterViewTextInput = 0,
|
|
|
|
GuiTesterViewSubmenu,
|
|
|
|
GuiTesterViewDialog,
|
|
|
|
GuiTesterViewDialogEx,
|
|
|
|
GuiTesterViewPopup,
|
|
|
|
GuiTesterViewLast
|
|
|
|
} GuiTesterView;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ViewDispatcher* view_dispatcher;
|
|
|
|
Dialog* dialog;
|
|
|
|
DialogEx* dialog_ex;
|
|
|
|
Submenu* submenu;
|
|
|
|
TextInput* text_input;
|
|
|
|
Popup* popup;
|
|
|
|
GuiTesterView view_index;
|
|
|
|
} GuiTester;
|
|
|
|
|
|
|
|
GuiTester* gui_test_alloc(void) {
|
|
|
|
GuiTester* gui_tester = furi_alloc(sizeof(GuiTester));
|
|
|
|
gui_tester->view_dispatcher = view_dispatcher_alloc();
|
|
|
|
gui_tester->view_index = GuiTesterViewDialogEx;
|
|
|
|
|
|
|
|
gui_tester->dialog = dialog_alloc();
|
|
|
|
view_dispatcher_add_view(
|
|
|
|
gui_tester->view_dispatcher, GuiTesterViewDialog, dialog_get_view(gui_tester->dialog));
|
|
|
|
|
|
|
|
gui_tester->dialog_ex = dialog_ex_alloc();
|
|
|
|
view_dispatcher_add_view(
|
|
|
|
gui_tester->view_dispatcher,
|
|
|
|
GuiTesterViewDialogEx,
|
|
|
|
dialog_ex_get_view(gui_tester->dialog_ex));
|
|
|
|
|
|
|
|
gui_tester->submenu = submenu_alloc();
|
|
|
|
view_dispatcher_add_view(
|
|
|
|
gui_tester->view_dispatcher, GuiTesterViewSubmenu, submenu_get_view(gui_tester->submenu));
|
|
|
|
|
|
|
|
gui_tester->text_input = text_input_alloc();
|
|
|
|
view_dispatcher_add_view(
|
|
|
|
gui_tester->view_dispatcher,
|
|
|
|
GuiTesterViewTextInput,
|
|
|
|
text_input_get_view(gui_tester->text_input));
|
|
|
|
|
|
|
|
gui_tester->popup = popup_alloc();
|
|
|
|
view_dispatcher_add_view(
|
|
|
|
gui_tester->view_dispatcher, GuiTesterViewPopup, popup_get_view(gui_tester->popup));
|
|
|
|
|
|
|
|
return gui_tester;
|
|
|
|
}
|
|
|
|
|
|
|
|
void next_view(void* context) {
|
|
|
|
furi_assert(context);
|
|
|
|
GuiTester* gui_tester = context;
|
|
|
|
|
|
|
|
gui_tester->view_index++;
|
|
|
|
if(gui_tester->view_index >= GuiTesterViewLast) {
|
|
|
|
gui_tester->view_index = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
view_dispatcher_switch_to_view(gui_tester->view_dispatcher, gui_tester->view_index);
|
|
|
|
}
|
|
|
|
|
|
|
|
void popup_callback(void* context) {
|
|
|
|
next_view(context);
|
|
|
|
}
|
|
|
|
|
|
|
|
void submenu_callback(void* context) {
|
|
|
|
next_view(context);
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_callback(DialogResult result, void* context) {
|
|
|
|
next_view(context);
|
|
|
|
}
|
|
|
|
|
|
|
|
void dialog_ex_callback(DialogExResult result, void* context) {
|
|
|
|
next_view(context);
|
|
|
|
}
|
|
|
|
|
|
|
|
void text_input_callback(void* context, char* text) {
|
|
|
|
next_view(context);
|
|
|
|
}
|
|
|
|
|
2021-02-12 17:24:34 +00:00
|
|
|
int32_t gui_test(void* param) {
|
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-04 23:35:06 +00:00
|
|
|
(void)param;
|
|
|
|
GuiTester* gui_tester = gui_test_alloc();
|
|
|
|
|
|
|
|
Gui* gui = furi_record_open("gui");
|
|
|
|
view_dispatcher_attach_to_gui(gui_tester->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
|
|
|
|
|
|
|
|
// Submenu
|
|
|
|
submenu_add_item(gui_tester->submenu, "Read", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Saved", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Emulate", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Enter manually", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Blah blah", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Set time", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Gender-bender", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Hack American Elections", submenu_callback, gui_tester);
|
|
|
|
submenu_add_item(gui_tester->submenu, "Hack the White House", submenu_callback, gui_tester);
|
|
|
|
|
|
|
|
// Dialog
|
|
|
|
dialog_set_result_callback(gui_tester->dialog, dialog_callback);
|
|
|
|
dialog_set_context(gui_tester->dialog, gui_tester);
|
|
|
|
dialog_set_header_text(gui_tester->dialog, "Delete Abc123?");
|
|
|
|
dialog_set_text(gui_tester->dialog, "ID: F0 00 01 02 03 04\nAre you shure?");
|
2021-02-05 00:23:29 +00:00
|
|
|
dialog_set_left_button_text(gui_tester->dialog, "Yes");
|
|
|
|
dialog_set_right_button_text(gui_tester->dialog, "No");
|
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-04 23:35:06 +00:00
|
|
|
|
|
|
|
// Dialog extended
|
|
|
|
dialog_ex_set_result_callback(gui_tester->dialog_ex, dialog_ex_callback);
|
|
|
|
dialog_ex_set_context(gui_tester->dialog_ex, gui_tester);
|
|
|
|
dialog_ex_set_header(gui_tester->dialog_ex, "Dallas", 95, 12, AlignCenter, AlignCenter);
|
|
|
|
dialog_ex_set_text(
|
|
|
|
gui_tester->dialog_ex, "F6 E5 D4\nC3 B2 A1", 95, 32, AlignCenter, AlignCenter);
|
|
|
|
dialog_ex_set_icon(gui_tester->dialog_ex, 0, 1, I_DolphinExcited_64x63);
|
2021-02-05 00:23:29 +00:00
|
|
|
dialog_ex_set_left_button_text(gui_tester->dialog_ex, "More");
|
|
|
|
dialog_ex_set_right_button_text(gui_tester->dialog_ex, "Save");
|
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-04 23:35:06 +00:00
|
|
|
|
|
|
|
// Popup
|
|
|
|
popup_set_callback(gui_tester->popup, popup_callback);
|
|
|
|
popup_set_context(gui_tester->popup, gui_tester);
|
|
|
|
popup_set_icon(gui_tester->popup, 0, 2, I_DolphinMafia_115x62);
|
|
|
|
popup_set_text(gui_tester->popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
|
|
|
|
popup_set_timeout(gui_tester->popup, 5000);
|
|
|
|
popup_enable_timeout(gui_tester->popup);
|
|
|
|
|
|
|
|
// Text input
|
|
|
|
const uint8_t text_input_text_len = 64;
|
|
|
|
char* text_input_text = calloc(text_input_text_len + 1, 1);
|
|
|
|
memcpy(text_input_text, "New_ke", strlen("New_ke"));
|
|
|
|
|
|
|
|
text_input_set_result_callback(
|
|
|
|
gui_tester->text_input,
|
|
|
|
text_input_callback,
|
|
|
|
gui_tester,
|
|
|
|
text_input_text,
|
|
|
|
text_input_text_len);
|
|
|
|
text_input_set_header_text(gui_tester->text_input, "Name the key");
|
|
|
|
|
|
|
|
view_dispatcher_switch_to_view(gui_tester->view_dispatcher, gui_tester->view_index);
|
|
|
|
|
|
|
|
while(1) {
|
|
|
|
osDelay(1000);
|
|
|
|
}
|
2021-02-12 17:24:34 +00:00
|
|
|
|
|
|
|
return 0;
|
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-04 23:35:06 +00:00
|
|
|
}
|