diff --git a/README.md b/README.md index e9adb34e420..62e46741265 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ This project interpolates work from [Samy Kamkar's original MagSpoof project](ht Many thanks to everyone who has helped in addition to those above, most notably: - [arha](https://github.com/arha) for bitmapping work and skunkworks testing (now a collaborator!) +- [Z4urce](https://github.com/Z4urce) for the provisional app icon - [antirez](https://github.com/antirez) for bitmapping suggestions and general C wisdom - [skotopes](https://github.com/skotopes) for RFID consultation - [NVX](https://github.com/nvx) + dlz for NFC consultation diff --git a/assets/icon_brainstorming/mag_0_10px.png b/assets/icon_brainstorming/mag_0_10px.png new file mode 100644 index 00000000000..cb3a2e688de Binary files /dev/null and b/assets/icon_brainstorming/mag_0_10px.png differ diff --git a/icons/mag_file_1_10px.png b/assets/icon_brainstorming/mag_1_10px.png similarity index 100% rename from icons/mag_file_1_10px.png rename to assets/icon_brainstorming/mag_1_10px.png diff --git a/assets/icon_brainstorming/mag_2_10px.png b/assets/icon_brainstorming/mag_2_10px.png new file mode 100644 index 00000000000..269d46d38dc Binary files /dev/null and b/assets/icon_brainstorming/mag_2_10px.png differ diff --git a/assets/icon_brainstorming/mag_3_10px.png b/assets/icon_brainstorming/mag_3_10px.png new file mode 100644 index 00000000000..ab6608e0d74 Binary files /dev/null and b/assets/icon_brainstorming/mag_3_10px.png differ diff --git a/assets/icon_brainstorming/mag_4_10px.png b/assets/icon_brainstorming/mag_4_10px.png new file mode 100644 index 00000000000..7497988d638 Binary files /dev/null and b/assets/icon_brainstorming/mag_4_10px.png differ diff --git a/assets/icon_brainstorming/mag_5_10px.png b/assets/icon_brainstorming/mag_5_10px.png new file mode 100644 index 00000000000..79b67268f53 Binary files /dev/null and b/assets/icon_brainstorming/mag_5_10px.png differ diff --git a/assets/icon_brainstorming/mag_6_10px.png b/assets/icon_brainstorming/mag_6_10px.png new file mode 100644 index 00000000000..a157c918cf1 Binary files /dev/null and b/assets/icon_brainstorming/mag_6_10px.png differ diff --git a/assets/icon_brainstorming/mag_7_10px.png b/assets/icon_brainstorming/mag_7_10px.png new file mode 100644 index 00000000000..987f8d918c9 Binary files /dev/null and b/assets/icon_brainstorming/mag_7_10px.png differ diff --git a/icons/mag_file_10px.png b/assets/icon_brainstorming/mag_file_10px.png similarity index 100% rename from icons/mag_file_10px.png rename to assets/icon_brainstorming/mag_file_10px.png diff --git a/icons/mag_10px.png b/icons/mag_10px.png index cb3a2e688de..39366561eb6 100644 Binary files a/icons/mag_10px.png and b/icons/mag_10px.png differ diff --git a/mag_device.c b/mag_device.c index e9c1331165a..fc5895a8359 100644 --- a/mag_device.c +++ b/mag_device.c @@ -179,7 +179,7 @@ bool mag_file_select(MagDevice* mag_dev) { mag_app_folder = furi_string_alloc_set(MAG_APP_FOLDER); DialogsFileBrowserOptions browser_options; - dialog_file_browser_set_basic_options(&browser_options, MAG_APP_EXTENSION, &I_mag_file_10px); + dialog_file_browser_set_basic_options(&browser_options, MAG_APP_EXTENSION, &I_mag_10px); browser_options.base_path = MAG_APP_FOLDER; bool res = dialog_file_browser_show( diff --git a/scenes/mag_scene_emulate.c b/scenes/mag_scene_emulate.c index aac8ddd7844..2a009707f94 100644 --- a/scenes/mag_scene_emulate.c +++ b/scenes/mag_scene_emulate.c @@ -13,7 +13,7 @@ void mag_scene_emulate_on_enter(void* context) { // TODO: Display other relevant config settings (namely RFID vs GPIO)? - widget_add_icon_element(widget, 2, 1, &I_mag_file_10px); + widget_add_icon_element(widget, 2, 1, &I_mag_10px); widget_add_string_element( widget, 13, 2, AlignLeft, AlignTop, FontPrimary, furi_string_get_cstr(tmp_str)); furi_string_reset(tmp_str); diff --git a/scenes/mag_scene_saved_info.c b/scenes/mag_scene_saved_info.c index 62ba967b359..b77b3a333a8 100644 --- a/scenes/mag_scene_saved_info.c +++ b/scenes/mag_scene_saved_info.c @@ -10,7 +10,7 @@ void mag_scene_saved_info_on_enter(void* context) { // Use strlcpy instead perhaps, to truncate to screen width, then add ellipses if needed? furi_string_printf(tmp_str, "%s\r\n", mag->mag_dev->dev_name); - widget_add_icon_element(widget, 2, 1, &I_mag_file_10px); + widget_add_icon_element(widget, 2, 1, &I_mag_10px); widget_add_string_element( widget, 13, 2, AlignLeft, AlignTop, FontPrimary, furi_string_get_cstr(tmp_str)); furi_string_reset(tmp_str);