Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 15:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Item idx not needed anymore

Browse Source
This commit is contained in:
Willy-JL
2023-07-14 15:26:56 +02:00
parent ae8488ecba
commit a377178a35
4 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/main/archive/helpers/archive_browser.c
View File

@@ -57,14 +57,9 @@ static void archive_list_load_cb(void* context, uint32_t list_load_offset) {
false); false);
} }
static void archive_list_item_cb( static void
void* context, archive_list_item_cb(void* context, FuriString* item_path, bool is_folder, bool is_last) {
FuriString* item_path,
uint32_t idx,
bool is_folder,
bool is_last) {
furi_assert(context); furi_assert(context);
UNUSED(idx);
ArchiveBrowserView* browser = (ArchiveBrowserView*)context; ArchiveBrowserView* browser = (ArchiveBrowserView*)context;
if(!is_last) { if(!is_last) {

17
applications/services/gui/modules/file_browser.c
View File

@@ -160,12 +160,8 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context);
static void static void
browser_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root); browser_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root);
static void browser_list_load_cb(void* context, uint32_t list_load_offset); static void browser_list_load_cb(void* context, uint32_t list_load_offset);
static void browser_list_item_cb( static void
void* context, browser_list_item_cb(void* context, FuriString* item_path, bool is_folder, bool is_last);
FuriString* item_path,
uint32_t idx,
bool is_folder,
bool is_last);
static void browser_long_load_cb(void* context); static void browser_long_load_cb(void* context);
static void file_browser_scroll_timer_callback(void* context) { static void file_browser_scroll_timer_callback(void* context) {
@@ -425,14 +421,9 @@ static void browser_list_load_cb(void* context, uint32_t list_load_offset) {
BrowserItem_t_clear(&back_item); BrowserItem_t_clear(&back_item);
} }
static void browser_list_item_cb( static void
void* context, browser_list_item_cb(void* context, FuriString* item_path, bool is_folder, bool is_last) {
FuriString* item_path,
uint32_t idx,
bool is_folder,
bool is_last) {
furi_assert(context); furi_assert(context);
UNUSED(idx);
FileBrowser* browser = (FileBrowser*)context; FileBrowser* browser = (FileBrowser*)context;
BrowserItem_t item; BrowserItem_t item;

12
applications/services/gui/modules/file_browser_worker.c
View File

@@ -241,11 +241,7 @@ static bool browser_folder_load_chunked(
furi_string_printf(name_str, "%s/%s", furi_string_get_cstr(path), name_temp); furi_string_printf(name_str, "%s/%s", furi_string_get_cstr(path), name_temp);
if(browser->list_item_cb) { if(browser->list_item_cb) {
browser->list_item_cb( browser->list_item_cb(
browser->cb_ctx, browser->cb_ctx, name_str, file_info_is_dir(&file_info), false);
name_str,
items_cnt,
file_info_is_dir(&file_info),
false);
} }
items_cnt++; items_cnt++;
} }
@@ -254,7 +250,7 @@ static bool browser_folder_load_chunked(
} }
} }
if(browser->list_item_cb) { if(browser->list_item_cb) {
browser->list_item_cb(browser->cb_ctx, NULL, 0, false, true); browser->list_item_cb(browser->cb_ctx, NULL, false, true);
} }
} while(0); } while(0);
@@ -296,13 +292,13 @@ static bool browser_folder_load_full(BrowserWorker* browser, FuriString* path) {
furi_string_printf(name_str, "%s/%s", furi_string_get_cstr(path), name_temp); furi_string_printf(name_str, "%s/%s", furi_string_get_cstr(path), name_temp);
if(browser->list_item_cb) { if(browser->list_item_cb) {
browser->list_item_cb( browser->list_item_cb(
browser->cb_ctx, name_str, items_cnt, file_info_is_dir(&file_info), false); browser->cb_ctx, name_str, file_info_is_dir(&file_info), false);
} }
items_cnt++; items_cnt++;
} }
} }
if(browser->list_item_cb) { if(browser->list_item_cb) {
browser->list_item_cb(browser->cb_ctx, NULL, 0, false, true); browser->list_item_cb(browser->cb_ctx, NULL, false, true);
} }
ret = true; ret = true;
} while(0); } while(0);

1
applications/services/gui/modules/file_browser_worker.h
View File

@@ -19,7 +19,6 @@ typedef void (*BrowserWorkerListLoadCallback)(void* context, uint32_t list_load_
typedef void (*BrowserWorkerListItemCallback)( typedef void (*BrowserWorkerListItemCallback)(
void* context, void* context,
FuriString* item_path, FuriString* item_path,
uint32_t idx,
bool is_folder, bool is_folder,
bool is_last); bool is_last);
typedef void (*BrowserWorkerLongLoadCallback)(void* context); typedef void (*BrowserWorkerLongLoadCallback)(void* context);