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

[FL-1720] BLE GUI refactoring (#678)

Browse Source 
* dialog_ex: add clean method, fix documentation
* application: add bt debug and settings application
* bt: add debug application
* bt: add settings application
* bt: rework bt service
* bt debug: fix carrier debug app
* assets: add debug animation to main menu
* bt debug: fix bt packet test
* bt service: rework bt service
* bt: cleanup
* Assets: fix spelling
* Ble: wait for core 2 startup complete before initializing radio stack.
* Accessor: remove dead code, switch port PA6 to PA4, because interrupt line 6 is used by down button.
* FuriHal: assert interrupt line on add_int_callback.
* Bt: update icon on core2 startup complete.

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-09-02 02:22:40 +03:00
committed by GitHub
parent e17336498d
commit 420c03bb58
46 changed files with 1497 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/gui/modules/dialog_ex.c Normal file → Executable file
View File

@@ -243,3 +243,22 @@ void dialog_ex_set_right_button_text(DialogEx* dialog_ex, const char* text) {
return true;
});
}
void dialog_ex_clean(DialogEx* dialog_ex) {
furi_assert(dialog_ex);
TextElement clean_text_el = {
.text = NULL, .x = 0, .y = 0, .horizontal = AlignLeft, .vertical = AlignLeft};
IconElement clean_icon_el = {.icon = NULL, .x = 0, .y = 0};
with_view_model(
dialog_ex->view, (DialogExModel * model) {
model->header = clean_text_el;
model->text = clean_text_el;
model->icon = clean_icon_el;
model->left_text = NULL;
model->center_text = NULL;
model->right_text = NULL;
return true;
});
dialog_ex->context = NULL;
dialog_ex->callback = NULL;
}

36
applications/gui/modules/dialog_ex.h
View File

@@ -5,50 +5,51 @@
extern "C" {
#endif
/* Dialog anonymous structure */
/** Dialog anonymous structure */
typedef struct DialogEx DialogEx;
/* DialogEx result */
/** DialogEx result */
typedef enum {
DialogExResultLeft,
DialogExResultCenter,
DialogExResultRight,
} DialogExResult;
/* DialogEx result callback type
/** DialogEx result callback type
* @warning comes from GUI thread
*/
typedef void (*DialogExResultCallback)(DialogExResult result, void* context);
/* Allocate and initialize dialog
* This dialog used to ask simple questions like Yes/
/** Allocate and initialize dialog
* This dialog used to ask simple questions
* @return DialogEx instance
*/
DialogEx* dialog_ex_alloc();
/* Deinitialize and free dialog
/** Deinitialize and free dialog
* @param dialog - DialogEx instance
*/
void dialog_ex_free(DialogEx* dialog_ex);
/* Get dialog view
/** Get dialog view
* @param dialog - DialogEx instance
* @return View instance that can be used for embedding
*/
View* dialog_ex_get_view(DialogEx* dialog_ex);
/* Set dialog result callback
/** Set dialog result callback
* @param dialog_ex - DialogEx instance
* @param callback - result callback function
*/
void dialog_ex_set_result_callback(DialogEx* dialog_ex, DialogExResultCallback callback);
/* Set dialog context
/** Set dialog context
* @param dialog_ex - DialogEx instance
* @param context - context pointer, will be passed to result callback
*/
void dialog_ex_set_context(DialogEx* dialog_ex, void* context);
/* Set dialog header text
/** Set dialog header text
* If text is null, dialog header will not be rendered
* @param dialog - DialogEx instance
* @param text - text to be shown, can be multiline
@@ -63,7 +64,7 @@ void dialog_ex_set_header(
Align horizontal,
Align vertical);
/* Set dialog text
/** Set dialog text
* If text is null, dialog text will not be rendered
* @param dialog - DialogEx instance
* @param text - text to be shown, can be multiline
@@ -78,7 +79,7 @@ void dialog_ex_set_text(
Align horizontal,
Align vertical);
/* Set dialog icon
/** Set dialog icon
* If x or y is negative, dialog icon will not be rendered
* @param dialog - DialogEx instance
* @param x, y - icon position
@@ -86,27 +87,32 @@ void dialog_ex_set_text(
*/
void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* icon);
/* Set left button text
/** Set left button text
* If text is null, left button will not be rendered and processed
* @param dialog - DialogEx instance
* @param text - text to be shown
*/
void dialog_ex_set_left_button_text(DialogEx* dialog_ex, const char* text);
/* Set center button text
/** Set center button text
* If text is null, center button will not be rendered and processed
* @param dialog - DialogEx instance
* @param text - text to be shown
*/
void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text);
/* Set right button text
/** Set right button text
* If text is null, right button will not be rendered and processed
* @param dialog - DialogEx instance
* @param text - text to be shown
*/
void dialog_ex_set_right_button_text(DialogEx* dialog_ex, const char* text);
/** Clean dialog
* @param dialog_ex DialogEx instance
*/
void dialog_ex_clean(DialogEx* dialog_ex);
#ifdef __cplusplus
}
#endif