Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ofw-pr-4261' into mntm-dev --nobuild

Browse Source
This commit is contained in:
WillyJL
2025-10-06 03:58:05 +02:00
parent c774c514a3 a3b438fdc4
commit 720eec34c8
13 changed files with 522 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/examples/example_date_time_input/ReadMe.md Normal file
View File

@@ -0,0 +1,13 @@
# Date/Time Input {#example_date_time_input}
Simple view that allows the user to adjust a date and/or time.
## Source code
Source code for this example can be found [here](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/examples/example_date_time_input).
## General principle
Callbacks can be defined for every time a value is edited (useful for application-specific bounds checking or validation) and for when the user is done editing (back button is pressed). The provided DateTime object is used both as the initial value and as the place where the result is stored.
The fields which the user is allowed to edit can be defined using `date_time_input_set_editable_fields()`. Disabled fields are shown but aren't able to be selected and don't have an outer box. If all fields are disabled, the view is read-only and no cursor will be shown.

9
applications/examples/example_date_time_input/application.fam Normal file
View File

@@ -0,0 +1,9 @@
App(
appid="example_date_time_input",
name="Example: Date/Time Input",
apptype=FlipperAppType.EXTERNAL,
entry_point="example_date_time_input",
requires=["gui"],
stack_size=1 * 1024,
fap_category="Examples",
)

79
applications/examples/example_date_time_input/example_date_time_input.c Normal file
View File

@@ -0,0 +1,79 @@
#include "example_date_time_input.h"
bool example_date_time_input_custom_event_callback(void* context, uint32_t event) {
furi_assert(context);
ExampleDateTimeInput* app = context;
return scene_manager_handle_custom_event(app->scene_manager, event);
}
static bool example_date_time_input_back_event_callback(void* context) {
furi_assert(context);
ExampleDateTimeInput* app = context;
return scene_manager_handle_back_event(app->scene_manager);
}
static ExampleDateTimeInput* example_date_time_input_alloc() {
ExampleDateTimeInput* app = malloc(sizeof(ExampleDateTimeInput));
app->gui = furi_record_open(RECORD_GUI);
app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&example_date_time_input_scene_handlers, app);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
view_dispatcher_set_custom_event_callback(
app->view_dispatcher, example_date_time_input_custom_event_callback);
view_dispatcher_set_navigation_event_callback(
app->view_dispatcher, example_date_time_input_back_event_callback);
app->date_time_input = date_time_input_alloc();
view_dispatcher_add_view(
app->view_dispatcher,
ExampleDateTimeInputViewIdDateTimeInput,
date_time_input_get_view(app->date_time_input));
app->dialog_ex = dialog_ex_alloc();
view_dispatcher_add_view(
app->view_dispatcher,
ExampleDateTimeInputViewIdShowDateTime,
dialog_ex_get_view(app->dialog_ex));
// Fill in current date & time
furi_hal_rtc_get_datetime(&app->date_time);
app->edit_date = false;
app->edit_time = false;
return app;
}
static void example_date_time_input_free(ExampleDateTimeInput* app) {
furi_assert(app);
view_dispatcher_remove_view(app->view_dispatcher, ExampleDateTimeInputViewIdShowDateTime);
dialog_ex_free(app->dialog_ex);
view_dispatcher_remove_view(app->view_dispatcher, ExampleDateTimeInputViewIdDateTimeInput);
date_time_input_free(app->date_time_input);
scene_manager_free(app->scene_manager);
view_dispatcher_free(app->view_dispatcher);
furi_record_close(RECORD_GUI);
app->gui = NULL;
free(app);
}
int32_t example_date_time_input(void* p) {
UNUSED(p);
ExampleDateTimeInput* app = example_date_time_input_alloc();
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
scene_manager_next_scene(app->scene_manager, ExampleDateTimeInputSceneShowDateTime);
view_dispatcher_run(app->view_dispatcher);
example_date_time_input_free(app);
return 0;
}

36
applications/examples/example_date_time_input/example_date_time_input.h Normal file
View File

