From f92e9358d05bbda5df8873d951c4d1573d15cd9a Mon Sep 17 00:00:00 2001 From: Veronika Kossmann Date: Sun, 4 May 2025 01:04:43 +0300 Subject: [PATCH] Settings->About cleanup --- applications/settings/about/about.c | 142 +++++++++++++--------------- 1 file changed, 68 insertions(+), 74 deletions(-) diff --git a/applications/settings/about/about.c b/applications/settings/about/about.c index e066db25f..1655a8a80 100644 --- a/applications/settings/about/about.c +++ b/applications/settings/about/about.c @@ -23,11 +23,13 @@ static DialogMessageButton about_screen_product(DialogsApp* dialogs, DialogMessa furi_hal_version_get_model_name(), furi_hal_version_get_model_code()); - FuriString* screen_text = furi_string_alloc_printf( - "FCC ID: %s\n" - "IC: %s", - furi_hal_version_get_fcc_id(), - furi_hal_version_get_ic_id()); + // FuriString* screen_text = furi_string_alloc_printf( + // "FCC ID: %s\n" + // "IC: %s", + // furi_hal_version_get_fcc_id(), + // furi_hal_version_get_ic_id()); + + FuriString* screen_text = furi_string_alloc_printf("From Tallinn with love <3"); dialog_message_set_header( message, furi_string_get_cstr(screen_header), 0, 0, AlignLeft, AlignTop); @@ -41,92 +43,92 @@ static DialogMessageButton about_screen_product(DialogsApp* dialogs, DialogMessa return result; } -static DialogMessageButton about_screen_address(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_address(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - const char* screen_text = "Flipper Devices Inc.\n" - "Suite B #551, 2803\n" - "Philadelphia Pike, Claymont\n" - "DE, USA 19703\n"; +// const char* screen_text = "Flipper Devices Inc.\n" +// "Suite B #551, 2803\n" +// "Philadelphia Pike, Claymont\n" +// "DE, USA 19703\n"; - dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); - result = dialog_message_show(dialogs, message); +// dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_compliance(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_compliance(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - const char* screen_text = "For all compliance\n" - "certificates, please visit:\n" - "www.flipp.dev/compliance"; +// const char* screen_text = "For all compliance\n" +// "certificates, please visit:\n" +// "www.flipp.dev/compliance"; - dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); - result = dialog_message_show(dialogs, message); +// dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_icon1(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_icon1(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_icon2(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_icon2(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10); - dialog_message_set_text( - message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10); +// dialog_message_set_text( +// message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_cert_china_0(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_cert_china_0(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_CertificationChina0_121x41, 3, 3); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_CertificationChina0_121x41, 3, 3); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_cert_china_1(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_cert_china_1(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_CertificationChina1_124x47, 3, 3); - dialog_message_set_text( - message, furi_hal_version_get_srrc_id(), 55, 11, AlignLeft, AlignBottom); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_CertificationChina1_124x47, 3, 3); +// dialog_message_set_text( +// message, furi_hal_version_get_srrc_id(), 55, 11, AlignLeft, AlignBottom); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_cert_taiwan(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_cert_taiwan(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_CertificationTaiwan_33x32, 3, 10); - dialog_message_set_text( - message, furi_hal_version_get_ncc_id(), 39, 30, AlignLeft, AlignBottom); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_CertificationTaiwan_33x32, 3, 10); +// dialog_message_set_text( +// message, furi_hal_version_get_ncc_id(), 39, 30, AlignLeft, AlignBottom); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } -static DialogMessageButton about_screen_cert_mexico(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; +// static DialogMessageButton about_screen_cert_mexico(DialogsApp* dialogs, DialogMessage* message) { +// DialogMessageButton result; - dialog_message_set_icon(message, &I_CertificationMexico_98x41, 17, 4); - result = dialog_message_show(dialogs, message); +// dialog_message_set_icon(message, &I_CertificationMexico_98x41, 17, 4); +// result = dialog_message_show(dialogs, message); - return result; -} +// return result; +// } static DialogMessageButton about_screen_hw_version(DialogsApp* dialogs, DialogMessage* message) { DialogMessageButton result; @@ -198,14 +200,6 @@ static DialogMessageButton about_screen_fw_version(DialogsApp* dialogs, DialogMe const AboutDialogScreen about_screens[] = { about_screen_product, - about_screen_compliance, - about_screen_address, - about_screen_icon1, - about_screen_icon2, - about_screen_cert_china_0, - about_screen_cert_china_1, - about_screen_cert_taiwan, - about_screen_cert_mexico, about_screen_hw_version, about_screen_fw_version, };