Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Icon Rework #41

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Icon Rework #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/metroflip/metroflip_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ void show_ravkav_event_info(RavKavCardEvent* event, FuriString* parsed_data);
void show_ravkav_contract_info(RavKavCardContract* contract, FuriString* parsed_data);

void show_ravkav_environment_info(RavKavCardEnv* environment, FuriString* parsed_data);

extern const Icon I_RFIDDolphinReceive_97x61;
extern const Icon I_icon;

/*******************/
#ifdef __cplusplus
}
Expand Down
5 changes: 4 additions & 1 deletion api/metroflip/metroflip_api_table_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,7 @@ static constexpr auto metroflip_api_table = sort(create_array_t<sym_entry>(
API_METHOD(get_ravkav_env_holder_structure, CalypsoApp*, ()),
API_METHOD(show_ravkav_event_info, void, (RavKavCardEvent*, FuriString*)),
API_METHOD(show_ravkav_contract_info, void, (RavKavCardContract*, FuriString*)),
API_METHOD(show_ravkav_environment_info, void, (RavKavCardEnv*, FuriString*))));
API_METHOD(show_ravkav_environment_info, void, (RavKavCardEnv*, FuriString*)),

API_VARIABLE(I_RFIDDolphinReceive_97x61, Icon),
API_VARIABLE(I_icon,Icon)));
5 changes: 0 additions & 5 deletions metroflip_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include "api/nfc/mf_classic_key_cache.h"
#if __has_include(<assets_icons.h>)
#include <assets_icons.h>
#else
extern const Icon I_RFIDDolphinReceive_97x61;
#endif
#include <flipper_application/plugins/composite_resolver.h>
#include <loader/firmware_api/firmware_api.h>
#include <flipper_application/plugins/plugin_manager.h>
Expand Down
2 changes: 1 addition & 1 deletion scenes/metroflip_scene_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void metroflip_scene_load_on_enter(void* context) {
DialogsFileBrowserOptions browser_options;
Storage* storage = furi_record_open(RECORD_STORAGE);
storage_simply_mkdir(storage, STORAGE_APP_DATA_PATH_PREFIX);
dialog_file_browser_set_basic_options(&browser_options, METROFLIP_FILE_EXTENSION, NULL);
dialog_file_browser_set_basic_options(&browser_options, METROFLIP_FILE_EXTENSION, &I_icon);
browser_options.base_path = STORAGE_APP_DATA_PATH_PREFIX;
FuriString* file_path = furi_string_alloc_set(browser_options.base_path);

Expand Down
1 change: 1 addition & 0 deletions scenes/metroflip_scene_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "../metroflip_i.h"
#include <furi.h>
#include "../metroflip_plugins.h"
#include "../api/metroflip/metroflip_api.h"
#define TAG "Metroflip:Scene:Parse"
#include <stdio.h>

Expand Down
Loading