@@ -0,0 +1,36 @@
#pragma once
#include <furi.h>
#include <furi_hal.h>
#include <gui/gui.h>
#include <gui/elements.h>
#include <gui/scene_manager.h>
#include <gui/modules/dialog_ex.h>
#include <gui/modules/date_time_input.h>
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <input/input.h>
#include "scenes/example_date_time_input_scene.h"
typedef struct ExampleDateTimeInputShowDateTime ExampleDateTimeInputShowDateTime;
typedef enum {
ExampleDateTimeInputViewIdShowDateTime,
ExampleDateTimeInputViewIdDateTimeInput,
} ExampleDateTimeInputViewId;
typedef struct {
Gui* gui;
SceneManager* scene_manager;
ViewDispatcher* view_dispatcher;
DateTimeInput* date_time_input;
DialogEx* dialog_ex;
DateTime date_time;
bool edit_date;
bool edit_time;
} ExampleDateTimeInput;

31
applications/examples/example_date_time_input/scenes/example_date_time_input_scene.c Normal file
View File

@@ -0,0 +1,31 @@
#include "example_date_time_input_scene.h"
// Generate scene on_enter handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
void (*const example_date_time_input_on_enter_handlers[])(void*) = {
#include "example_date_time_input_scene_config.h"
};
#undef ADD_SCENE
// Generate scene on_event handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
bool (*const example_date_time_input_on_event_handlers[])(void* context, SceneManagerEvent event) =
{
#include "example_date_time_input_scene_config.h"
};
#undef ADD_SCENE
// Generate scene on_exit handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
void (*const example_date_time_input_on_exit_handlers[])(void* context) = {
#include "example_date_time_input_scene_config.h"
};
#undef ADD_SCENE
// Initialize scene handlers configuration structure
const SceneManagerHandlers example_date_time_input_scene_handlers = {
.on_enter_handlers = example_date_time_input_on_enter_handlers,
.on_event_handlers = example_date_time_input_on_event_handlers,
.on_exit_handlers = example_date_time_input_on_exit_handlers,
.scene_num = ExampleDateTimeInputSceneNum,
};

29
applications/examples/example_date_time_input/scenes/example_date_time_input_scene.h Normal file
View File

@@ -0,0 +1,29 @@
#pragma once
#include <gui/scene_manager.h>
// Generate scene id and total number
#define ADD_SCENE(prefix, name, id) ExampleDateTimeInputScene##id,
typedef enum {
#include "example_date_time_input_scene_config.h"
ExampleDateTimeInputSceneNum,
} ExampleDateTimeInputScene;
#undef ADD_SCENE
extern const SceneManagerHandlers example_date_time_input_scene_handlers;
// Generate scene on_enter handlers declaration
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
#include "example_date_time_input_scene_config.h"
#undef ADD_SCENE
// Generate scene on_event handlers declaration
#define ADD_SCENE(prefix, name, id) \
bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
#include "example_date_time_input_scene_config.h"
#undef ADD_SCENE
// Generate scene on_exit handlers declaration
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
#include "example_date_time_input_scene_config.h"
#undef ADD_SCENE

2
applications/examples/example_date_time_input/scenes/example_date_time_input_scene_config.h Normal file
View File

@@ -0,0 +1,2 @@
ADD_SCENE(example_date_time_input, input_date_time, InputDateTime)
ADD_SCENE(example_date_time_input, show_date_time, ShowDateTime)

47
applications/examples/example_date_time_input/scenes/example_date_time_input_scene_input_date_time.c Normal file
View File

@@ -0,0 +1,47 @@
#include "../example_date_time_input.h"
void example_date_time_input_scene_input_date_time_callback(void* context) {
ExampleDateTimeInput* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, 0);
}
void example_date_time_input_scene_input_date_time_on_enter(void* context) {
furi_assert(context);
ExampleDateTimeInput* app = context;
DateTimeInput* date_time_input = app->date_time_input;
date_time_input_set_result_callback(
date_time_input,
NULL,
example_date_time_input_scene_input_date_time_callback,
context,
&app->date_time);
date_time_input_set_editable_fields(
date_time_input,
app->edit_date,
app->edit_date,
app->edit_date,
app->edit_time,
app->edit_time,
app->edit_time);
view_dispatcher_switch_to_view(app->view_dispatcher, ExampleDateTimeInputViewIdDateTimeInput);
}
bool example_date_time_input_scene_input_date_time_on_event(void* context, SceneManagerEvent event) {
ExampleDateTimeInput* app = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) { //Back button pressed
scene_manager_previous_scene(app->scene_manager);
return true;
}
return consumed;
}
void example_date_time_input_scene_input_date_time_on_exit(void* context) {
UNUSED(context);
}

