Skip to content

Commit 91483ab

Browse files
committed
Upd app.fam, fix cross-FW icon compatibility
1 parent ab15432 commit 91483ab

6 files changed

+10
-9
lines changed

application.fam

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ App(
1818
fap_category="GPIO",
1919
fap_icon_assets="icons",
2020
fap_icon_assets_symbol="mag",
21-
fap_version=(0, 5), # major, minor
22-
fap_description="WIP MagSpoof port using the RFID subsystem",
21+
fap_version=(0, 7), # major, minor
22+
fap_description="Enables wireless transmission of magstripe data",
2323
fap_author="Zachary Weiss",
2424
fap_weburl="https://github.com/zacharyweiss/magspoof_flipper",
2525
)

helpers/mag_text_input.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,13 @@ static void mag_text_input_view_draw_callback(Canvas* canvas, void* _model) {
203203
canvas,
204204
keyboard_origin_x + keys[column].x,
205205
keyboard_origin_y + keys[column].y,
206-
&I_KeySaveSelected_22x11);
206+
&I_KeySaveSelected_24x11);
207207
} else {
208208
canvas_draw_icon(
209209
canvas,
210210
keyboard_origin_x + keys[column].x,
211211
keyboard_origin_y + keys[column].y,
212-
&I_KeySave_22x11);
212+
&I_KeySave_24x11);
213213
}
214214
} else if(keys[column].text == BACKSPACE_KEY) {
215215
canvas_set_color(canvas, ColorBlack);
@@ -218,13 +218,13 @@ static void mag_text_input_view_draw_callback(Canvas* canvas, void* _model) {
218218
canvas,
219219
keyboard_origin_x + keys[column].x,
220220
keyboard_origin_y + keys[column].y,
221-
&I_KeyBackspaceSelected_17x11);
221+
&I_KeyBackspaceSelected_16x9);
222222
} else {
223223
canvas_draw_icon(
224224
canvas,
225225
keyboard_origin_x + keys[column].x,
226226
keyboard_origin_y + keys[column].y,
227-
&I_KeyBackspace_17x11);
227+
&I_KeyBackspace_16x9);
228228
}
229229
} else {
230230
if(model->selected_row == row && model->selected_column == column) {

helpers/mag_text_input.h

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <gui/view.h>
4+
#include "mag_icons.h"
45
// #include "mag_validators.h"
56

67
#ifdef __cplusplus

helpers/mag_types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#define MAG_VERSION_APP "0.07"
3+
#define MAG_VERSION_APP FAP_VERSION
44
#define MAG_DEVELOPER "Zachary Weiss"
55
#define MAG_GITHUB "github.com/zacharyweiss/magspoof_flipper"
66

scenes/mag_scene_delete_success.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ void mag_scene_delete_success_on_enter(void* context) {
44
Mag* mag = context;
55
Popup* popup = mag->popup;
66

7-
popup_set_icon(popup, 0, 2, &I_DolphinMafia_119x62);
7+
popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62);
88
popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
99

1010
popup_set_callback(popup, mag_popup_timeout_callback);

scenes/mag_scene_save_success.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void mag_scene_save_success_on_enter(void* context) {
88
//scene_manager_set_scene_state(mag->scene_manager, LfRfidSceneSaveData, 0);
99
mag_text_store_clear(mag);
1010

11-
popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
11+
popup_set_icon(popup, 36, 5, &I_DolphinNice_96x59);
1212
popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop);
1313
popup_set_context(popup, mag);
1414
popup_set_callback(popup, mag_popup_timeout_callback);

0 commit comments

Comments
 (0)