FIX: Fixed inconsistencies between texts (#1496)
* FIX: Fixed inconsistencies between texts: I have changed inconsistencies. Sometimes there was a missing capital letter and sometimes there was dot instead of exclamation mark and so on. No other changes were made. I have made the correction based on how other text looks on Fliper and for headers most texts use Pascal Case. * FIX: Fixed inconsistencies between texts: Found 2 more texts with inconsistencies. Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
parent
bc34689ed6
commit
51f5641c5e
@ -45,7 +45,7 @@ static DialogMessageButton compliance_screen(DialogsApp* dialogs, DialogMessage*
|
|||||||
DialogMessageButton result;
|
DialogMessageButton result;
|
||||||
|
|
||||||
const char* screen_text = "For all compliance\n"
|
const char* screen_text = "For all compliance\n"
|
||||||
"certificates please visit\n"
|
"certificates please visit:\n"
|
||||||
"www.flipp.dev/compliance";
|
"www.flipp.dev/compliance";
|
||||||
|
|
||||||
dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
|
dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
|
||||||
@ -91,13 +91,13 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
|
|||||||
furi_hal_version_get_hw_region_name(),
|
furi_hal_version_get_hw_region_name(),
|
||||||
my_name ? my_name : "Unknown");
|
my_name ? my_name : "Unknown");
|
||||||
|
|
||||||
string_cat_printf(buffer, "Serial number:\n");
|
string_cat_printf(buffer, "Serial Number:\n");
|
||||||
const uint8_t* uid = furi_hal_version_uid();
|
const uint8_t* uid = furi_hal_version_uid();
|
||||||
for(size_t i = 0; i < furi_hal_version_uid_size(); i++) {
|
for(size_t i = 0; i < furi_hal_version_uid_size(); i++) {
|
||||||
string_cat_printf(buffer, "%02X", uid[i]);
|
string_cat_printf(buffer, "%02X", uid[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
dialog_message_set_header(message, "HW Version info:", 0, 0, AlignLeft, AlignTop);
|
dialog_message_set_header(message, "HW Version Info:", 0, 0, AlignLeft, AlignTop);
|
||||||
dialog_message_set_text(message, string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
|
dialog_message_set_text(message, string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
|
||||||
result = dialog_message_show(dialogs, message);
|
result = dialog_message_show(dialogs, message);
|
||||||
dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
|
dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
|
||||||
@ -133,7 +133,7 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
|
|||||||
version_get_gitbranch(ver));
|
version_get_gitbranch(ver));
|
||||||
}
|
}
|
||||||
|
|
||||||
dialog_message_set_header(message, "FW Version info:", 0, 0, AlignLeft, AlignTop);
|
dialog_message_set_header(message, "FW Version Info:", 0, 0, AlignLeft, AlignTop);
|
||||||
dialog_message_set_text(message, string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
|
dialog_message_set_text(message, string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
|
||||||
result = dialog_message_show(dialogs, message);
|
result = dialog_message_show(dialogs, message);
|
||||||
dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
|
dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
|
||||||
|
@ -90,7 +90,7 @@ BtHid* bt_hid_app_alloc() {
|
|||||||
submenu_add_item(
|
submenu_add_item(
|
||||||
app->submenu, "Keyboard", BtHidSubmenuIndexKeyboard, bt_hid_submenu_callback, app);
|
app->submenu, "Keyboard", BtHidSubmenuIndexKeyboard, bt_hid_submenu_callback, app);
|
||||||
submenu_add_item(
|
submenu_add_item(
|
||||||
app->submenu, "Media player", BtHidSubmenuIndexMedia, bt_hid_submenu_callback, app);
|
app->submenu, "Media Player", BtHidSubmenuIndexMedia, bt_hid_submenu_callback, app);
|
||||||
submenu_add_item(app->submenu, "Mouse", BtHidSubmenuIndexMouse, bt_hid_submenu_callback, app);
|
submenu_add_item(app->submenu, "Mouse", BtHidSubmenuIndexMouse, bt_hid_submenu_callback, app);
|
||||||
view_set_previous_callback(submenu_get_view(app->submenu), bt_hid_exit);
|
view_set_previous_callback(submenu_get_view(app->submenu), bt_hid_exit);
|
||||||
view_dispatcher_add_view(
|
view_dispatcher_add_view(
|
||||||
@ -103,7 +103,7 @@ BtHid* bt_hid_app_alloc() {
|
|||||||
dialog_ex_set_left_button_text(app->dialog, "Exit");
|
dialog_ex_set_left_button_text(app->dialog, "Exit");
|
||||||
dialog_ex_set_right_button_text(app->dialog, "Stay");
|
dialog_ex_set_right_button_text(app->dialog, "Stay");
|
||||||
dialog_ex_set_center_button_text(app->dialog, "Menu");
|
dialog_ex_set_center_button_text(app->dialog, "Menu");
|
||||||
dialog_ex_set_header(app->dialog, "Close current app?", 16, 12, AlignLeft, AlignTop);
|
dialog_ex_set_header(app->dialog, "Close Current App?", 16, 12, AlignLeft, AlignTop);
|
||||||
view_dispatcher_add_view(
|
view_dispatcher_add_view(
|
||||||
app->view_dispatcher, BtHidViewExitConfirm, dialog_ex_get_view(app->dialog));
|
app->view_dispatcher, BtHidViewExitConfirm, dialog_ex_get_view(app->dialog));
|
||||||
|
|
||||||
|
@ -10,9 +10,9 @@ void bt_settings_scene_forget_dev_confirm_dialog_callback(DialogExResult result,
|
|||||||
void bt_settings_scene_forget_dev_confirm_on_enter(void* context) {
|
void bt_settings_scene_forget_dev_confirm_on_enter(void* context) {
|
||||||
BtSettingsApp* app = context;
|
BtSettingsApp* app = context;
|
||||||
DialogEx* dialog = app->dialog;
|
DialogEx* dialog = app->dialog;
|
||||||
dialog_ex_set_header(dialog, "Unpair all devices?", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog, "Unpair All Devices?", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog, "All previous pairings\nwill be lost.", 64, 22, AlignCenter, AlignTop);
|
dialog, "All previous pairings\nwill be lost!", 64, 22, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_left_button_text(dialog, "Back");
|
dialog_ex_set_left_button_text(dialog, "Back");
|
||||||
dialog_ex_set_right_button_text(dialog, "Unpair");
|
dialog_ex_set_right_button_text(dialog, "Unpair");
|
||||||
dialog_ex_set_context(dialog, app);
|
dialog_ex_set_context(dialog, app);
|
||||||
|
@ -23,7 +23,7 @@ void desktop_debug_render(Canvas* canvas, void* model) {
|
|||||||
const Version* ver;
|
const Version* ver;
|
||||||
char buffer[64];
|
char buffer[64];
|
||||||
|
|
||||||
static const char* headers[] = {"FW Version info:", "Dolphin info:"};
|
static const char* headers[] = {"FW Version Info:", "Dolphin Info:"};
|
||||||
|
|
||||||
canvas_set_color(canvas, ColorBlack);
|
canvas_set_color(canvas, ColorBlack);
|
||||||
canvas_set_font(canvas, FontPrimary);
|
canvas_set_font(canvas, FontPrimary);
|
||||||
|
@ -67,7 +67,7 @@ void desktop_lock_menu_render(Canvas* canvas, void* model) {
|
|||||||
const char* str = Lockmenu_Items[i];
|
const char* str = Lockmenu_Items[i];
|
||||||
|
|
||||||
if(i == 1 && !m->pin_set) str = "Set PIN";
|
if(i == 1 && !m->pin_set) str = "Set PIN";
|
||||||
if(m->hint_timeout && m->idx == 2 && m->idx == i) str = "Not implemented";
|
if(m->hint_timeout && m->idx == 2 && m->idx == i) str = "Not Implemented";
|
||||||
|
|
||||||
if(str != NULL)
|
if(str != NULL)
|
||||||
canvas_draw_str_aligned(
|
canvas_draw_str_aligned(
|
||||||
|
@ -20,7 +20,7 @@ static bool gpio_test_process_ok(GpioTest* gpio_test, InputEvent* event);
|
|||||||
static void gpio_test_draw_callback(Canvas* canvas, void* _model) {
|
static void gpio_test_draw_callback(Canvas* canvas, void* _model) {
|
||||||
GpioTestModel* model = _model;
|
GpioTestModel* model = _model;
|
||||||
canvas_set_font(canvas, FontPrimary);
|
canvas_set_font(canvas, FontPrimary);
|
||||||
elements_multiline_text_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Gpio Output mode test");
|
elements_multiline_text_aligned(canvas, 64, 2, AlignCenter, AlignTop, "GPIO Output Mode Test");
|
||||||
canvas_set_font(canvas, FontSecondary);
|
canvas_set_font(canvas, FontSecondary);
|
||||||
elements_multiline_text_aligned(
|
elements_multiline_text_aligned(
|
||||||
canvas, 64, 16, AlignCenter, AlignTop, "Press < or > to change pin");
|
canvas, 64, 16, AlignCenter, AlignTop, "Press < or > to change pin");
|
||||||
|
@ -21,7 +21,7 @@ void ibutton_scene_exit_confirm_on_enter(void* context) {
|
|||||||
widget_add_string_element(
|
widget_add_string_element(
|
||||||
widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Exit to iButton menu?");
|
widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Exit to iButton menu?");
|
||||||
widget_add_string_element(
|
widget_add_string_element(
|
||||||
widget, 64, 31, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost.");
|
widget, 64, 31, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost!");
|
||||||
|
|
||||||
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
|
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ void ibutton_scene_read_on_enter(void* context) {
|
|||||||
DOLPHIN_DEED(DolphinDeedIbuttonRead);
|
DOLPHIN_DEED(DolphinDeedIbuttonRead);
|
||||||
|
|
||||||
popup_set_header(popup, "iButton", 95, 26, AlignCenter, AlignBottom);
|
popup_set_header(popup, "iButton", 95, 26, AlignCenter, AlignBottom);
|
||||||
popup_set_text(popup, "waiting\nfor key ...", 95, 30, AlignCenter, AlignTop);
|
popup_set_text(popup, "Waiting\nfor key ...", 95, 30, AlignCenter, AlignTop);
|
||||||
popup_set_icon(popup, 0, 5, &I_DolphinWait_61x59);
|
popup_set_icon(popup, 0, 5, &I_DolphinWait_61x59);
|
||||||
|
|
||||||
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup);
|
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup);
|
||||||
|
@ -21,7 +21,7 @@ void ibutton_scene_retry_confirm_on_enter(void* context) {
|
|||||||
widget_add_string_element(
|
widget_add_string_element(
|
||||||
widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Return to reading?");
|
widget, 64, 19, AlignCenter, AlignBottom, FontPrimary, "Return to reading?");
|
||||||
widget_add_string_element(
|
widget_add_string_element(
|
||||||
widget, 64, 29, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost.");
|
widget, 64, 29, AlignCenter, AlignBottom, FontSecondary, "All unsaved data will be lost!");
|
||||||
|
|
||||||
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
|
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
|
||||||
}
|
}
|
||||||
|
@ -10,13 +10,13 @@ void infrared_scene_ask_back_on_enter(void* context) {
|
|||||||
DialogEx* dialog_ex = infrared->dialog_ex;
|
DialogEx* dialog_ex = infrared->dialog_ex;
|
||||||
|
|
||||||
if(infrared->app_state.is_learning_new_remote) {
|
if(infrared->app_state.is_learning_new_remote) {
|
||||||
dialog_ex_set_header(dialog_ex, "Exit to Infrared menu?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Exit to Infrared Menu?", 64, 0, AlignCenter, AlignTop);
|
||||||
} else {
|
} else {
|
||||||
dialog_ex_set_header(dialog_ex, "Exit to remote menu?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Exit to Remote Menu?", 64, 0, AlignCenter, AlignTop);
|
||||||
}
|
}
|
||||||
|
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "All unsaved data\nwill be lost.", 64, 31, AlignCenter, AlignCenter);
|
dialog_ex, "All unsaved data\nwill be lost!", 64, 31, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
|
dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
||||||
dialog_ex_set_center_button_text(dialog_ex, NULL);
|
dialog_ex_set_center_button_text(dialog_ex, NULL);
|
||||||
|
@ -9,9 +9,9 @@ void infrared_scene_ask_retry_on_enter(void* context) {
|
|||||||
Infrared* infrared = context;
|
Infrared* infrared = context;
|
||||||
DialogEx* dialog_ex = infrared->dialog_ex;
|
DialogEx* dialog_ex = infrared->dialog_ex;
|
||||||
|
|
||||||
dialog_ex_set_header(dialog_ex, "Return to reading?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Return to Reading?", 64, 0, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "All unsaved data\nwill be lost.", 64, 31, AlignCenter, AlignCenter);
|
dialog_ex, "All unsaved data\nwill be lost!", 64, 31, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
|
dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
||||||
dialog_ex_set_center_button_text(dialog_ex, NULL);
|
dialog_ex_set_center_button_text(dialog_ex, NULL);
|
||||||
|
@ -16,7 +16,7 @@ void infrared_scene_edit_delete_on_enter(void* context) {
|
|||||||
int32_t current_button_index = infrared->app_state.current_button_index;
|
int32_t current_button_index = infrared->app_state.current_button_index;
|
||||||
furi_assert(current_button_index != InfraredButtonIndexNone);
|
furi_assert(current_button_index != InfraredButtonIndexNone);
|
||||||
|
|
||||||
dialog_ex_set_header(dialog_ex, "Delete button?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Delete Button?", 64, 0, AlignCenter, AlignTop);
|
||||||
InfraredRemoteButton* current_button =
|
InfraredRemoteButton* current_button =
|
||||||
infrared_remote_get_button(remote, current_button_index);
|
infrared_remote_get_button(remote, current_button_index);
|
||||||
InfraredSignal* signal = infrared_remote_button_get_signal(current_button);
|
InfraredSignal* signal = infrared_remote_button_get_signal(current_button);
|
||||||
@ -45,7 +45,7 @@ void infrared_scene_edit_delete_on_enter(void* context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else if(edit_target == InfraredEditTargetRemote) {
|
} else if(edit_target == InfraredEditTargetRemote) {
|
||||||
dialog_ex_set_header(dialog_ex, "Delete remote?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Delete Remote?", 64, 0, AlignCenter, AlignTop);
|
||||||
infrared_text_store_set(
|
infrared_text_store_set(
|
||||||
infrared,
|
infrared,
|
||||||
0,
|
0,
|
||||||
|
@ -107,7 +107,7 @@ static void lfrfid_cli_write(Cli* cli, string_t args) {
|
|||||||
UNUSED(cli);
|
UNUSED(cli);
|
||||||
UNUSED(args);
|
UNUSED(args);
|
||||||
// TODO implement rfid write
|
// TODO implement rfid write
|
||||||
printf("Not implemented :(\r\n");
|
printf("Not Implemented :(\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lfrfid_cli_emulate(Cli* cli, string_t args) {
|
static void lfrfid_cli_emulate(Cli* cli, string_t args) {
|
||||||
|
@ -17,9 +17,9 @@ void LfRfidAppSceneExitConfirm::on_enter(LfRfidApp* app, bool /* need_restore */
|
|||||||
auto line_1 = container->add<StringElement>();
|
auto line_1 = container->add<StringElement>();
|
||||||
auto line_2 = container->add<StringElement>();
|
auto line_2 = container->add<StringElement>();
|
||||||
|
|
||||||
line_1->set_text("Exit to RFID menu?", 64, 19, 128 - 2, AlignCenter, AlignBottom, FontPrimary);
|
line_1->set_text("Exit to RFID Menu?", 64, 19, 128 - 2, AlignCenter, AlignBottom, FontPrimary);
|
||||||
line_2->set_text(
|
line_2->set_text(
|
||||||
"All unsaved data will be lost.", 64, 31, 0, AlignCenter, AlignBottom, FontSecondary);
|
"All unsaved data will be lost!", 64, 31, 0, AlignCenter, AlignBottom, FontSecondary);
|
||||||
|
|
||||||
app->view_controller.switch_to<ContainerVM>();
|
app->view_controller.switch_to<ContainerVM>();
|
||||||
}
|
}
|
||||||
|
@ -17,9 +17,9 @@ void LfRfidAppSceneRetryConfirm::on_enter(LfRfidApp* app, bool /* need_restore *
|
|||||||
auto line_1 = container->add<StringElement>();
|
auto line_1 = container->add<StringElement>();
|
||||||
auto line_2 = container->add<StringElement>();
|
auto line_2 = container->add<StringElement>();
|
||||||
|
|
||||||
line_1->set_text("Return to reading?", 64, 19, 128 - 2, AlignCenter, AlignBottom, FontPrimary);
|
line_1->set_text("Return to Reading?", 64, 19, 128 - 2, AlignCenter, AlignBottom, FontPrimary);
|
||||||
line_2->set_text(
|
line_2->set_text(
|
||||||
"All unsaved data will be lost.", 64, 29, 0, AlignCenter, AlignBottom, FontSecondary);
|
"All unsaved data will be lost!", 64, 29, 0, AlignCenter, AlignBottom, FontSecondary);
|
||||||
|
|
||||||
app->view_controller.switch_to<ContainerVM>();
|
app->view_controller.switch_to<ContainerVM>();
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ static void nfc_scene_detect_reader_widget_config(Nfc* nfc, bool data_received)
|
|||||||
|
|
||||||
widget_add_icon_element(widget, 0, 14, &I_Reader_detect);
|
widget_add_icon_element(widget, 0, 14, &I_Reader_detect);
|
||||||
widget_add_string_element(
|
widget_add_string_element(
|
||||||
widget, 64, 3, AlignCenter, AlignTop, FontSecondary, "Hold near reader");
|
widget, 64, 3, AlignCenter, AlignTop, FontSecondary, "Hold Near Reader");
|
||||||
widget_add_string_element(widget, 55, 22, AlignLeft, AlignTop, FontPrimary, "Emulating...");
|
widget_add_string_element(widget, 55, 22, AlignLeft, AlignTop, FontPrimary, "Emulating...");
|
||||||
|
|
||||||
if(data_received) {
|
if(data_received) {
|
||||||
|
@ -12,9 +12,9 @@ void nfc_scene_exit_confirm_on_enter(void* context) {
|
|||||||
|
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
dialog_ex_set_left_button_text(dialog_ex, "Exit");
|
||||||
dialog_ex_set_right_button_text(dialog_ex, "Stay");
|
dialog_ex_set_right_button_text(dialog_ex, "Stay");
|
||||||
dialog_ex_set_header(dialog_ex, "Exit to NFC menu?", 64, 11, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Exit to NFC Menu?", 64, 11, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "All unsaved data\nwill be lost.", 64, 25, AlignCenter, AlignTop);
|
dialog_ex, "All unsaved data\nwill be lost!", 64, 25, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_context(dialog_ex, nfc);
|
dialog_ex_set_context(dialog_ex, nfc);
|
||||||
dialog_ex_set_result_callback(dialog_ex, nfc_scene_exit_confirm_dialog_callback);
|
dialog_ex_set_result_callback(dialog_ex, nfc_scene_exit_confirm_dialog_callback);
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ void nfc_scene_restore_original_confirm_on_enter(void* context) {
|
|||||||
Nfc* nfc = context;
|
Nfc* nfc = context;
|
||||||
DialogEx* dialog_ex = nfc->dialog_ex;
|
DialogEx* dialog_ex = nfc->dialog_ex;
|
||||||
|
|
||||||
dialog_ex_set_header(dialog_ex, "Restore card data?", 64, 0, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Restore Card Data?", 64, 0, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_icon(dialog_ex, 5, 15, &I_Restoring);
|
dialog_ex_set_icon(dialog_ex, 5, 15, &I_Restoring);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "It will be returned\nto its original state.", 47, 21, AlignLeft, AlignTop);
|
dialog_ex, "It will be returned\nto its original state.", 47, 21, AlignLeft, AlignTop);
|
||||||
|
@ -12,9 +12,9 @@ void nfc_scene_retry_confirm_on_enter(void* context) {
|
|||||||
|
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Retry");
|
dialog_ex_set_left_button_text(dialog_ex, "Retry");
|
||||||
dialog_ex_set_right_button_text(dialog_ex, "Stay");
|
dialog_ex_set_right_button_text(dialog_ex, "Stay");
|
||||||
dialog_ex_set_header(dialog_ex, "Retry reading?", 64, 11, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Retry Reading?", 64, 11, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "All unsaved data will be\nlost.", 64, 25, AlignCenter, AlignTop);
|
dialog_ex, "All unsaved data will be\nlost!", 64, 25, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_context(dialog_ex, nfc);
|
dialog_ex_set_context(dialog_ex, nfc);
|
||||||
dialog_ex_set_result_callback(dialog_ex, nfc_scene_retry_confirm_dialog_callback);
|
dialog_ex_set_result_callback(dialog_ex, nfc_scene_retry_confirm_dialog_callback);
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ BatteryTestApp* battery_test_alloc() {
|
|||||||
battery_info_get_view(app->batery_info));
|
battery_info_get_view(app->batery_info));
|
||||||
|
|
||||||
app->dialog = dialog_ex_alloc();
|
app->dialog = dialog_ex_alloc();
|
||||||
dialog_ex_set_header(app->dialog, "Close battery test?", 64, 12, AlignCenter, AlignTop);
|
dialog_ex_set_header(app->dialog, "Close Battery Test?", 64, 12, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_left_button_text(app->dialog, "Exit");
|
dialog_ex_set_left_button_text(app->dialog, "Exit");
|
||||||
dialog_ex_set_right_button_text(app->dialog, "Stay");
|
dialog_ex_set_right_button_text(app->dialog, "Stay");
|
||||||
dialog_ex_set_result_callback(app->dialog, battery_test_dialog_callback);
|
dialog_ex_set_result_callback(app->dialog, battery_test_dialog_callback);
|
||||||
|
@ -10,7 +10,7 @@ void power_settings_scene_power_off_on_enter(void* context) {
|
|||||||
PowerSettingsApp* app = context;
|
PowerSettingsApp* app = context;
|
||||||
DialogEx* dialog = app->dialog;
|
DialogEx* dialog = app->dialog;
|
||||||
|
|
||||||
dialog_ex_set_header(dialog, "Turn off Device?", 64, 2, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog, " I will be\nwaiting for\n you here...", 78, 16, AlignLeft, AlignTop);
|
dialog, " I will be\nwaiting for\n you here...", 78, 16, AlignLeft, AlignTop);
|
||||||
dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52);
|
dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52);
|
||||||
|
@ -82,7 +82,7 @@ static void storage_cli_format(Cli* cli, string_t path) {
|
|||||||
if(string_cmp_str(path, STORAGE_INT_PATH_PREFIX) == 0) {
|
if(string_cmp_str(path, STORAGE_INT_PATH_PREFIX) == 0) {
|
||||||
storage_cli_print_error(FSE_NOT_IMPLEMENTED);
|
storage_cli_print_error(FSE_NOT_IMPLEMENTED);
|
||||||
} else if(string_cmp_str(path, STORAGE_EXT_PATH_PREFIX) == 0) {
|
} else if(string_cmp_str(path, STORAGE_EXT_PATH_PREFIX) == 0) {
|
||||||
printf("Formatting SD card, all data will be lost. Are you sure (y/n)?\r\n");
|
printf("Formatting SD card, All data will be lost! Are you sure (y/n)?\r\n");
|
||||||
char answer = cli_getc(cli);
|
char answer = cli_getc(cli);
|
||||||
if(answer == 'y' || answer == 'Y') {
|
if(answer == 'y' || answer == 'Y') {
|
||||||
Storage* api = furi_record_open(RECORD_STORAGE);
|
Storage* api = furi_record_open(RECORD_STORAGE);
|
||||||
@ -581,7 +581,7 @@ void storage_cli(Cli* cli, string_t args, void* context) {
|
|||||||
static void storage_cli_factory_reset(Cli* cli, string_t args, void* context) {
|
static void storage_cli_factory_reset(Cli* cli, string_t args, void* context) {
|
||||||
UNUSED(args);
|
UNUSED(args);
|
||||||
UNUSED(context);
|
UNUSED(context);
|
||||||
printf("All data will be lost. Are you sure (y/n)?\r\n");
|
printf("All data will be lost! Are you sure (y/n)?\r\n");
|
||||||
char c = cli_getc(cli);
|
char c = cli_getc(cli);
|
||||||
if(c == 'y' || c == 'Y') {
|
if(c == 'y' || c == 'Y') {
|
||||||
printf("Data will be wiped after reboot.\r\n");
|
printf("Data will be wiped after reboot.\r\n");
|
||||||
|
@ -75,7 +75,7 @@ static bool
|
|||||||
static void storage_settings_scene_benchmark(StorageSettings* app) {
|
static void storage_settings_scene_benchmark(StorageSettings* app) {
|
||||||
DialogEx* dialog_ex = app->dialog_ex;
|
DialogEx* dialog_ex = app->dialog_ex;
|
||||||
uint8_t* bench_data;
|
uint8_t* bench_data;
|
||||||
dialog_ex_set_header(dialog_ex, "Preparing data...", 64, 32, AlignCenter, AlignCenter);
|
dialog_ex_set_header(dialog_ex, "Preparing Data...", 64, 32, AlignCenter, AlignCenter);
|
||||||
|
|
||||||
bench_data = malloc(BENCH_DATA_SIZE);
|
bench_data = malloc(BENCH_DATA_SIZE);
|
||||||
for(size_t i = 0; i < BENCH_DATA_SIZE; i++) {
|
for(size_t i = 0; i < BENCH_DATA_SIZE; i++) {
|
||||||
@ -123,7 +123,7 @@ void storage_settings_scene_benchmark_on_enter(void* context) {
|
|||||||
|
|
||||||
if(sd_status != FSE_OK) {
|
if(sd_status != FSE_OK) {
|
||||||
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
||||||
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "SD Card Not Mounted", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
||||||
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
||||||
|
@ -24,7 +24,7 @@ void storage_settings_scene_factory_reset_on_enter(void* context) {
|
|||||||
dialog_ex_set_header(dialog_ex, "Confirm Factory Reset", 64, 10, AlignCenter, AlignCenter);
|
dialog_ex_set_header(dialog_ex, "Confirm Factory Reset", 64, 10, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex,
|
dialog_ex,
|
||||||
"Internal storage will be erased\r\nData and setting will be lost",
|
"Internal storage will be erased\r\nData and setting will be lost!",
|
||||||
64,
|
64,
|
||||||
32,
|
32,
|
||||||
AlignCenter,
|
AlignCenter,
|
||||||
|
@ -15,13 +15,13 @@ void storage_settings_scene_format_confirm_on_enter(void* context) {
|
|||||||
|
|
||||||
if(sd_status == FSE_NOT_READY) {
|
if(sd_status == FSE_NOT_READY) {
|
||||||
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
||||||
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "SD Card Not Mounted", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
||||||
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
||||||
} else {
|
} else {
|
||||||
dialog_ex_set_header(dialog_ex, "Format SD card?", 64, 10, AlignCenter, AlignCenter);
|
dialog_ex_set_header(dialog_ex, "Format SD Card?", 64, 10, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_text(dialog_ex, "All data will be lost", 64, 32, AlignCenter, AlignCenter);
|
dialog_ex_set_text(dialog_ex, "All data will be lost!", 64, 32, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Cancel");
|
dialog_ex_set_left_button_text(dialog_ex, "Cancel");
|
||||||
dialog_ex_set_right_button_text(dialog_ex, "Format");
|
dialog_ex_set_right_button_text(dialog_ex, "Format");
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ void storage_settings_scene_formatting_on_enter(void* context) {
|
|||||||
dialog_ex_set_result_callback(dialog_ex, storage_settings_scene_formatting_dialog_callback);
|
dialog_ex_set_result_callback(dialog_ex, storage_settings_scene_formatting_dialog_callback);
|
||||||
|
|
||||||
if(error != FSE_OK) {
|
if(error != FSE_OK) {
|
||||||
dialog_ex_set_header(dialog_ex, "Cannot format SD Card", 64, 10, AlignCenter, AlignCenter);
|
dialog_ex_set_header(dialog_ex, "Cannot Format SD Card", 64, 10, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
|
dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
|
||||||
} else {
|
} else {
|
||||||
|
@ -21,7 +21,7 @@ void storage_settings_scene_internal_info_on_enter(void* context) {
|
|||||||
|
|
||||||
if(error != FSE_OK) {
|
if(error != FSE_OK) {
|
||||||
dialog_ex_set_header(
|
dialog_ex_set_header(
|
||||||
dialog_ex, "Internal storage error", 64, 10, AlignCenter, AlignCenter);
|
dialog_ex, "Internal Storage Error", 64, 10, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
|
dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
|
||||||
} else {
|
} else {
|
||||||
|
@ -19,7 +19,7 @@ void storage_settings_scene_sd_info_on_enter(void* context) {
|
|||||||
|
|
||||||
if(sd_status != FSE_OK) {
|
if(sd_status != FSE_OK) {
|
||||||
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
||||||
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "SD Card Not Mounted", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
||||||
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
||||||
|
@ -15,12 +15,12 @@ void storage_settings_scene_unmount_confirm_on_enter(void* context) {
|
|||||||
|
|
||||||
if(sd_status == FSE_NOT_READY) {
|
if(sd_status == FSE_NOT_READY) {
|
||||||
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
||||||
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "SD Card Not Mounted", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
dialog_ex, "Try to reinsert\nor format SD\ncard.", 3, 19, AlignLeft, AlignTop);
|
||||||
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
dialog_ex_set_center_button_text(dialog_ex, "Ok");
|
||||||
} else {
|
} else {
|
||||||
dialog_ex_set_header(dialog_ex, "Unmount SD card?", 64, 10, AlignCenter, AlignCenter);
|
dialog_ex_set_header(dialog_ex, "Unmount SD Card?", 64, 10, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_text(
|
dialog_ex_set_text(
|
||||||
dialog_ex, "SD card will be\nunavailable", 64, 32, AlignCenter, AlignCenter);
|
dialog_ex, "SD card will be\nunavailable", 64, 32, AlignCenter, AlignCenter);
|
||||||
dialog_ex_set_left_button_text(dialog_ex, "Cancel");
|
dialog_ex_set_left_button_text(dialog_ex, "Cancel");
|
||||||
|
@ -16,11 +16,11 @@ void storage_settings_scene_unmounted_on_enter(void* context) {
|
|||||||
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
dialog_ex_set_icon(dialog_ex, 72, 14, &I_DolphinFirstStart8_56x51);
|
||||||
|
|
||||||
if(error == FSE_OK) {
|
if(error == FSE_OK) {
|
||||||
dialog_ex_set_header(dialog_ex, "SD card unmounted", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "SD Card Unmounted", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(dialog_ex, "You can remove\nSD card now.", 3, 22, AlignLeft, AlignTop);
|
dialog_ex_set_text(dialog_ex, "You can remove\nSD card now.", 3, 22, AlignLeft, AlignTop);
|
||||||
notification_message(app->notification, &sequence_blink_green_100);
|
notification_message(app->notification, &sequence_blink_green_100);
|
||||||
} else {
|
} else {
|
||||||
dialog_ex_set_header(dialog_ex, "Cannot unmount SD Card", 64, 3, AlignCenter, AlignTop);
|
dialog_ex_set_header(dialog_ex, "Cannot Unmount SD Card", 64, 3, AlignCenter, AlignTop);
|
||||||
dialog_ex_set_text(dialog_ex, storage_error_get_desc(error), 3, 22, AlignLeft, AlignTop);
|
dialog_ex_set_text(dialog_ex, storage_error_get_desc(error), 3, 22, AlignLeft, AlignTop);
|
||||||
notification_message(app->notification, &sequence_blink_red_100);
|
notification_message(app->notification, &sequence_blink_red_100);
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ void flipper_boot_dfu_show_splash() {
|
|||||||
u8g2_DrawXBM(fb, 0, 64 - 50, 128, 50, splash_data);
|
u8g2_DrawXBM(fb, 0, 64 - 50, 128, 50, splash_data);
|
||||||
u8g2_SetFont(fb, u8g2_font_helvB08_tr);
|
u8g2_SetFont(fb, u8g2_font_helvB08_tr);
|
||||||
u8g2_DrawStr(fb, 2, 8, "Update & Recovery Mode");
|
u8g2_DrawStr(fb, 2, 8, "Update & Recovery Mode");
|
||||||
u8g2_DrawStr(fb, 2, 21, "DFU started");
|
u8g2_DrawStr(fb, 2, 21, "DFU Started");
|
||||||
u8g2_SetPowerSave(fb, 0);
|
u8g2_SetPowerSave(fb, 0);
|
||||||
u8g2_SendBuffer(fb);
|
u8g2_SendBuffer(fb);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user