94
applications/examples/example_date_time_input/scenes/example_date_time_input_scene_show_date_time.c Normal file
View File

@@ -0,0 +1,94 @@
#include "../example_date_time_input.h"
static void
example_date_time_input_scene_confirm_dialog_callback(DialogExResult result, void* context) {
ExampleDateTimeInput* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, result);
}
static void example_date_time_input_scene_update_view(void* context) {
ExampleDateTimeInput* app = context;
DialogEx* dialog_ex = app->dialog_ex;
dialog_ex_set_header(dialog_ex, "The date and time are", 64, 0, AlignCenter, AlignTop);
uint8_t hour = app->date_time.hour;
char label_hour[4] = "";
if(furi_hal_rtc_get_locale_timeformat() == FuriHalRtcLocaleTimeFormat12h) {
if(hour < 12) {
snprintf(label_hour, sizeof(label_hour), " AM");
} else {
snprintf(label_hour, sizeof(label_hour), " PM");
}
hour %= 12;
if(hour == 0) hour = 12;
}
char buffer[29] = {};
snprintf(
buffer,
sizeof(buffer),
"%04d-%02d-%02d\n%02d:%02d:%02d%s",
app->date_time.year,
app->date_time.month,
app->date_time.day,
hour,
app->date_time.minute,
app->date_time.second,
label_hour);
dialog_ex_set_text(dialog_ex, buffer, 64, 29, AlignCenter, AlignCenter);
dialog_ex_set_left_button_text(dialog_ex, "Date");
dialog_ex_set_right_button_text(dialog_ex, "Time");
dialog_ex_set_center_button_text(dialog_ex, "Both");
dialog_ex_set_result_callback(
dialog_ex, example_date_time_input_scene_confirm_dialog_callback);
dialog_ex_set_context(dialog_ex, app);
}
void example_date_time_input_scene_show_date_time_on_enter(void* context) {
furi_assert(context);
ExampleDateTimeInput* app = context;
example_date_time_input_scene_update_view(app);
view_dispatcher_switch_to_view(app->view_dispatcher, ExampleDateTimeInputViewIdShowDateTime);
}
bool example_date_time_input_scene_show_date_time_on_event(void* context, SceneManagerEvent event) {
ExampleDateTimeInput* app = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) {
case DialogExResultCenter:
app->edit_date = true;
app->edit_time = true;
scene_manager_next_scene(app->scene_manager, ExampleDateTimeInputSceneInputDateTime);
consumed = true;
break;
case DialogExResultLeft:
app->edit_date = true;
app->edit_time = false;
scene_manager_next_scene(app->scene_manager, ExampleDateTimeInputSceneInputDateTime);
consumed = true;
break;
case DialogExResultRight:
app->edit_date = false;
app->edit_time = true;
scene_manager_next_scene(app->scene_manager, ExampleDateTimeInputSceneInputDateTime);
consumed = true;
break;
default:
break;
}
}
return consumed;
}
void example_date_time_input_scene_show_date_time_on_exit(void* context) {
UNUSED(context);
}

188
applications/services/gui/modules/date_time_input.c
View File

