Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-11 19:33:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Archive fix internal and external browsers

Browse Source
This commit is contained in:
Willy-JL
2023-06-04 17:25:35 +01:00
parent 945bc46837
commit f2ce2ad95c
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/archive/helpers/archive_browser.c
+9 -13
View File
@@ -449,7 +449,8 @@ void archive_favorites_move_mode(ArchiveBrowserView* browser, bool active) {
}
static bool archive_is_dir_exists(FuriString* path) {
if(furi_string_equal(path, STORAGE_ANY_PATH_PREFIX)) {
if(furi_string_equal(path, STORAGE_INT_PATH_PREFIX) ||
furi_string_equal(path, STORAGE_EXT_PATH_PREFIX)) {
return true;
}
bool state = false;
@@ -475,13 +476,6 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
} else {
tab = (tab + 1) % ArchiveTabTotal;
}
if(tab == ArchiveTabInternal && !furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
if(key == InputKeyLeft) {
tab = ((tab - 1) + ArchiveTabTotal) % ArchiveTabTotal;
} else {
tab = (tab + 1) % ArchiveTabTotal;
}
}
browser->is_root = true;
archive_set_tab(browser, tab);
@@ -502,18 +496,20 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
} else {
tab = archive_get_tab(browser);
if(archive_is_dir_exists(browser->path)) {
bool skip_assets = (strcmp(archive_get_tab_ext(tab), "*") == 0) ? false : true;
bool is_browser = !strcmp(archive_get_tab_ext(tab), "*");
bool skip_assets = is_browser;
// Hide dot files everywhere except Browser if in debug mode
bool hide_dot_files = (strcmp(archive_get_tab_ext(tab), "*") == 0) ?
!furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) :
true;
bool hide_dot_files = !is_browser ? true :
tab == ArchiveTabInternal ?
false :
!furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug);
archive_file_browser_set_path(
browser, browser->path, archive_get_tab_ext(tab), skip_assets, hide_dot_files);
tab_empty = false; // Empty check will be performed later
}
}
if((tab_empty) && (tab != ArchiveTabBrowser)) {
if((tab_empty) && (tab != ArchiveTabBrowser) && (tab != ArchiveTabInternal)) {
archive_switch_tab(browser, key);
} else {
with_view_model(
applications/main/archive/helpers/archive_browser.h
+8 -8
View File
@@ -9,16 +9,16 @@
static const char* tab_default_paths[] = {
[ArchiveTabFavorites] = "/app:favorites",
[ArchiveTabIButton] = ANY_PATH("ibutton"),
[ArchiveTabNFC] = ANY_PATH("nfc"),
[ArchiveTabSubGhz] = ANY_PATH("subghz"),
[ArchiveTabLFRFID] = ANY_PATH("lfrfid"),
[ArchiveTabInfrared] = ANY_PATH("infrared"),
[ArchiveTabBadKb] = ANY_PATH("badkb"),
[ArchiveTabIButton] = EXT_PATH("ibutton"),
[ArchiveTabNFC] = EXT_PATH("nfc"),
[ArchiveTabSubGhz] = EXT_PATH("subghz"),
[ArchiveTabLFRFID] = EXT_PATH("lfrfid"),
[ArchiveTabInfrared] = EXT_PATH("infrared"),
[ArchiveTabBadKb] = EXT_PATH("badkb"),
[ArchiveTabU2f] = "/app:u2f",
[ArchiveTabApplications] = ANY_PATH("apps"),
[ArchiveTabApplications] = EXT_PATH("apps"),
[ArchiveTabInternal] = STORAGE_INT_PATH_PREFIX,
[ArchiveTabBrowser] = STORAGE_ANY_PATH_PREFIX,
[ArchiveTabBrowser] = STORAGE_EXT_PATH_PREFIX,
};
static const char* known_ext[] = {
applications/main/archive/scenes/archive_scene_info.c
-5
View File
@@ -38,11 +38,6 @@ void archive_scene_info_on_enter(void* context) {
// Directory path
path_extract_dirname(furi_string_get_cstr(current->path), dirname);
if(strcmp(furi_string_get_cstr(dirname), "/any") == 0) {
furi_string_replace(dirname, STORAGE_ANY_PATH_PREFIX, "/");
} else {
furi_string_replace(dirname, STORAGE_ANY_PATH_PREFIX, "");
}
// File size
FileInfo fileinfo;