Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 21:08:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-03-26 13:54:06 +03:00
parent 175db7baa3 21e7c46033
commit f02b03172a
4 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
applications/services/desktop/views/desktop_view_pin_input.c
View File

@@ -35,6 +35,9 @@ typedef struct {
const char* secondary_str;
uint8_t secondary_str_x;
uint8_t secondary_str_y;
const char* tertiary_str;
uint8_t tertiary_str_x;
uint8_t tertiary_str_y;
const char* button_label;
} DesktopViewPinInputModel;
@@ -167,6 +170,17 @@ static void desktop_view_pin_input_draw(Canvas* canvas, void* context) {
canvas_draw_str(
canvas, model->secondary_str_x, model->secondary_str_y, model->secondary_str);
}
if(model->tertiary_str && model->pin.length == 0) {
canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(
canvas,
model->tertiary_str_x,
model->tertiary_str_y,
AlignCenter,
AlignBottom,
model->tertiary_str);
}
}
void desktop_view_pin_input_timer_callback(void* context) {
@@ -294,6 +308,20 @@ void desktop_view_pin_input_set_label_secondary(
view_commit_model(pin_input->view, true);
}
void desktop_view_pin_input_set_label_tertiary(
DesktopViewPinInput* pin_input,
uint8_t x,
uint8_t y,
const char* label) {
furi_assert(pin_input);
DesktopViewPinInputModel* model = view_get_model(pin_input->view);
model->tertiary_str = label;
model->tertiary_str_x = x;
model->tertiary_str_y = y;
view_commit_model(pin_input->view, true);
}
void desktop_view_pin_input_set_pin_position(DesktopViewPinInput* pin_input, uint8_t x, uint8_t y) {
furi_assert(pin_input);

5
applications/services/desktop/views/desktop_view_pin_input.h
View File

@@ -24,6 +24,11 @@ void desktop_view_pin_input_set_label_secondary(
uint8_t x,
uint8_t y,
const char* label);
void desktop_view_pin_input_set_label_tertiary(
DesktopViewPinInput* pin_input,
uint8_t x,
uint8_t y,
const char* label);
void desktop_view_pin_input_set_pin_position(DesktopViewPinInput* pin_input, uint8_t x, uint8_t y);
View* desktop_view_pin_input_get_view(DesktopViewPinInput*);
void desktop_view_pin_input_set_done_callback(