@@ -1,13 +1,14 @@
#include "date_time_input.h"
#include "furi_hal_rtc.h"
#include <furi.h>
#include <assets_icons.h>
#define get_state(m, r, c) \
((m)->row == (r) && (m)->column == (c) ? \
((m)->editing ? EditStateActiveEditing : EditStateActive) : \
EditStateNone)
#define ROW_0_Y (10)
#define get_state(m, r, c, f) \
((m)->editable.f ? ((m)->row == (r) && (m)->column == (c) ? \
((m)->editing ? EditStateActiveEditing : EditStateActive) : \
EditStateNone) : \
EditStateDisabled)
#define ROW_0_Y (9)
#define ROW_0_H (20)
#define ROW_1_Y (40)
@@ -21,13 +22,21 @@ struct DateTimeInput {
};
typedef struct {
const char* header;
DateTime* datetime;
uint8_t row;
uint8_t column;
bool editing;
struct {
bool year;
bool month;
bool day;
bool hour;
bool minute;
bool second;
} editable;
DateTimeChangedCallback changed_callback;
DateTimeDoneCallback done_callback;
void* callback_context;
@@ -37,6 +46,7 @@ typedef enum {
EditStateNone,
EditStateActive,
EditStateActiveEditing,
EditStateDisabled
} EditState;
static inline void date_time_input_cleanup_date(DateTime* dt) {
@@ -59,15 +69,17 @@ static inline void date_time_input_draw_block(
furi_assert(text);
canvas_set_color(canvas, ColorBlack);
if(state != EditStateNone) {
if(state == EditStateActiveEditing) {
canvas_draw_icon(canvas, x + w / 2 - 2, y - 1 - 3, &I_SmallArrowUp_3x5);
canvas_draw_icon(canvas, x + w / 2 - 2, y + h + 1, &I_SmallArrowDown_3x5);
if(state != EditStateDisabled) {
if(state != EditStateNone) {
if(state == EditStateActiveEditing) {
canvas_draw_icon(canvas, x + w / 2 - 2, y - 1 - 3, &I_SmallArrowUp_3x5);
canvas_draw_icon(canvas, x + w / 2 - 2, y + h + 1, &I_SmallArrowDown_3x5);
}
canvas_draw_rbox(canvas, x, y, w, h, 1);
canvas_set_color(canvas, ColorWhite);
} else {
canvas_draw_rframe(canvas, x, y, w, h, 1);
}
canvas_draw_rbox(canvas, x, y, w, h, 1);
canvas_set_color(canvas, ColorWhite);
} else {
canvas_draw_rframe(canvas, x, y, w, h, 1);
}
canvas_set_font(canvas, font);
@@ -77,10 +89,32 @@ static inline void date_time_input_draw_block(
}
}
static void date_time_input_draw_time_callback(Canvas* canvas, DateTimeInputModel* model) {
furi_check(model->datetime);
static inline void date_time_input_draw_text(
Canvas* canvas,
int32_t x,
int32_t y,
size_t w,
size_t h,
Font font,
EditState state,
const char* text) {
furi_assert(canvas);
furi_assert(text);
char buffer[64];
canvas_set_color(canvas, ColorBlack);
if(state != EditStateDisabled && state != EditStateNone) {
canvas_set_color(canvas, ColorWhite);
}
canvas_set_font(canvas, font);
canvas_draw_str_aligned(canvas, x + w / 2, y + h / 2, AlignCenter, AlignCenter, text);
if(state != EditStateNone) {
canvas_set_color(canvas, ColorBlack);
}
}
static void date_time_input_draw_hour_24hr_callback(Canvas* canvas, DateTimeInputModel* model) {
char buffer[4];
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 0, ROW_1_Y - 2, " H H M M S S");
@@ -88,39 +122,83 @@ static void date_time_input_draw_time_callback(Canvas* canvas, DateTimeInputMode
snprintf(buffer, sizeof(buffer), "%02u", model->datetime->hour);
date_time_input_draw_block(
canvas, 30, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 0), buffer);
canvas, 30, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 0, hour), buffer);
canvas_draw_box(canvas, 60, ROW_1_Y + ROW_1_H - 7, 2, 2);
canvas_draw_box(canvas, 60, ROW_1_Y + ROW_1_H - 7 - 6, 2, 2);
}
static void date_time_input_draw_hour_12hr_callback(Canvas* canvas, DateTimeInputModel* model) {
char buffer[4];
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 0, ROW_1_Y - 2, " H H M M S S");
canvas_set_font(canvas, FontPrimary);
uint8_t hour = model->datetime->hour % 12;
// Show 12:00 instead of 00:00 for 12-hour time
if(hour == 0) hour = 12;
// Placeholder spaces to make room for AM/PM since FontBigNumbers can't draw letters
date_time_input_draw_block(
canvas, 8, ROW_1_Y, 50, ROW_1_H, FontBigNumbers, get_state(model, 1, 0, hour), buffer);
canvas_draw_box(canvas, 60, ROW_1_Y + ROW_1_H - 7, 2, 2);
canvas_draw_box(canvas, 60, ROW_1_Y + ROW_1_H - 7 - 6, 2, 2);
snprintf(buffer, sizeof(buffer), "%02u", hour);
date_time_input_draw_text(
canvas, 8, ROW_1_Y, 30, ROW_1_H, FontBigNumbers, get_state(model, 1, 0, hour), buffer);
// The AM and PM text shift by 1 pixel so compensate to make them line up
if(model->datetime->hour < 12) {
date_time_input_draw_text(
canvas, 30, ROW_1_Y + 3, 30, ROW_1_H, FontPrimary, get_state(model, 1, 0, hour), "AM");
} else {
date_time_input_draw_text(
canvas, 31, ROW_1_Y + 3, 30, ROW_1_H, FontPrimary, get_state(model, 1, 0, hour), "PM");
}
}
static void date_time_input_draw_time_callback(Canvas* canvas, DateTimeInputModel* model) {
furi_check(model->datetime);
char buffer[4];
// Draw hour depending on RTC time format
if(furi_hal_rtc_get_locale_timeformat() == FuriHalRtcLocaleTimeFormat24h) {
date_time_input_draw_hour_24hr_callback(canvas, model);
} else {
date_time_input_draw_hour_12hr_callback(canvas, model);
}
snprintf(buffer, sizeof(buffer), "%02u", model->datetime->minute);
date_time_input_draw_block(
canvas, 64, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 1), buffer);
canvas, 64, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 1, minute), buffer);
canvas_draw_box(canvas, 94, ROW_1_Y + ROW_1_H - 7, 2, 2);
canvas_draw_box(canvas, 94, ROW_1_Y + ROW_1_H - 7 - 6, 2, 2);
snprintf(buffer, sizeof(buffer), "%02u", model->datetime->second);
date_time_input_draw_block(
canvas, 98, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 2), buffer);
canvas, 98, ROW_1_Y, 28, ROW_1_H, FontBigNumbers, get_state(model, 1, 2, second), buffer);
}
static void date_time_input_draw_date_callback(Canvas* canvas, DateTimeInputModel* model) {
furi_check(model->datetime);
char buffer[64];
char buffer[6];
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 0, ROW_0_Y - 2, " Y Y Y Y M M D D");
canvas_set_font(canvas, FontPrimary);
snprintf(buffer, sizeof(buffer), "%04u", model->datetime->year);
date_time_input_draw_block(
canvas, 2, ROW_0_Y, 56, ROW_0_H, FontBigNumbers, get_state(model, 0, 0), buffer);
canvas, 2, ROW_0_Y, 56, ROW_0_H, FontBigNumbers, get_state(model, 0, 0, year), buffer);
snprintf(buffer, sizeof(buffer), "%02u", model->datetime->month);
date_time_input_draw_block(
canvas, 64, ROW_0_Y, 28, ROW_0_H, FontBigNumbers, get_state(model, 0, 1), buffer);
canvas, 64, ROW_0_Y, 28, ROW_0_H, FontBigNumbers, get_state(model, 0, 1, month), buffer);
canvas_draw_box(canvas, 64 - 5, ROW_0_Y + (ROW_0_H / 2), 4, 2);
snprintf(buffer, sizeof(buffer), "%02u", model->datetime->day);
date_time_input_draw_block(
canvas, 98, ROW_0_Y, 28, ROW_0_H, FontBigNumbers, get_state(model, 0, 2), buffer);
canvas, 98, ROW_0_Y, 28, ROW_0_H, FontBigNumbers, get_state(model, 0, 2, day), buffer);
canvas_draw_box(canvas, 98 - 5, ROW_0_Y + (ROW_0_H / 2), 4, 2);
}
@@ -131,17 +209,36 @@ static void date_time_input_view_draw_callback(Canvas* canvas, void* _model) {
date_time_input_draw_date_callback(canvas, model);
}
static inline bool is_allowed_to_edit(DateTimeInputModel* model) {
return (model->row == 0 && ((model->column == 0 && model->editable.year) |
(model->column == 1 && model->editable.month) |
(model->column == 2 && model->editable.day))) ||
((model->row == 1) && ((model->column == 0 && model->editable.hour) |
(model->column == 1 && model->editable.minute) |
(model->column == 2 && model->editable.second)));
}
static bool date_time_input_navigation_callback(InputEvent* event, DateTimeInputModel* model) {
if(event->key == InputKeyUp) {
if(model->row > 0) model->row--;
if(!is_allowed_to_edit(model)) model->row++;
} else if(event->key == InputKeyDown) {
if(model->row < ROW_COUNT - 1) model->row++;
if(!is_allowed_to_edit(model)) model->row--;
} else if(event->key == InputKeyOk) {
model->editing = !model->editing;
} else if(event->key == InputKeyRight) {
if(model->column < COLUMN_COUNT - 1) model->column++;
while(model->column < COLUMN_COUNT - 1 && !is_allowed_to_edit(model))
model->column++;
while(model->column > 0 && !is_allowed_to_edit(model))
model->column--;
} else if(event->key == InputKeyLeft) {
if(model->column > 0) model->column--;
while(model->column > 0 && !is_allowed_to_edit(model))
model->column--;
while(model->column < COLUMN_COUNT - 1 && !is_allowed_to_edit(model))
model->column++;
} else if(event->key == InputKeyBack && model->editing) {
model->editing = false;
} else if(event->key == InputKeyBack && model->done_callback) {
@@ -283,6 +380,13 @@ static void date_time_input_reset_model_input_data(DateTimeInputModel* model) {
model->column = 0;
model->datetime = NULL;
model->editable.year = true;
model->editable.month = true;
model->editable.day = true;
model->editable.hour = true;
model->editable.minute = true;
model->editable.second = true;
}
DateTimeInput* date_time_input_alloc(void) {
@@ -297,7 +401,6 @@ DateTimeInput* date_time_input_alloc(void) {
date_time_input->view,
DateTimeInputModel * model,
{
model->header = "";
model->changed_callback = NULL;
model->callback_context = NULL;
date_time_input_reset_model_input_data(model);
@@ -339,9 +442,38 @@ void date_time_input_set_result_callback(
true);
}
void date_time_input_set_header_text(DateTimeInput* date_time_input, const char* text) {
void date_time_input_set_editable_fields(
DateTimeInput* date_time_input,
bool year,
bool month,
bool day,
bool hour,
bool minute,
bool second) {
furi_check(date_time_input);
with_view_model(
date_time_input->view, DateTimeInputModel * model, { model->header = text; }, true);
date_time_input->view,
DateTimeInputModel * model,
{
model->editable.year = year;
model->editable.month = month;
model->editable.day = day;
model->editable.hour = hour;
model->editable.minute = minute;
model->editable.second = second;
// Select first editable field
model->row = 0;
model->column = 0;
while(!is_allowed_to_edit(model)) {
// Cycle to next column and wrap around at end
model->column = (model->column + 1) % COLUMN_COUNT;
// If the column is 0, we wrapped, so go to next row
if(model->column == 0) model->row++;
// If we passed the last row, give up
if(model->row >= ROW_COUNT) break;
};
},
true);
}

18
applications/services/gui/modules/date_time_input.h
View File

@@ -58,12 +58,24 @@ void date_time_input_set_result_callback(
void* callback_context,
DateTime* datetime);
/** Set date/time input header text
/** Set date/time fields which can be edited
*
* @param date_time_input date/time input instance
* @param text text to be shown
* @param year whether to allow editing the year
* @param month whether to allow editing the month
* @param day whether to allow editing the day
* @param hour whether to allow editing the hour
* @param minute whether to allow editing the minute
* @param second whether to allow editing the second
*/
void date_time_input_set_header_text(DateTimeInput* date_time_input, const char* text);
void date_time_input_set_editable_fields(
DateTimeInput* date_time_input,
bool year,
bool month,
bool day,
bool hour,
bool minute,
bool second);
#ifdef __cplusplus
}

6
targets/f18/api_symbols.csv
View File

@@ -13,6 +13,7 @@ Header,+,applications/services/gui/icon_i.h,,
Header,+,applications/services/gui/modules/button_menu.h,,
Header,+,applications/services/gui/modules/button_panel.h,,
Header,+,applications/services/gui/modules/byte_input.h,,
Header,+,applications/services/gui/modules/date_time_input.h,,
Header,+,applications/services/gui/modules/dialog_ex.h,,
Header,+,applications/services/gui/modules/empty_screen.h,,
Header,+,applications/services/gui/modules/file_browser.h,,
@@ -838,6 +839,11 @@ Function,+,crc32_calc_buffer,uint32_t,"uint32_t, const void*, size_t"
Function,+,crc32_calc_file,uint32_t,"File*, const FileCrcProgressCb, void*"
Function,-,ctermid,char*,char*
Function,-,cuserid,char*,char*
Function,+,date_time_input_alloc,DateTimeInput*,
Function,+,date_time_input_free,void,DateTimeInput*
Function,+,date_time_input_get_view,View*,DateTimeInput*
Function,+,date_time_input_set_editable_fields,void,"DateTimeInput*, _Bool, _Bool, _Bool, _Bool, _Bool, _Bool"
Function,+,date_time_input_set_result_callback,void,"DateTimeInput*, DateTimeChangedCallback, DateTimeDoneCallback, void*, DateTime*"
Function,+,datetime_datetime_to_timestamp,uint32_t,DateTime*
Function,+,datetime_get_days_per_month,uint8_t,"_Bool, uint8_t"
Function,+,datetime_get_days_per_year,uint16_t,uint16_t
1 entry status name type params
13 Header + applications/services/gui/modules/button_menu.h
14 Header + applications/services/gui/modules/button_panel.h
15 Header + applications/services/gui/modules/byte_input.h
16 Header + applications/services/gui/modules/date_time_input.h
17 Header + applications/services/gui/modules/dialog_ex.h
18 Header + applications/services/gui/modules/empty_screen.h
19 Header + applications/services/gui/modules/file_browser.h
839 Function + crc32_calc_file uint32_t File*, const FileCrcProgressCb, void*
840 Function - ctermid char* char*
841 Function - cuserid char* char*
842 Function + date_time_input_alloc DateTimeInput*
843 Function + date_time_input_free void DateTimeInput*
844 Function + date_time_input_get_view View* DateTimeInput*
845 Function + date_time_input_set_editable_fields void DateTimeInput*, _Bool, _Bool, _Bool, _Bool, _Bool, _Bool
846 Function + date_time_input_set_result_callback void DateTimeInput*, DateTimeChangedCallback, DateTimeDoneCallback, void*, DateTime*
847 Function + datetime_datetime_to_timestamp uint32_t DateTime*
848 Function + datetime_get_days_per_month uint8_t _Bool, uint8_t
849 Function + datetime_get_days_per_year uint16_t uint16_t

2
targets/f7/api_symbols.csv
View File

@@ -963,7 +963,7 @@ Function,-,cuserid,char*,char*
Function,+,date_time_input_alloc,DateTimeInput*,
Function,+,date_time_input_free,void,DateTimeInput*
Function,+,date_time_input_get_view,View*,DateTimeInput*
Function,+,date_time_input_set_header_text,void,"DateTimeInput*, const char*"
Function,+,date_time_input_set_editable_fields,void,"DateTimeInput*, _Bool, _Bool, _Bool, _Bool, _Bool, _Bool"
Function,+,date_time_input_set_result_callback,void,"DateTimeInput*, DateTimeChangedCallback, DateTimeDoneCallback, void*, DateTime*"
Function,+,datetime_datetime_to_timestamp,uint32_t,DateTime*
Function,+,datetime_get_days_per_month,uint8_t,"_Bool, uint8_t"
1 entry status name type params
963 Function + date_time_input_alloc DateTimeInput*
964 Function + date_time_input_free void DateTimeInput*
965 Function + date_time_input_get_view View* DateTimeInput*
966 Function + date_time_input_set_header_text date_time_input_set_editable_fields void DateTimeInput*, const char* DateTimeInput*, _Bool, _Bool, _Bool, _Bool, _Bool, _Bool
967 Function + date_time_input_set_result_callback void DateTimeInput*, DateTimeChangedCallback, DateTimeDoneCallback, void*, DateTime*
968 Function + datetime_datetime_to_timestamp uint32_t DateTime*
969 Function + datetime_get_days_per_month uint8_t _Bool, uint8_t