From b58bcac1a2f7799159afb2ae0cf3b5e90fc76139 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 20 Feb 2024 06:09:35 +0000 Subject: [PATCH] Archive: Open .img in Mass Storage app --- .../main/archive/helpers/archive_browser.h | 1 + applications/main/archive/helpers/archive_files.h | 1 + .../main/archive/scenes/archive_scene_browser.c | 2 ++ .../main/archive/views/archive_browser_view.c | 1 + assets/icons/Archive/floppydisk_10px.png | Bin 0 -> 183 bytes targets/f7/api_symbols.csv | 1 + 6 files changed, 6 insertions(+) create mode 100644 assets/icons/Archive/floppydisk_10px.png diff --git a/applications/main/archive/helpers/archive_browser.h b/applications/main/archive/helpers/archive_browser.h index 11d41fcae2..f67781889b 100644 --- a/applications/main/archive/helpers/archive_browser.h +++ b/applications/main/archive/helpers/archive_browser.h @@ -37,6 +37,7 @@ static const char* known_ext[] = { [ArchiveFileTypeJS] = ".js", [ArchiveFileTypeSearch] = "*", [ArchiveFileTypeUpdateManifest] = ".fuf", + [ArchiveFileTypeDiskImage] = ".img", [ArchiveFileTypeFolder] = "?", [ArchiveFileTypeUnknown] = "*", [ArchiveFileTypeAppOrJs] = ".fap|.js", diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h index 547d6b621c..0bcf66d65a 100644 --- a/applications/main/archive/helpers/archive_files.h +++ b/applications/main/archive/helpers/archive_files.h @@ -24,6 +24,7 @@ typedef enum { ArchiveFileTypeJS, ArchiveFileTypeSearch, ArchiveFileTypeUpdateManifest, + ArchiveFileTypeDiskImage, ArchiveFileTypeFolder, ArchiveFileTypeUnknown, ArchiveFileTypeAppOrJs, diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index d5fe51ae8f..b7f077d66d 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -36,6 +36,8 @@ const char* archive_get_flipper_app_name(ArchiveFileTypeEnum file_type) { return "U2F"; case ArchiveFileTypeUpdateManifest: return "UpdaterApp"; + case ArchiveFileTypeDiskImage: + return EXT_PATH("apps/USB/mass_storage.fap"); case ArchiveFileTypeJS: return EXT_PATH("apps/assets/js_app.fap"); default: diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index d3b4cf842f..b896e662d1 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -38,6 +38,7 @@ static const Icon* ArchiveItemIcons[] = { [ArchiveFileTypeJS] = &I_js_script_10px, [ArchiveFileTypeSearch] = &I_search_10px, [ArchiveFileTypeUpdateManifest] = &I_update_10px, + [ArchiveFileTypeDiskImage] = &I_floppydisk_10px, [ArchiveFileTypeFolder] = &I_dir_10px, [ArchiveFileTypeUnknown] = &I_unknown_10px, [ArchiveFileTypeLoading] = &I_loading_10px, diff --git a/assets/icons/Archive/floppydisk_10px.png b/assets/icons/Archive/floppydisk_10px.png new file mode 100644 index 0000000000000000000000000000000000000000..91af40ba742ecaa36fb4a51a6e6533fbd9ae10ab GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih{XE z)7O>#IlBlSua3IfqGv!M$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3gTe~DWM4fivTr{ literal 0 HcmV?d00001 diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index ff4ed9217d..21acb0fdc1 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -3869,6 +3869,7 @@ Variable,+,I_fahren_hover_24x23,Icon, Variable,+,I_flash_19x20,Icon, Variable,+,I_flash_hover_19x20,Icon, Variable,+,I_flash_text_21x5,Icon, +Variable,+,I_floppydisk_10px,Icon, Variable,+,I_heat_30x51,Icon, Variable,+,I_hourglass0_24x24,Icon, Variable,+,I_hourglass1_24x24,Icon,