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

Archive merge menus, change buttons, cleanup code

Browse Source
This commit is contained in:
Willy-JL
2023-07-16 03:40:15 +02:00
parent f8eaf31a77
commit caa1bc9253
4 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/archive/helpers/archive_browser.c
+14 -1
View File
@@ -469,18 +469,31 @@ void archive_show_file_menu(ArchiveBrowserView* browser, bool show, bool manage)
{
if(show) {
model->menu = true;
model->menu_manage = manage;
model->menu_idx = 0;
menu_array_reset(model->context_menu);
model->menu_manage = manage;
model->menu_can_switch = true;
if(archive_is_item_in_array(model, model->item_idx)) {
ArchiveFile_t* selected =
files_array_get(model->files, model->item_idx - model->array_offset);
selected->fav =
archive_is_favorite("%s", furi_string_get_cstr(selected->path));
if(selected->type == ArchiveFileTypeSearch) {
if(!furi_string_cmp_str(selected->path, "/app:search/Search for files")) {
model->menu_manage = false;
model->menu_can_switch = false;
} else {
model->menu = false;
}
}
} else {
model->menu_manage = true;
model->menu_can_switch = false;
}
} else {
model->menu = false;
model->menu_idx = 0;
menu_array_reset(model->context_menu);
}
},
true);
applications/main/archive/scenes/archive_scene_browser.c
+6 -9
View File
@@ -59,14 +59,14 @@ static void
const char* app_name = archive_get_flipper_app_name(selected->type);
if(selected->type == ArchiveFileTypeSearch) {
if(selected->type == ArchiveFileTypeFolder) {
archive_switch_tab(browser, TAB_LEFT);
archive_enter_dir(browser, selected->path);
} else if(selected->type == ArchiveFileTypeSearch) {
while(archive_get_tab(browser) != ArchiveTabSearch) {
archive_switch_tab(browser, TAB_LEFT);
}
ArchiveApp* archive;
with_view_model(
browser->view, ArchiveBrowserViewModel * model, { archive = model->archive; }, false);
view_dispatcher_send_custom_event(archive->view_dispatcher, ArchiveBrowserEventSearch);
browser->callback(ArchiveBrowserEventSearch, browser->context);
} else if(app_name) {
if(selected->is_app) {
char* param = strrchr(furi_string_get_cstr(selected->path), '/');
@@ -150,10 +150,7 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
consumed = true;
break;
case ArchiveBrowserEventFileMenuRun:
if(selected->type == ArchiveFileTypeFolder) {
archive_switch_tab(browser, TAB_LEFT);
archive_enter_dir(browser, selected->path);
} else if(archive_is_known_app(selected->type)) {
if(archive_is_known_app(selected->type)) {
archive_run_in_app(browser, selected, favorites);
}
archive_show_file_menu(browser, false, false);
applications/main/archive/views/archive_browser_view.c
+63 -59
View File
@@ -132,22 +132,28 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) {
const uint8_t menu_height = 48;
const uint8_t line_height = 10;
const uint8_t calc_height = menu_height - ((MENU_ITEMS - size_menu - 1) * line_height);
const uint8_t off = (MENU_ITEMS - size_menu) * (line_height / 2);
canvas_set_color(canvas, ColorWhite);
canvas_draw_box(canvas, 72, off + 2, 56, calc_height + 4);
canvas_draw_box(canvas, 72, 2, 56, calc_height + 4);
canvas_set_color(canvas, ColorBlack);
elements_slightly_rounded_frame(canvas, 71, off + 2, 57, calc_height + 4);
elements_slightly_rounded_frame(canvas, 71, 2, 57, calc_height + 4);
canvas_draw_str(canvas, 74, off + 11, model->menu_manage ? "Manage:" : "Actions:");
canvas_draw_str_aligned(
canvas, 100, 11, AlignCenter, AlignBottom, model->menu_manage ? "Manage:" : "Actions:");
if(model->menu_can_switch) {
if(model->menu_manage) {
canvas_draw_icon(canvas, 74, 4, &I_ButtonLeft_4x7);
} else {
canvas_draw_icon(canvas, 121, 4, &I_ButtonRight_4x7);
}
}
for(size_t i = 0; i < size_menu; i++) {
ArchiveContextMenuItem_t* current = menu_array_get(model->context_menu, i);
canvas_draw_str(
canvas, 82, off + 11 + (i + 1) * line_height, furi_string_get_cstr(current->text));
canvas, 82, 11 + (i + 1) * line_height, furi_string_get_cstr(current->text));
}
canvas_draw_icon(
canvas, 74, off + 4 + (model->menu_idx + 1) * line_height, &I_ButtonRight_4x7);
canvas_draw_icon(canvas, 74, 4 + (model->menu_idx + 1) * line_height, &I_ButtonRight_4x7);
}
static void archive_draw_frame(Canvas* canvas, uint16_t idx, bool scrollbar, bool moving) {
@@ -346,7 +352,6 @@ static bool archive_view_input(InputEvent* event, void* context) {
ArchiveBrowserView* browser = context;
bool in_menu;
int32_t cur_item_idx;
bool move_fav_mode;
bool is_loading;
with_view_model(
@@ -354,7 +359,6 @@ static bool archive_view_input(InputEvent* event, void* context) {
ArchiveBrowserViewModel * model,
{
in_menu = model->menu;
cur_item_idx = model->item_idx;
move_fav_mode = model->move_fav;
is_loading = model->folder_loading || model->list_loading;
},
@@ -365,7 +369,7 @@ static bool archive_view_input(InputEvent* event, void* context) {
}
if(in_menu) {
if(event->type != InputTypeShort) {
return true; // RETURN
return true; // Return without doing anything
}
if(event->key == InputKeyUp || event->key == InputKeyDown) {
with_view_model(
@@ -380,6 +384,20 @@ static bool archive_view_input(InputEvent* event, void* context) {
}
},
true);
} else if(event->key == InputKeyLeft || event->key == InputKeyRight) {
with_view_model(
browser->view,
ArchiveBrowserViewModel * model,
{
if(model->menu_can_switch) {
if((event->key == InputKeyLeft && model->menu_manage) ||
(event->key == InputKeyRight && !model->menu_manage)) {
model->menu_manage = !model->menu_manage;
menu_array_reset(model->context_menu);
}
}
},
true);
} else if(event->key == InputKeyOk) {
uint32_t idx;
with_view_model(
@@ -396,19 +414,7 @@ static bool archive_view_input(InputEvent* event, void* context) {
browser->callback(ArchiveBrowserEventFileMenuClose, browser->context);
}
} else {
if(event->type == InputTypeShort) {
if(event->key == InputKeyLeft || event->key == InputKeyRight) {
if(move_fav_mode) return false;
archive_switch_tab(browser, event->key);
} else if(event->key == InputKeyBack) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventExitFavMove, browser->context);
} else {
browser->callback(ArchiveBrowserEventExit, browser->context);
}
}
}
ArchiveFile_t* selected = archive_get_current_file(browser);
if((event->key == InputKeyUp || event->key == InputKeyDown) &&
(event->type == InputTypeShort || event->type == InputTypeRepeat)) {
with_view_model(
@@ -493,46 +499,44 @@ static bool archive_view_input(InputEvent* event, void* context) {
},
false);
archive_update_offset(browser);
}
ArchiveFile_t* selected = archive_get_current_file(browser);
bool favorites = archive_get_tab(browser) == ArchiveTabFavorites;
if(selected && selected->type == ArchiveFileTypeSearch) {
if((cur_item_idx == 0 || favorites) && event->key == InputKeyOk) {
if(event->type == InputTypeShort) {
browser->callback(
favorites ? ArchiveBrowserEventFileMenuRun : ArchiveBrowserEventSearch,
browser->context);
} else if(event->type == InputTypeLong) {
} else if(event->type == InputTypeShort) {
if(event->key == InputKeyLeft || event->key == InputKeyRight) {
if(move_fav_mode) {
return true; // Return without doing anything
} else {
archive_switch_tab(browser, event->key);
}
} else if(event->key == InputKeyOk) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
} else if(selected && selected->type == ArchiveFileTypeFolder) {
browser->callback(ArchiveBrowserEventEnterDir, browser->context);
} else if(selected && archive_is_known_app(selected->type)) {
browser->callback(ArchiveBrowserEventFileMenuRun, browser->context);
} else {
browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
}
}
} else if(event->key == InputKeyOk) {
if(selected) {
bool folder = selected->type == ArchiveFileTypeFolder;
if(event->type == InputTypeShort) {
if(favorites) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
} else {
browser->callback(ArchiveBrowserEventFileMenuRun, browser->context);
}
} else if(folder) {
browser->callback(ArchiveBrowserEventEnterDir, browser->context);
} else {
browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
}
} else if(event->type == InputTypeLong) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
} else if(folder || favorites) {
browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
}
} else if(event->key == InputKeyBack) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventExitFavMove, browser->context);
} else {
browser->callback(ArchiveBrowserEventExit, browser->context);
}
}
} else if(event->type == InputTypeLong) {
if(event->key == InputKeyOk) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventSaveFavMove, browser->context);
} else {
browser->callback(ArchiveBrowserEventFileMenuOpen, browser->context);
}
} else if(event->key == InputKeyBack) {
if(move_fav_mode) {
browser->callback(ArchiveBrowserEventExitFavMove, browser->context);
} else {
browser->callback(ArchiveBrowserEventManageMenuOpen, browser->context);
}
}
} else if(event->key == InputKeyBack && event->type == InputTypeLong) {
browser->callback(ArchiveBrowserEventManageMenuOpen, browser->context);
}
}
applications/main/archive/views/archive_browser_view.h
+1
View File
@@ -100,6 +100,7 @@ typedef struct {
uint8_t menu_idx;
bool menu;
bool menu_manage;
bool menu_can_switch;
char* clipboard;
bool clipboard_copy;
menu_array_t context_menu;